Scan menu option color issue fixed.

nextmcloud · May 19, 2023 · 4ac2954 · 4ac2954
1 parent 48017d7
commit 4ac2954
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/app/src/main/java/com/nmc/android/ui/ScanActivity.java b/app/src/main/java/com/nmc/android/ui/ScanActivity.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.MenuItem;
@@ -87,15 +87,11 @@ private void setupActionBar() {
         ActionBar actionBar = getDelegate().getSupportActionBar();
 
         if (actionBar != null) {
-            viewThemeUtils.platform.themeStatusBar(this);
+            //required for NMC
+            actionBar.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.bg_default, null)));
             actionBar.setDisplayHomeAsUpEnabled(true);
-            Drawable backArrow = ResourcesCompat.getDrawable(
-                getResources(),
-                R.drawable.ic_arrow_back,
-                null);
-            if (backArrow != null) {
-                viewThemeUtils.androidx.themeActionBar(this, actionBar, backArrow);
-            }
+            //NMC Customization
+            viewThemeUtils.files.themeActionBar(this, actionBar, false);
         }
     }
 

diff --git a/app/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml b/app/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml
@@ -153,16 +153,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="@null"
-            android:src="@drawable/ic_baseline_format_shapes_24"
-            app:tint="@color/primary" />
+            android:src="@drawable/ic_scan_document"
+            app:tint="@color/bottom_sheet_icon_color" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
             android:text="@string/upload_scan_document"
-            android:textColor="@color/text_color"
+            android:textColor="@color/bottom_sheet_txt_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
 
     </LinearLayout>

diff --git a/app/src/main/res/layout/fragment_scan_save.xml b/app/src/main/res/layout/fragment_scan_save.xml
@@ -410,7 +410,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_margin"
         android:text="@string/common_save"
-        android:theme="@style/Button.Primary"
+        style="@style/Button.Primary"
         app:cornerRadius="@dimen/button_corner_radius"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"