Added explanation in the view for PIN Code creation

diff --git a/res/layout/pincodelock.xml b/res/layout/pincodelock.xml
index a02ca26..45922ca 100644 (file)
--- a/res/layout/pincodelock.xml
+++ b/res/layout/pincodelock.xml
@@ -30,8 +30,17 @@
         android:layout_height="wrap_content"\r
         android:text="@string/pincode_enter_pin_code"\r
         android:textColor="@android:color/black"\r
         android:layout_height="wrap_content"\r
         android:text="@string/pincode_enter_pin_code"\r
         android:textColor="@android:color/black"\r

+        android:gravity="center_horizontal"\r

          />\r
          />\r

-\r\r
+\r    <TextView\r
+        android:id="@+id/pinHdrExpl"\r
+        android:layout_width="wrap_content"\r
+        android:layout_height="wrap_content"\r
+        android:text="@string/pincode_configure_your_pin_explanation"\r
+        android:textAppearance="@android:style/TextAppearance.Small"\r
+        android:gravity="center_horizontal"\r
+         />\r
+    \r

     <LinearLayout\r
         android:layout_width="fill_parent"\r
         android:layout_height="wrap_content"\r
     <LinearLayout\r
         android:layout_width="fill_parent"\r
         android:layout_height="wrap_content"\r

diff --git a/res/values-es-rAR/strings.xml b/res/values-es-rAR/strings.xml
index 11bd210..facd6a2 100644 (file)
--- a/res/values-es-rAR/strings.xml
+++ b/res/values-es-rAR/strings.xml
@@ -105,6 +105,7 @@
   <string name="pincode_enter_pin_code">Por favor, escribí el PIN de la aplicación</string>
   <string name="pincode_enter_new_pin_code">Por favor, escribí el nuevo PIN de la aplicación</string>
   <string name="pincode_configure_your_pin">Ingresá el PIN de la aplicación ownCloud</string>
   <string name="pincode_enter_pin_code">Por favor, escribí el PIN de la aplicación</string>
   <string name="pincode_enter_new_pin_code">Por favor, escribí el nuevo PIN de la aplicación</string>
   <string name="pincode_configure_your_pin">Ingresá el PIN de la aplicación ownCloud</string>

+  <string name="pincode_configure_your_pin_explanation">Se solicitará cada vez que se abra la aplicación</string> 

   <string name="pincode_reenter_your_pincode">Por favor, ingresá nuevamente el PIN de la aplicación ownCloud</string>
   <string name="pincode_remove_your_pincode">Borrar tu PIN de la aplicación ownCloud</string>
   <string name="pincode_mismatch">Los PIN de la aplicación ownCloud no son iguales</string>
   <string name="pincode_reenter_your_pincode">Por favor, ingresá nuevamente el PIN de la aplicación ownCloud</string>
   <string name="pincode_remove_your_pincode">Borrar tu PIN de la aplicación ownCloud</string>
   <string name="pincode_mismatch">Los PIN de la aplicación ownCloud no son iguales</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 123e72e..2fc35d8 100644 (file)
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -105,6 +105,7 @@
   <string name="pincode_enter_pin_code">Por favor, inserta tu PIN de aplicación</string>
   <string name="pincode_enter_new_pin_code">Por favor, inserta tu nuevo PIN de aplicación</string>
   <string name="pincode_configure_your_pin">Ingrese PIN de aplicación ownCloud</string>
   <string name="pincode_enter_pin_code">Por favor, inserta tu PIN de aplicación</string>
   <string name="pincode_enter_new_pin_code">Por favor, inserta tu nuevo PIN de aplicación</string>
   <string name="pincode_configure_your_pin">Ingrese PIN de aplicación ownCloud</string>

+  <string name="pincode_configure_your_pin_explanation">Se solicitará cada vez que se abra la aplicación</string> 

   <string name="pincode_reenter_your_pincode">Reingrese PIN de aplicación ownCloud, por favor</string>
   <string name="pincode_remove_your_pincode">Borrar tu PIN de aplicación ownCloud</string>
   <string name="pincode_mismatch">Los PIN de aplicación ownCloud no son iguales</string>
   <string name="pincode_reenter_your_pincode">Reingrese PIN de aplicación ownCloud, por favor</string>
   <string name="pincode_remove_your_pincode">Borrar tu PIN de aplicación ownCloud</string>
   <string name="pincode_mismatch">Los PIN de aplicación ownCloud no son iguales</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 12e71f7..f4b735a 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -111,6 +111,7 @@
     <string name="pincode_enter_pin_code">Please, insert your App PIN</string>
     <string name="pincode_enter_new_pin_code">Please, insert your new App PIN</string>
     <string name="pincode_configure_your_pin">Enter ownCloud App PIN</string>
     <string name="pincode_enter_pin_code">Please, insert your App PIN</string>
     <string name="pincode_enter_new_pin_code">Please, insert your new App PIN</string>
     <string name="pincode_configure_your_pin">Enter ownCloud App PIN</string>

+    <string name="pincode_configure_your_pin_explanation">It will be requested every time the app is opened</string> 

     <string name="pincode_reenter_your_pincode">Reenter ownCloud App PIN, please</string>
     <string name="pincode_remove_your_pincode">Remove your ownCloud App PIN</string>
     <string name="pincode_mismatch">Both ownCloud App PIN are not the same</string> 
     <string name="pincode_reenter_your_pincode">Reenter ownCloud App PIN, please</string>
     <string name="pincode_remove_your_pincode">Remove your ownCloud App PIN</string>
     <string name="pincode_mismatch">Both ownCloud App PIN are not the same</string> 

diff --git a/src/com/owncloud/android/ui/activity/PinCodeActivity.java b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
index c545fb2..ea22268 100644 (file)
--- a/src/com/owncloud/android/ui/activity/PinCodeActivity.java
+++ b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
@@ -48,6 +48,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
     
     Button bCancel;
     TextView mPinHdr;
     
     Button bCancel;
     TextView mPinHdr;

+    TextView mPinHdrExplanation;

     EditText mText1;
     EditText mText2;
     EditText mText3;
     EditText mText1;
     EditText mText2;
     EditText mText3;


@@ -73,6 +74,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
      
         bCancel = (Button) findViewById(R.id.cancel);
         mPinHdr = (TextView) findViewById(R.id.pinHdr);
      
         bCancel = (Button) findViewById(R.id.cancel);
         mPinHdr = (TextView) findViewById(R.id.pinHdr);

+        mPinHdrExplanation = (TextView) findViewById(R.id.pinHdrExpl);

         mText1 = (EditText) findViewById(R.id.txt1);
         mText1.requestFocus();
         getWindow().setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
         mText1 = (EditText) findViewById(R.id.txt1);
         mText1.requestFocus();
         getWindow().setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);


@@ -100,6 +102,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                if (activity.equals("preferences")){
                 // PIN has been activated yet
                  mPinHdr.setText(R.string.pincode_configure_your_pin);
                if (activity.equals("preferences")){
                 // PIN has been activated yet
                  mPinHdr.setText(R.string.pincode_configure_your_pin);

+                 mPinHdrExplanation.setVisibility(View.VISIBLE);

                  pinCodeChecked = true ; // No need to check it 
                  setChangePincodeView(true);
                }else{
                  pinCodeChecked = true ; // No need to check it 
                  setChangePincodeView(true);
                }else{


@@ -107,12 +110,14 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                  bCancel.setVisibility(View.INVISIBLE);
                  bCancel.setVisibility(View.GONE);
                  mPinHdr.setText(R.string.pincode_enter_pin_code);
                  bCancel.setVisibility(View.INVISIBLE);
                  bCancel.setVisibility(View.GONE);
                  mPinHdr.setText(R.string.pincode_enter_pin_code);

+                 mPinHdrExplanation.setVisibility(View.INVISIBLE);

                  setChangePincodeView(false);
               }
             
            }else {
             // pincode removal
               mPinHdr.setText(R.string.pincode_remove_your_pincode);
                  setChangePincodeView(false);
               }
             
            }else {
             // pincode removal
               mPinHdr.setText(R.string.pincode_remove_your_pincode);

+              mPinHdrExplanation.setVisibility(View.INVISIBLE);

               pinCodeChecked = false;
               setChangePincodeView(true); 
            }
               pinCodeChecked = false;
               setChangePincodeView(true); 
            }


@@ -136,6 +141,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         bCancel.setVisibility(View.INVISIBLE);
         bCancel.setVisibility(View.GONE);
         mPinHdr.setText(R.string.pincode_enter_pin_code);
         bCancel.setVisibility(View.INVISIBLE);
         bCancel.setVisibility(View.GONE);
         mPinHdr.setText(R.string.pincode_enter_pin_code);

+        mPinHdrExplanation.setVisibility(View.INVISIBLE);

     }
     
    
     }
     
    


@@ -450,6 +456,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
     
         clearBoxes(); 
         mPinHdr.setText(R.string.pincode_reenter_your_pincode); 
     
         clearBoxes(); 
         mPinHdr.setText(R.string.pincode_reenter_your_pincode); 

+        mPinHdrExplanation.setVisibility(View.INVISIBLE);        

         confirmingPinCode =true;
         
     }
         confirmingPinCode =true;
         
     }


@@ -493,6 +500,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             aDialog.show();
             clearBoxes(); 
             mPinHdr.setText(R.string.pincode_enter_pin_code);
             aDialog.show();
             clearBoxes(); 
             mPinHdr.setText(R.string.pincode_enter_pin_code);

+            mPinHdrExplanation.setVisibility(View.INVISIBLE);

             newPasswordEntered = true;
             confirmingPinCode = false;
             
             newPasswordEntered = true;
             confirmingPinCode = false;
             


@@ -537,6 +545,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             });
             aDialog.show();
             mPinHdr.setText(R.string.pincode_configure_your_pin);
             });
             aDialog.show();
             mPinHdr.setText(R.string.pincode_configure_your_pin);

+            mPinHdrExplanation.setVisibility(View.VISIBLE);

             clearBoxes();
         }
     
             clearBoxes();
         }