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?ds=inline;hp=--cc

Merge branch 'develop' into branding_configurable_URL_input_field
---

233533faa3f74a0a82ace5191c81a3211658a62b
diff --cc res/layout-land/account_setup.xml
index 5aa23e5c,d3622be5..b18b815f
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@@ -54,26 -54,36 +54,46 @@@
  			    android:gravity="center"
  			    android:orientation="vertical"
  			    android:padding="8dp" >
- 
++			    
 +				<Button
- 				    android:id="@+id/checkServerButton"
++				    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" />
  		
- 				<EditText
- 					android:id="@+id/hostUrlInput"
+ 			    <FrameLayout 
++	        		android:id="@+id/hostUrlFrame"
  					android:layout_width="match_parent"
  					android:layout_height="wrap_content"
- 					android:ems="10"
- 					android:hint="@string/auth_host_url"
- 					android:inputType="textUri"
- 					android:drawablePadding="5dp"
- 					>
- 					<requestFocus />
- 				</EditText>
+ 			        >
+ 					<EditText
+ 						android:id="@+id/hostUrlInput"
+ 						android:layout_width="match_parent"
+ 						android:layout_height="wrap_content"
+ 						android:hint="@string/auth_host_url"
+ 						android:inputType="textUri"
+ 						android:drawablePadding="5dp"
+ 						android:paddingRight="55dp"
+ 						>
+ 						<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"
+ 					    android:layout_marginRight="5dp"
+ 					    android:padding="0dp"
+ 					    android:scaleType="fitCenter"
+ 					    android:src="@drawable/ic_action_refresh_black"
+             			android:onClick="onRefreshClick"
+ 					    android:visibility="gone"
+ 						android:background="@android:color/transparent"
+ 					    />
+ 				</FrameLayout>
  		
  				<TextView
  					android:id="@+id/server_status_text"
diff --cc res/layout/account_setup.xml
index b4c1b636,1c7921d0..14dd20d6
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@@ -40,27 -40,37 +40,47 @@@
              android:layout_marginTop="10dp"
              android:src="@drawable/logo" />
  
 +        <Button
-             android:id="@+id/checkServerButton"
++            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" />
 +
- 		<EditText
- 			android:id="@+id/hostUrlInput"
+ 	    <FrameLayout 
++	        android:id="@+id/hostUrlFrame"
  			android:layout_width="match_parent"
  			android:layout_height="wrap_content"
- 			android:ems="10"
- 			android:hint="@string/auth_host_url"
- 			android:inputType="textUri"
- 			android:drawablePadding="5dp"
- 			>
- 			<requestFocus />
- 		</EditText>
+ 	        >
+ 			<EditText
+ 				android:id="@+id/hostUrlInput"
+ 				android:layout_width="match_parent"
+ 				android:layout_height="wrap_content"
+ 				android:hint="@string/auth_host_url"
+ 				android:inputType="textUri"
+ 				android:drawablePadding="5dp"
+ 				android:paddingRight="55dp"
+ 				>
+ 				<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"
+ 			    android:layout_marginRight="5dp"
+ 			    android:padding="0dp"
+ 			    android:scaleType="fitCenter"
+ 			    android:src="@drawable/ic_action_refresh_black"
+             	android:onClick="onRefreshClick"
+ 				android:visibility="gone"
+ 				android:background="@android:color/transparent"
+ 			    />
+ 		</FrameLayout>
  
-         <TextView
+ 		<TextView
              android:id="@+id/server_status_text"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index b6ead824,dabe98e8..18226a5e
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -132,8 -132,8 +131,8 @@@ implements  OnRemoteOperationListener, 
      private byte mAction;
      private Account mAccount;
  
-     private Button mCheckServerButton;
      private EditText mHostUrlInput;
 -    private ImageButton mRefreshButton;
++    private View mRefreshButton;
      private EditText mUsernameInput;
      private EditText mPasswordInput;
      private CheckBox mOAuth2Check;
@@@ -161,8 -159,8 +160,7 @@@
  
          /// set view and get references to view elements
          setContentView(R.layout.account_setup);
-         mCheckServerButton = (Button) findViewById(R.id.checkServerButton);
          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);
@@@ -187,25 -181,7 +185,19 @@@
          mAction = getIntent().getByteExtra(EXTRA_ACTION, ACTION_CREATE); 
          mAccount = null;
          mHostBaseUrl = "";
+         boolean refreshButtonEnabled = false;
 +        
-         // URL Branding
++        // URL input configuration applied
 +        if (!mHostUrlInputEnabled)
 +        {
 +            mHostUrlInput.setText(getString(R.string.server_url));
-             mHostUrlInput.setVisibility(View.GONE);
-             
-             mCheckServerButton.setVisibility(View.VISIBLE);
-             mCheckServerButton.setOnClickListener(new OnClickListener() {
-                 
-                 @Override
-                 public void onClick(View v) {
-                     checkOcServer();
-                     
-                 }
-             });
++            findViewById(R.id.hostUrlFrame).setVisibility(View.GONE);
 +            
-             checkOcServer();
++            mRefreshButton = findViewById(R.id.centeredRefreshButton);
++
++        } else {
++            mRefreshButton = findViewById(R.id.embeddedRefreshButton);
 +        }
  
          if (savedInstanceState == null) {
              /// connection state and info
@@@ -233,7 -209,11 +225,11 @@@
              }
              mOAuth2Check.setChecked(oAuthRequired);
              changeViewByOAuth2Check(oAuthRequired);
- 
+             mJustCreated = true;
+             
 -            if (mAction == ACTION_UPDATE_TOKEN) {
++            if (mAction == ACTION_UPDATE_TOKEN || !mHostUrlInputEnabled) {
+                 checkOcServer(); 
+             }
  
          } else {
              /// connection state and info
@@@ -1227,21 -1195,15 +1216,11 @@@
  
  
      private void showRefreshButton() {
-         mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_refresh_black, 0);
-         mRefreshButtonEnabled = true;
-         
-         if (!mHostUrlInputEnabled){
-            mCheckServerButton.setVisibility(View.VISIBLE); 
-         }
 -        /*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;
-         
-         if (!mHostUrlInputEnabled){
-             mCheckServerButton.setVisibility(View.INVISIBLE); 
-         }
 -        /*mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
 -        mRefreshButtonEnabled = false;*/
+         mRefreshButton.setVisibility(View.GONE);
      }
  
      /**