Code refactored for code merging.

Author: surinder-tsys

app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java

@@ -370,17 +370,15 @@ default void onDarkThemeModeChanged(DarkMode mode) {
 
     void setCalendarLastBackup(long timestamp);
 
+    void setOnBoardingComplete(boolean isCompleted);
+
+    boolean getOnBoardingComplete();
+
     void setPdfZoomTipShownCount(int count);
 
     int getPdfZoomTipShownCount();
 
     boolean isStoragePermissionRequested();
 
     void setStoragePermissionRequested(boolean value);
-
-    /**
-     * Saves the on-boarding completed flag
-     */
-    void setOnBoardingComplete(boolean isCompleted);
-    boolean getOnBoardingComplete();
 }

app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java

@@ -82,6 +82,8 @@ public final class AppPreferencesImpl implements AppPreferences {
     private static final String PREF__FOLDER_SORT_ORDER = "folder_sort_order";
     private static final String PREF__FOLDER_LAYOUT = "folder_layout";
 
+    private static final String PREF__ON_BOARDING_COMPLETE = "on_boarding_complete";
+
     private static final String PREF__LOCK_TIMESTAMP = "lock_timestamp";
     private static final String PREF__SHOW_MEDIA_SCAN_NOTIFICATIONS = "show_media_scan_notifications";
     private static final String PREF__LOCK = SettingsActivity.PREFERENCE_LOCK;
@@ -99,8 +101,6 @@ public final class AppPreferencesImpl implements AppPreferences {
 
     private static final String PREF__STORAGE_PERMISSION_REQUESTED = "storage_permission_requested";
 
-    private static final String PREF__ON_BOARDING_COMPLETE = "on_boarding_complete";
-
     private final Context context;
     private final SharedPreferences preferences;
     private final UserAccountManager userAccountManager;
@@ -689,6 +689,16 @@ public void setCalendarLastBackup(long timestamp) {
         preferences.edit().putLong(PREF__CALENDAR_LAST_BACKUP, timestamp).apply();
     }
 
+    @Override
+    public void setOnBoardingComplete(boolean isCompleted) {
+        preferences.edit().putBoolean(PREF__ON_BOARDING_COMPLETE, isCompleted).apply();
+    }
+
+    @Override
+    public boolean getOnBoardingComplete() {
+        return preferences.getBoolean(PREF__ON_BOARDING_COMPLETE, false);
+    }
+
     @Override
     public void setPdfZoomTipShownCount(int count) {
         preferences.edit().putInt(PREF__PDF_ZOOM_TIP_SHOWN, count).apply();
@@ -713,14 +723,4 @@ public void setStoragePermissionRequested(boolean value) {
     public int computeBruteForceDelay(int count) {
         return (int) Math.min(count / 3d, 10);
     }
-
-    @Override
-    public void setOnBoardingComplete(boolean isCompleted) {
-        preferences.edit().putBoolean(PREF__ON_BOARDING_COMPLETE, isCompleted).apply();
-    }
-
-    @Override
-    public boolean getOnBoardingComplete() {
-        return preferences.getBoolean(PREF__ON_BOARDING_COMPLETE, false);
-    }
 }

app/src/main/res/values-de/strings.xml

@@ -129,6 +129,7 @@
     <string name="common_switch_account">Konto wechseln</string>
     <string name="common_switch_to_account">Zu Konto wechseln</string>
     <string name="common_yes">Ja</string>
+    <string name="common_login">Anmelden</string>
     <string name="community_beta_headline">Testen Sie die Entwickler-Version</string>
     <string name="community_beta_text">Dies beinhaltet neue Funktionalitäten und ist nicht komplett qualitätsgesichert. Es können daher Fehler/Bugs auftreten, melden Sie uns solche bitte.</string>
     <string name="community_contribute_forum_forum">Forum</string>
@@ -977,5 +978,4 @@
         <item quantity="one">%d ausgewählt</item>
         <item quantity="other">%d ausgewählt</item>
     </plurals>
-    <string name="common_login">Anmelden</string>
 </resources>

app/src/main/res/values/dimens.xml

@@ -25,8 +25,10 @@
     <dimen name="login_btn_height">55dp</dimen>
     <dimen name="login_btn_bottom_margin">48dp</dimen>
     <dimen name="login_btn_bottom_margin_land">48dp</dimen>
+    <dimen name="login_btn_bottom_margin_small_screen">24dp</dimen>
     <dimen name="shared_with_me_icon_size">26dp</dimen>
     <dimen name="txt_size_20sp">20sp</dimen>
     <dimen name="notification_row_item_height">145dp</dimen>
     <dimen name="button_stroke_width">1dp</dimen>
+    <dimen name="txt_size_13sp">13sp</dimen>
 </resources>

app/src/main/res/values/strings.xml

@@ -125,6 +125,7 @@
     <string name="common_share">Share</string>
     <string name="common_skip">Skip</string>
     <string name="common_copy">Copy</string>
+    <string name="common_login">Login</string>
     <string name="about_title">About</string>
     <string name="delete_account">Remove account</string>
     <string name="delete_account_warning">Remove account %s and delete all local files?\n\nDeletion cannot be undone.</string>
@@ -1077,5 +1078,4 @@
     <string name="document_scan_export_dialog_images">Multiple images</string>
     <string name="download_cannot_create_file">Cannot create local file</string>
     <string name="download_download_invalid_local_file_name">Invalid filename for local file</string>
-    <string name="common_login">Login</string>
 </resources>