#525 Adjust design to new style of Nextcloud app

- Fix branding for snackbar & ExceptionDialogFragment
- Add hint action for battery optimization

4 files changed, 15 insertions, 2 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandedSnackbar.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandedSnackbar.java
index 937373932..20e6f8dc8 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandedSnackbar.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandedSnackbar.java
@@ -6,10 +6,12 @@ import android.view.View;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
 
 import com.google.android.material.snackbar.BaseTransientBottomBar;
 import com.google.android.material.snackbar.Snackbar;
 
+import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.util.ColorUtil;
 
 import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.isBrandingEnabled;
@@ -24,6 +26,8 @@ public class BrandedSnackbar {
         if (isBrandingEnabled(view.getContext())) {
             @ColorInt final int color = readBrandMainColor(view.getContext());
             snackbar.setActionTextColor(ColorUtil.isColorDark(color) ? Color.WHITE : color);
+        } else {
+            snackbar.setActionTextColor(ContextCompat.getColor(view.getContext(), R.color.primary));
         }
         return snackbar;
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
index ca8f37e35..666deb0db 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
@@ -4,7 +4,10 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -85,12 +88,16 @@ public class ExceptionDialogFragment extends AppCompatDialogFragment {
         } else if (throwable instanceof NextcloudFilesAppNotSupportedException) {
             adapter.add(R.string.error_dialog_tip_files_outdated);
         } else if (throwable instanceof NextcloudApiNotRespondingException) {
-            adapter.add(R.string.error_dialog_tip_disable_battery_optimizations);
+            if (VERSION.SDK_INT >= VERSION_CODES.M) {
+                adapter.add(R.string.error_dialog_tip_disable_battery_optimizations, new Intent().setAction(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS).putExtra(INTENT_EXTRA_BUTTON_TEXT, R.string.error_action_open_battery_settings));
+            } else {
+                adapter.add(R.string.error_dialog_tip_disable_battery_optimizations);
+            }
             adapter.add(R.string.error_dialog_tip_files_force_stop);
             adapter.add(R.string.error_dialog_tip_files_delete_storage);
         } else if (throwable instanceof SocketTimeoutException || throwable instanceof ConnectException) {
             adapter.add(R.string.error_dialog_timeout_instance);
-            adapter.add(R.string.error_dialog_timeout_toggle, new Intent(android.provider.Settings.ACTION_WIFI_SETTINGS).putExtra(INTENT_EXTRA_BUTTON_TEXT, R.string.error_action_open_network));
+            adapter.add(R.string.error_dialog_timeout_toggle, new Intent(Settings.ACTION_WIFI_SETTINGS).putExtra(INTENT_EXTRA_BUTTON_TEXT, R.string.error_action_open_network));
         } else if (throwable instanceof JSONException || throwable instanceof NullPointerException) {
             adapter.add(R.string.error_dialog_check_server);
         } else if (throwable instanceof NextcloudHttpRequestFailedException) {
diff --git a/app/src/main/res/layout/item_tip.xml b/app/src/main/res/layout/item_tip.xml
index 96df0e431..2177d013c 100644
--- a/app/src/main/res/layout/item_tip.xml
+++ b/app/src/main/res/layout/item_tip.xml
@@ -27,6 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="40dp"
         android:layout_marginEnd="@dimen/spacer_1x"
+        android:textColor="@color/defaultBrand"
         android:visibility="visible"
         tools:text="@string/error_action_open_deck_info"
         tools:visibility="visible" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 896604e5f..51cd41e20 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -277,4 +277,5 @@
         <item quantity="other">%1$d errors while uploading</item>
     </plurals>
     <string name="simple_report">Report</string>
+    <string name="error_action_open_battery_settings">Battery settings</string>
 </resources>