Fix for ssl popups padding, button style changed to borderless, fixed weight on buttons

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fc701a9..f36d248 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -133,7 +133,7 @@
         <activity
             android:name=".authentication.AuthenticatorActivity"
             android:exported="true"
-            android:theme="@style/Theme.ownCloud.noActionBar"
+            android:theme="@style/Theme.ownCloud.noActionBar.Login"
             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

diff --git a/res/layout/ssl_untrusted_cert_layout.xml b/res/layout/ssl_untrusted_cert_layout.xml
index 2342a8a..8ef7b13 100644 (file)
--- a/res/layout/ssl_untrusted_cert_layout.xml
+++ b/res/layout/ssl_untrusted_cert_layout.xml
@@ -21,7 +21,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="center"
-       android:layout_margin="16dp"
+       android:padding="16dp"
     android:orientation="vertical" >
 
        <TextView
@@ -32,6 +32,7 @@
                android:paddingBottom="16dp"
                android:text="@string/ssl_validator_header"
                android:textAppearance="?android:attr/textAppearanceMedium"
+               android:textColor="@android:color/black"
                 />
     
        <TextView
@@ -40,7 +41,7 @@
                android:layout_height="wrap_content"
                android:layout_weight="0"
                android:layout_gravity="left"
-               android:paddingLeft="20dp"
+               android:paddingLeft="8dp"
                android:text="@string/ssl_validator_reason_cert_not_trusted"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />
@@ -51,7 +52,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"
-               android:paddingLeft="20dp"
+               android:paddingLeft="8dp"
                android:text="@string/ssl_validator_reason_cert_expired"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />
@@ -61,7 +62,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"
-               android:paddingLeft="20dp"
+               android:paddingLeft="8dp"
                android:text="@string/ssl_validator_reason_cert_not_yet_valid"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />
@@ -71,7 +72,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"
-               android:paddingLeft="20dp"
+               android:paddingLeft="8dp"
                android:text="@string/ssl_validator_reason_hostname_not_verified"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />
@@ -81,7 +82,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"
-               android:paddingLeft="20dp"
+               android:paddingLeft="8dp"
                android:text="@string/ssl_validator_no_info_about_error"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />
@@ -89,7 +90,7 @@
     <ScrollView 
         android:id="@+id/details_scroll"
         android:visibility="gone" 
-       android:padding="20dp"
+       android:padding="8dp"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
@@ -436,27 +437,27 @@
 
                <android.support.v7.widget.AppCompatButton
             android:id="@+id/cancel"
-                       style="@style/ownCloud.Button"
+                       style="@style/Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/common_cancel" />
+            android:text="@string/common_no" />
 
                <android.support.v7.widget.AppCompatButton
             android:id="@+id/details_btn"
-                       style="@style/ownCloud.Button"
+                       style="@style/Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_weight="2"
             android:text="@string/ssl_validator_btn_details_see" />
 
                <android.support.v7.widget.AppCompatButton
             android:id="@+id/ok"
-                       style="@style/ownCloud.Button"
+                       style="@style/Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/common_ok" />
+            android:text="@string/common_yes" />
 
     </LinearLayout>
 

diff --git a/res/layout/ssl_validator_layout.xml b/res/layout/ssl_validator_layout.xml
index 4c6fb4f..4cbd46a 100644 (file)
--- a/res/layout/ssl_validator_layout.xml
+++ b/res/layout/ssl_validator_layout.xml
@@ -21,23 +21,25 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+       android:padding="16dp">
 
        <TextView
                android:id="@+id/header"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="@string/ssl_validator_header"
-               android:padding="5dp"
+               android:paddingBottom="16dp"
                android:textAppearance="?android:attr/textAppearanceMedium"
+               android:textColor="@color/black"
                 />
-    
+
        <TextView
                android:id="@+id/reason_cert_not_trusted"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"
-               android:paddingLeft="20dp"
+               android:paddingLeft="8dp"
                android:text="@string/ssl_validator_reason_cert_not_trusted"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />
@@ -47,7 +49,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"
-               android:paddingLeft="20dp"
+               android:paddingLeft="8dp"
                android:text="@string/ssl_validator_reason_cert_expired"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />
@@ -57,7 +59,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"
-               android:paddingLeft="20dp"
+               android:paddingLeft="8dp"
                android:text="@string/ssl_validator_reason_cert_not_yet_valid"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />
@@ -67,7 +69,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="left"
-               android:paddingLeft="20dp"
+               android:paddingLeft="8dp"
                android:text="@string/ssl_validator_reason_hostname_not_verified"
                android:textAppearance="?android:attr/textAppearanceSmall"
                 />
@@ -75,7 +77,7 @@
     <ScrollView 
         android:id="@+id/details_scroll"
         android:visibility="gone" 
-       android:padding="20dp"
+       android:padding="8dp"
         android:layout_width="wrap_content"
         android:layout_height="180dp">
         
@@ -397,7 +399,7 @@
         android:id="@+id/question"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-               android:padding="5dp"
+               android:paddingTop="16dp"
         android:text="@string/ssl_validator_question"
         android:textAppearance="?android:attr/textAppearanceMedium"
         >
@@ -410,27 +412,27 @@
 
                <android.support.v7.widget.AppCompatButton
             android:id="@+id/cancel"
-                       style="@style/ownCloud.Button"
+                       style="@style/Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/common_cancel" />
+            android:text="@string/common_no" />
 
                <android.support.v7.widget.AppCompatButton
             android:id="@+id/details_btn"
-                       style="@style/ownCloud.Button"
+                       style="@style/Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_weight="2"
             android:text="@string/ssl_validator_btn_details_see" />
 
                <android.support.v7.widget.AppCompatButton
             android:id="@+id/ok"
-                       style="@style/ownCloud.Button"
+                       style="@style/Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/common_ok" />
+            android:text="@string/common_yes" />
 
     </LinearLayout>
 

diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
index 42c4103..2491ad2 100644 (file)
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@ -200,9 +200,9 @@
   <string name="confirmation_remove_alert">Möchten Sie %1$s wirklich löschen?</string>
   <string name="confirmation_remove_folder_alert">Möchten Sie wirklich %1$s und dessen Inhalte entfernen?</string>
   <string name="confirmation_remove_local">Nur lokal</string>
-  <string name="confirmation_remove_folder_local">Nur lokale Inhalte</string>
-  <string name="confirmation_remove_remote">Vom Server entfernen</string>
-  <string name="confirmation_remove_remote_and_local">Lokal und auf Server</string>
+  <string name="confirmation_remove_folder_local">Nur lokal</string>
+  <string name="confirmation_remove_remote">Vom Server</string>
+  <string name="confirmation_remove_remote_and_local">Lokal &amp; Server</string>
   <string name="remove_success_msg">Erfolgreich gelöscht</string>
   <string name="remove_fail_msg">Der Löschvorgang konnte nicht beendet werden</string>
   <string name="rename_dialog_title">Geben Sie einen neuen Namen ein</string>
@@ -229,7 +229,7 @@
   <string name="ssl_validator_question">Möchten Sie diesem Zertifikat trotzdem vertrauen?</string>
   <string name="ssl_validator_not_saved">Das Zertifikat konnte nicht gespeichert werden</string>
   <string name="ssl_validator_btn_details_see">Details</string>
-  <string name="ssl_validator_btn_details_hide">Ausblenden</string>
+  <string name="ssl_validator_btn_details_hide">Überblick</string>
   <string name="ssl_validator_label_subject">Ausgestellt für:</string>
   <string name="ssl_validator_label_issuer">Ausgestellt von:</string>
   <string name="ssl_validator_label_CN">Üblicher Name:</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4d0b86e..d669ec3 100644 (file)
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -200,9 +200,9 @@
   <string name="confirmation_remove_alert">Möchtest Du %1$s wirklich löschen?</string>
   <string name="confirmation_remove_folder_alert">Möchtest Du wirklich %1$s und dessen Inhalte entfernen?</string>
   <string name="confirmation_remove_local">Nur lokal</string>
-  <string name="confirmation_remove_folder_local">Nur lokale Inhalte</string>
-  <string name="confirmation_remove_remote">Vom Server entfernen</string>
-  <string name="confirmation_remove_remote_and_local">Lokal und auf Server</string>
+  <string name="confirmation_remove_folder_local">Nur lokal</string>
+  <string name="confirmation_remove_remote">Vom Server</string>
+  <string name="confirmation_remove_remote_and_local">Lokal &amp; Server</string>
   <string name="remove_success_msg">Erfolgreich gelöscht</string>
   <string name="remove_fail_msg">Der Löschvorgang konnte nicht beendet werden</string>
   <string name="rename_dialog_title">Gib einen neuen Namen ein</string>

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 58a3eee..c7ce151 100644 (file)
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -25,6 +25,7 @@
 
     <color name="list_item_lastmod_and_filesize_text">#989898</color>
     <color name="black">#000000</color>
+    <color name="white">#FFFFFF</color>
     <color name="textColor">#303030</color>
     <color name="drawerMenuTextColor">#757575</color>
     <color name="list_divider_background">#fff0f0f0</color>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2de204d..a5d412b 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -208,9 +208,9 @@
     <string name="confirmation_remove_alert">"Do you really want to remove %1$s?"</string>
     <string name="confirmation_remove_folder_alert">"Do you really want to remove %1$s and its contents?"</string>
     <string name="confirmation_remove_local">Local only</string>
-    <string name="confirmation_remove_folder_local">Local contents only</string>
-    <string name="confirmation_remove_remote">Remove from server</string>
-    <string name="confirmation_remove_remote_and_local">Remote and local</string>
+    <string name="confirmation_remove_folder_local">Local only</string>
+    <string name="confirmation_remove_remote">From server</string>
+    <string name="confirmation_remove_remote_and_local">Remote &amp; local</string>
     <string name="remove_success_msg">"Removal succeeded"</string>
     <string name="remove_fail_msg">"Removal failed"</string>
     <string name="rename_dialog_title">Enter a new name</string>

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4ad0105..555d28c 100644 (file)
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -48,12 +48,20 @@
                <item name="colorControlHighlight">@color/color_accent</item>
     </style>
 
+       <style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar">
+               <item name="colorAccent">@color/white</item>
+       </style>
+
        <style name="ownCloud.Button" parent="Widget.AppCompat.Button">
                <item name="colorButtonNormal">@color/primary</item>
                <item name="colorControlActivated">@color/primary_dark</item>
                <item name="colorControlHighlight">@color/color_accent</item>
        </style>
 
+       <style name="Button.Borderless" parent="Base.Widget.AppCompat.Button.Borderless">
+               <item name="android:textColor">@color/color_accent</item>
+       </style>
+
        <!-- separat translucent action bar style -->
        <style name="Theme.ownCloud.Overlay" parent="style/Theme.ownCloud">
                <item name="android:actionBarStyle">@style/Theme.ownCloud.Overlay.ActionBar</item>

diff --git a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
index 72f40f9..28419e6 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
@@ -39,6 +39,8 @@ import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDia
 public class RemoveFileDialogFragment extends ConfirmationDialogFragment 
 implements ConfirmationDialogFragmentListener {
 
+    private OCFile mTargetFile;
+
     private static final String ARG_TARGET_FILE = "TARGET_FILE";
 
     /**
@@ -54,29 +56,26 @@ implements ConfirmationDialogFragmentListener {
         int messageStringId = R.string.confirmation_remove_alert;
         
         int posBtn = R.string.confirmation_remove_remote;
-        int neuBtn = -1;
+        int negBtn = -1;
         if (file.isFolder()) {
             messageStringId = R.string.confirmation_remove_folder_alert;
             posBtn = R.string.confirmation_remove_remote_and_local;
-            neuBtn = R.string.confirmation_remove_folder_local;
+            negBtn = R.string.confirmation_remove_local;
         } else if (file.isDown()) {
             posBtn = R.string.confirmation_remove_remote_and_local;
-            neuBtn = R.string.confirmation_remove_local;
+            negBtn = R.string.confirmation_remove_local;
         }
         
-        
         args.putInt(ARG_CONF_RESOURCE_ID, messageStringId);
         args.putStringArray(ARG_CONF_ARGUMENTS, new String[]{file.getFileName()});
         args.putInt(ARG_POSITIVE_BTN_RES, posBtn);
-        args.putInt(ARG_NEUTRAL_BTN_RES, neuBtn);
-        args.putInt(ARG_NEGATIVE_BTN_RES, R.string.common_cancel);
+        args.putInt(ARG_NEUTRAL_BTN_RES, R.string.common_no);
+        args.putInt(ARG_NEGATIVE_BTN_RES, negBtn);
         args.putParcelable(ARG_TARGET_FILE, file);
         frag.setArguments(args);
         
         return frag;
     }
-
-    private OCFile mTargetFile;
     
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -104,7 +103,7 @@ implements ConfirmationDialogFragmentListener {
      * Performs the removal of the local copy of the target file
      */
     @Override
-    public void onNeutral(String callerTag) {
+    public void onCancel(String callerTag) {
         ComponentsGetter cg = (ComponentsGetter)getActivity();
         cg.getFileOperationsHelper().removeFile(mTargetFile, true);
         
@@ -138,8 +137,7 @@ implements ConfirmationDialogFragmentListener {
     }
 
     @Override
-    public void onCancel(String callerTag) {
+    public void onNeutral(String callerTag) {
         // nothing to do here
     }
-    
 }
\ No newline at end of file