From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 6 Nov 2013 10:43:22 +0000 (+0100)
Subject: Merge branch 'develop' into setup_buttons
X-Git-Tag: oc-android-1.5.5~139^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a0efedc99d0421554b8f8e93ef631e54a4cb05cd?hp=-c

Merge branch 'develop' into setup_buttons
---

a0efedc99d0421554b8f8e93ef631e54a4cb05cd
diff --combined res/layout-land/account_setup.xml
index c6723629,15e872b1..1025bcff
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@@ -37,6 -37,7 +37,7 @@@
  			android:layout_height="wrap_content"
  			android:layout_weight="1"
  			android:layout_gravity="center"
+ 			android:background="@color/login_logo_background_color"
  			android:src="@drawable/logo" 
  			/>
  		
@@@ -186,26 -187,29 +187,26 @@@
  	</LinearLayout>
         
  	<Button
 -		android:id="@id/buttonOK"
 -		android:layout_width="match_parent"
 -		android:layout_height="wrap_content"
 -		android:background="@android:drawable/btn_default"
 -		android:layout_above="@id/account_register"
 -		android:layout_centerHorizontal="true"
 -		android:enabled="false"
 -		android:onClick="onOkClick"
 -		android:text="@string/setup_btn_connect"
 -		/>
 +	    android:id="@id/buttonOK"
 +	    android:layout_width="match_parent"
 +	    android:layout_height="wrap_content"
 +	    android:layout_above="@+id/welcome_link"
 +	    android:layout_centerHorizontal="true"
 +	    android:enabled="false"
 +	    android:onClick="onOkClick"
 +	    android:text="@string/setup_btn_connect" />
  
  	<Button
 -		android:id="@+id/account_register"
 -		android:layout_width="wrap_content"
 -		android:layout_height="wrap_content"
 -		android:layout_centerHorizontal="true"
 -		android:layout_alignParentBottom="true"
 -		android:background="@android:color/transparent"
 -		android:textColor="#0000FF"
 -		android:onClick="onRegisterClick"
 -		android:paddingTop="5dp"
 -		android:paddingBottom="5dp"
 -		android:text="@string/auth_register" 
 -		/>
 +	    android:id="@id/welcome_link"
 +	    android:layout_width="wrap_content"
 +	    android:layout_height="wrap_content"
 +	    android:layout_alignParentBottom="true"
 +	    android:layout_centerHorizontal="true"
 +	    android:background="@android:color/transparent"
 +	    android:onClick="onRegisterClick"
 +	    android:paddingBottom="5dp"
 +	    android:paddingTop="5dp"
 +	    android:text="@string/auth_register"
 +	    android:textColor="#0000FF"/>
  	
  </RelativeLayout>
diff --combined res/layout/account_setup.xml
index 52afe540,810e0836..d147780d
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@@ -40,6 -40,7 +40,7 @@@
              android:layout_height="wrap_content"
              android:layout_marginBottom="10dp"
              android:layout_marginTop="10dp"
+             android:background="@color/login_logo_background_color"
              android:src="@drawable/logo" />
  
          <Button
@@@ -170,22 -171,24 +171,22 @@@
              android:id="@+id/buttonOK"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
 -            android:background="@android:drawable/btn_default"
              android:layout_gravity="center_horizontal"
              android:enabled="false"
              android:onClick="onOkClick"
 -            android:text="@string/setup_btn_connect"
 -            />
 +            android:text="@string/setup_btn_connect" />
  
          <Button
 -            android:id="@+id/account_register"
 +            android:id="@+id/welcome_link"
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
              android:background="@android:color/transparent"
 -            android:textColor="#0000FF" 
              android:onClick="onRegisterClick"
              android:paddingBottom="5dp"
              android:paddingTop="5dp"
              android:text="@string/auth_register"
 -            />
 +            android:textColor="#0000FF"/>
 +
      </LinearLayout>
  
  </ScrollView>
diff --combined res/values/setup.xml
index 2092c3f3,31df6da2..a2fb403f
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@@ -9,10 -9,10 +9,11 @@@
      <string name ="data_folder">owncloud</string>
      <string name ="log_name">Owncloud_</string>
      
-     <!-- Server URL -->
+     <!-- URLs and flags related -->
      <string name="server_url"></string>
      <bool name="show_server_url_input">true</bool>
 -	<string name="url_account_register">"https://owncloud.com/mobile/new"</string>
 +    <bool name="show_welcome_link">true</bool>
++	<string name="welcome_link_url">"https://owncloud.com/mobile/new"</string>
      
      <!-- Flags to setup the authentication methods available in the app -->
      <string name="auth_method_oauth2">off</string>
@@@ -20,13 -20,11 +21,14 @@@
      
      <!-- Colors -->
      <color name="login_background_color">#FFFFFF</color>
+     <color name="login_logo_background_color">#FFFFFF</color>
      <color name="background_color">#F7F7F7</color>
      <color name="actionbar_start_color">#1D2D44</color>
      <color name="actionbar_end_color">#1D2D44</color>
      
 +    <!-- Button -->
 +    <color name="button_text_color">#000000</color>
 +    
      <!-- Multiaccount support -->
      <bool name="multiaccount_support">true</bool>
      
@@@ -43,4 -41,3 +45,4 @@@
  
  </resources>
  
 +
diff --combined src/com/owncloud/android/authentication/AuthenticatorActivity.java
index f6c21e2f,53f18bb4..8f7fc2c2
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -49,6 -49,7 +49,6 @@@ import android.widget.CheckBox
  import android.widget.EditText;
  import android.widget.TextView;
  import android.widget.TextView.OnEditorActionListener;
 -import android.widget.Toast;
  
  import com.actionbarsherlock.app.SherlockDialogFragment;
  import com.owncloud.android.Log_OC;
@@@ -68,7 -69,6 +68,7 @@@ import com.owncloud.android.ui.dialog.S
  import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
  import com.owncloud.android.utils.OwnCloudVersion;
  
 +
  import eu.alefzero.webdav.WebdavClient;
  
  /**
@@@ -193,16 -193,11 +193,16 @@@ implements  OnRemoteOperationListener, 
          /// 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);
 -        if (b != null) {
 -            b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));
 +        /// set visibility of link for new users
 +        boolean accountRegisterVisibility = getResources().getBoolean(R.bool.show_welcome_link);
 +        Button welcomeLink = (Button) findViewById(R.id.welcome_link);
 +        if (welcomeLink != null) {
 +            if (accountRegisterVisibility) {
 +                welcomeLink.setVisibility(View.VISIBLE);
 +                welcomeLink.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));            
 +            } else {
 +                findViewById(R.id.welcome_link).setVisibility(View.GONE);
 +            }
          }
  
          /// initialization
@@@ -1402,7 -1397,7 +1402,7 @@@
       * @param view      'Account register' button
       */
      public void onRegisterClick(View view) {
--        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_account_register)));
++        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.welcome_link_url)));
          setResult(RESULT_CANCELED);
          startActivity(register);
      }