From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 5 Jul 2013 09:52:24 +0000 (+0200)
Subject: Merge branch 'develop' into branding_configurable_URL_input_field
X-Git-Tag: oc-android-1.4.3~5^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/233533faa3f74a0a82ace5191c81a3211658a62b?hp=04c2311131508ed1c34f5a53d1016b04814dcdd8

Merge branch 'develop' into branding_configurable_URL_input_field
---

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index d3622be5..b18b815f 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -54,8 +54,18 @@
 			    android:gravity="center"
 			    android:orientation="vertical"
 			    android:padding="8dp" >
+			    
+				<Button
+				    android:id="@+id/centeredRefreshButton"
+				    android:layout_width="wrap_content"
+				    android:layout_height="wrap_content"
+				    android:layout_gravity="center_horizontal"
+            		android:onClick="onRefreshClick"
+				    android:text="@string/auth_check_server"
+				    android:visibility="gone" />
 		
 			    <FrameLayout 
+	        		android:id="@+id/hostUrlFrame"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 			        >
@@ -71,7 +81,7 @@
 						<requestFocus />
 					</EditText>
 					<ImageButton
-					    android:id="@+id/refeshButton"
+					    android:id="@+id/embeddedRefreshButton"
 					    android:layout_width="48dp"
 					    android:layout_height="48dp"
 					    android:layout_gravity="center_vertical|right"
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 1c7921d0..14dd20d6 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -40,7 +40,17 @@
             android:layout_marginTop="10dp"
             android:src="@drawable/logo" />
 
+        <Button
+            android:id="@+id/centeredRefreshButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:onClick="onRefreshClick"
+            android:text="@string/auth_check_server"
+            android:visibility="gone" />
+
 	    <FrameLayout 
+	        android:id="@+id/hostUrlFrame"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 	        >
@@ -56,7 +66,7 @@
 				<requestFocus />
 			</EditText>
 			<ImageButton
-			    android:id="@+id/refeshButton"
+			    android:id="@+id/embeddedRefreshButton"
 			    android:layout_width="48dp"
 			    android:layout_height="48dp"
 			    android:layout_gravity="center_vertical|right"
diff --git a/res/values/branding.xml b/res/values/branding.xml
new file mode 100644
index 00000000..9d6f54f6
--- /dev/null
+++ b/res/values/branding.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="server_url">"http://beta.owncloud.com/owncloud"</string>
+    <bool name="show_server_url_input">false</bool>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7e4ec936..8c273bd3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -48,6 +48,7 @@
     <string name="prefs_log_summary_history">This shows the recorded logs</string>
     <string name="prefs_log_delete_history_button">Delete History</string>
     
+    <string name="auth_check_server">Check Server</string>
     <string name="auth_host_url">Server address</string>
     <string name="auth_username">Username</string>
     <string name="auth_password">Password</string>
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index dabe98e8..18226a5e 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -60,7 +60,6 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.Button;
-import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.TextView.OnEditorActionListener;
@@ -133,7 +132,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     private Account mAccount;
 
     private EditText mHostUrlInput;
-    private ImageButton mRefreshButton;
+    private View mRefreshButton;
     private EditText mUsernameInput;
     private EditText mPasswordInput;
     private CheckBox mOAuth2Check;
@@ -145,6 +144,8 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     private TextView mOAuthTokenEndpointText;
     
     private boolean mRefreshButtonEnabled;
+    
+    private boolean mHostUrlInputEnabled;
 
 
     /**
@@ -160,7 +161,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         /// set view and get references to view elements
         setContentView(R.layout.account_setup);
         mHostUrlInput = (EditText) findViewById(R.id.hostUrlInput);
-        mRefreshButton = (ImageButton) findViewById(R.id.refeshButton);
         mUsernameInput = (EditText) findViewById(R.id.account_username);
         mPasswordInput = (EditText) findViewById(R.id.account_password);
         mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1);
@@ -168,6 +168,10 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);
         mOkButton = findViewById(R.id.buttonOK);
         mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); 
+        
+        /// set Host Url Input Enabled
+        mHostUrlInputEnabled = getResources().getBoolean(R.bool.show_server_url_input);
+        
 
         /// complete label for 'register account' button
         Button b = (Button) findViewById(R.id.account_register);
@@ -182,6 +186,18 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         mAccount = null;
         mHostBaseUrl = "";
         boolean refreshButtonEnabled = false;
+        
+        // URL input configuration applied
+        if (!mHostUrlInputEnabled)
+        {
+            mHostUrlInput.setText(getString(R.string.server_url));
+            findViewById(R.id.hostUrlFrame).setVisibility(View.GONE);
+            
+            mRefreshButton = findViewById(R.id.centeredRefreshButton);
+
+        } else {
+            mRefreshButton = findViewById(R.id.embeddedRefreshButton);
+        }
 
         if (savedInstanceState == null) {
             /// connection state and info
@@ -211,7 +227,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             changeViewByOAuth2Check(oAuthRequired);
             mJustCreated = true;
             
-            if (mAction == ACTION_UPDATE_TOKEN) {
+            if (mAction == ACTION_UPDATE_TOKEN || !mHostUrlInputEnabled) {
                 checkOcServer(); 
             }
 
@@ -452,6 +468,11 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
 
     private void checkOcServer() {
         String uri = trimUrlWebdav(mHostUrlInput.getText().toString().trim());
+        
+        if (!mHostUrlInputEnabled){
+            uri = getString(R.string.server_url);
+        }
+        
         mServerIsValid = false;
         mServerIsChecked = false;
         mOkButton.setEnabled(false);
@@ -1195,14 +1216,10 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
 
 
     private void showRefreshButton() {
-        /*mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_refresh_black, 0);
-        mRefreshButtonEnabled = true;*/
         mRefreshButton.setVisibility(View.VISIBLE);
     }
 
     private void hideRefreshButton() {
-        /*mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
-        mRefreshButtonEnabled = false;*/
         mRefreshButton.setVisibility(View.GONE);
     }