Эх сурвалжийг харах

Dark theme updates
TextInputLayout in share password dialog is styled to match the app.
Receive files picker shows server primary colour on Upload button.

Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>

Daniel Bailey 5 жил өмнө
parent
commit
853d7cd113

+ 6 - 4
src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -34,6 +34,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.ColorStateList;
 import android.content.res.Resources.NotFoundException;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
@@ -63,6 +64,7 @@ import android.widget.ProgressBar;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import com.google.android.material.button.MaterialButton;
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.preferences.AppPreferences;
 import com.owncloud.android.MainApp;
@@ -748,10 +750,10 @@ public class ReceiveExternalFilesActivity extends FileActivity
 
                 mListView.setAdapter(sa);
             }
-            Button btnChooseFolder = findViewById(R.id.uploader_choose_folder);
-                btnChooseFolder.setOnClickListener(this);
-            btnChooseFolder.getBackground().setColorFilter(ThemeUtils.primaryColor(getAccount(), true, this),
-                        PorterDuff.Mode.SRC_ATOP);
+            MaterialButton btnChooseFolder = findViewById(R.id.uploader_choose_folder);
+            btnChooseFolder.setBackgroundTintMode(PorterDuff.Mode.SRC_ATOP);
+            btnChooseFolder.setBackgroundTintList(ColorStateList.valueOf(ThemeUtils.primaryColor(this, true)));
+            btnChooseFolder.setOnClickListener(this);
             btnChooseFolder.setTextColor(ThemeUtils.fontColor(this));
 
             if (mFile.canWrite()) {

+ 1 - 0
src/main/java/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java

@@ -144,6 +144,7 @@ public class SharePasswordDialogFragment extends DialogFragment implements Dialo
         // Build the dialog
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(),
                 R.style.Theme_ownCloud_Dialog_NoButtonBarStyle);
+
         builder.setView(v)
                 .setPositiveButton(R.string.common_ok, this)
                 .setNegativeButton(R.string.common_cancel, this)

+ 6 - 2
src/main/res/layout/password_dialog.xml

@@ -27,7 +27,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/TextInputLayout"
-        app:passwordToggleDrawable="@drawable/password_visibility_selector">
+        app:hintTextColor="@color/fg_inverse"
+        app:passwordToggleDrawable="@drawable/password_visibility_selector"
+        app:boxBackgroundColor="@color/bg_default"
+        app:boxStrokeColor="@color/bg_fallback_highlight">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/share_password"
@@ -37,7 +40,8 @@
             android:hint="@string/hint_password"
             android:inputType="textPassword"
             android:layout_margin="@dimen/standard_margin"
-            android:autofillHints="password">
+            android:autofillHints="password"
+            android:textColorHint="@color/bg_fallback_highlight">
         </com.google.android.material.textfield.TextInputEditText>
 
     </com.google.android.material.textfield.TextInputLayout>

+ 5 - 0
src/main/res/values-v21/styles.xml

@@ -79,4 +79,9 @@
         <item name="colorControlNormal">@color/login_text_color</item>
         <item name="colorControlActivated">@color/login_text_color</item>
     </style>
+
+    <style name="Nextcloud.EditText.Generic" parent="ThemeOverlay.MaterialComponents.TextInputEditText">
+        <item name="colorControlNormal">@color/login_text_color</item>
+        <item name="colorControlActivated">@color/login_text_color</item>
+    </style>
 </resources>

+ 3 - 1
src/main/res/values/styles.xml

@@ -235,7 +235,9 @@
 
 	<style name="Theme.ownCloud.Dialog.NoButtonBarStyle" parent="@style/Theme.MaterialComponents.DayNight.Dialog.Alert">
 		<item name="windowNoTitle">false</item>
-		<item name="colorAccent">@color/color_accent</item>
+		<item name="colorAccent">@color/bg_fallback_highlight</item>
+        <item name="android:colorBackground">@color/bg_default</item>
+        <item name="colorControlActivated">@color/bg_fallback_highlight</item>
 	</style>
 
 	<style name="NavigationView_ItemTextAppearance">