Переглянути джерело

Polish m3 for account chooser and rename background

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 2 роки тому
батько
коміт
d1621d74d1

+ 9 - 2
app/src/main/java/com/nextcloud/ui/ChooseAccountDialogFragment.kt

@@ -50,6 +50,7 @@ import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.DisplayUtils.AvatarGenerationListener
 import com.owncloud.android.utils.theme.ThemeColorUtils
 import com.owncloud.android.utils.theme.ThemeDrawableUtils
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 import javax.inject.Inject
 
 private const val ARG_CURRENT_USER_PARAM = "currentUser"
@@ -72,6 +73,9 @@ class ChooseAccountDialogFragment :
     @Inject
     lateinit var clientFactory: ClientFactory
 
+    @Inject
+    lateinit var viewThemeUtils: ViewThemeUtils
+
     @Inject
     lateinit var themeColorUtils: ThemeColorUtils
 
@@ -90,9 +94,12 @@ class ChooseAccountDialogFragment :
         _binding = DialogChooseAccountBinding.inflate(layoutInflater)
         dialogView = binding.root
 
-        return MaterialAlertDialogBuilder(requireContext())
+        val builder = MaterialAlertDialogBuilder(requireContext())
             .setView(binding.root)
-            .create()
+
+        viewThemeUtils.dialog.colorMaterialAlertDialogBackground(binding.statusView.context, builder)
+
+        return builder.create()
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

+ 2 - 1
app/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java

@@ -180,10 +180,11 @@ public class RenameFileDialogFragment
             .setPositiveButton(R.string.file_rename, this)
             .setNeutralButton(R.string.common_cancel, this)
             .setTitle(R.string.rename_dialog_title);
-        Dialog d = builder.create();
 
         viewThemeUtils.dialog.colorMaterialAlertDialogBackground(binding.userInputContainer.getContext(), builder);
 
+        Dialog d = builder.create();
+
         Window window = d.getWindow();
         if (window != null) {
             window.setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_VISIBLE);

+ 2 - 1
app/src/main/res/layout/account_item.xml

@@ -27,7 +27,8 @@
     android:layout_margin="@dimen/standard_quarter_margin"
     android:orientation="horizontal"
     app:cardBackgroundColor="@color/transparent"
-    app:cardElevation="0dp">
+    app:cardElevation="0dp"
+    app:strokeWidth="@dimen/zero">
 
     <RelativeLayout
         android:layout_width="match_parent"