From 398cd8bbf94540ab4bc01f53824964064d4fcf11 Mon Sep 17 00:00:00 2001 From: A117870935 Date: Mon, 12 Jun 2023 15:18:31 +0530 Subject: [PATCH] NMC-2258: Snackbar theme customized. NMC-2047: Customized floating action button. --- .../com/nmc/android/utils/FabThemeUtils.kt | 40 +++++++++ .../android/ui/activity/EditorWebView.java | 1 - .../android/ui/activity/FileActivity.java | 3 - .../ui/fragment/OCFileListFragment.java | 16 ++-- .../ui/preview/PreviewTextStringFragment.java | 4 +- .../owncloud/android/utils/PermissionUtil.kt | 2 +- app/src/main/res/values-night/colors.xml | 65 ++++++++++++++ app/src/main/res/values-night/themes.xml | 4 + app/src/main/res/values/colors.xml | 90 +++++++++++++++++++ .../main/res/values/nmc_snackbar_styles.xml | 16 ++++ app/src/main/res/values/styles.xml | 12 +++ app/src/main/res/values/themes.xml | 4 + 12 files changed, 246 insertions(+), 11 deletions(-) create mode 100644 app/src/main/java/com/nmc/android/utils/FabThemeUtils.kt create mode 100644 app/src/main/res/values/nmc_snackbar_styles.xml diff --git a/app/src/main/java/com/nmc/android/utils/FabThemeUtils.kt b/app/src/main/java/com/nmc/android/utils/FabThemeUtils.kt new file mode 100644 index 000000000000..a8662285ea47 --- /dev/null +++ b/app/src/main/java/com/nmc/android/utils/FabThemeUtils.kt @@ -0,0 +1,40 @@ +package com.nmc.android.utils + +import android.content.Context +import android.content.res.ColorStateList +import android.graphics.Color +import com.google.android.material.floatingactionbutton.FloatingActionButton +import com.owncloud.android.R + +object FabThemeUtils { + @JvmStatic + fun colorFloatingActionButton( + context: Context, + button: FloatingActionButton + ) { + val primaryColor = context.resources.getColor(R.color.primary, null) + val disableColor = context.resources.getColor(R.color.grey_0, null) + + val bgStates = arrayOf( + intArrayOf(android.R.attr.state_enabled), + intArrayOf(-android.R.attr.state_enabled), + ) + val bgColors = intArrayOf( + primaryColor, + disableColor + ) + + button.backgroundTintList = ColorStateList(bgStates, bgColors) + + val imageStates = arrayOf( + intArrayOf(android.R.attr.state_enabled), + intArrayOf(-android.R.attr.state_enabled), + ) + val imageColors = intArrayOf( + Color.WHITE, + disableColor + ) + + button.imageTintList = ColorStateList(imageStates, imageColors) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java b/app/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java index c77a2e6621df..77d8131005e8 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java @@ -88,7 +88,6 @@ public void onUrlLoaded(String loadedUrl) { R.string.timeout_richDocuments, Snackbar.LENGTH_INDEFINITE) .setAction(R.string.common_cancel, v -> closeView()); - viewThemeUtils.material.themeSnackbar(snackbar); setLoadingSnackbar(snackbar); snackbar.show(); } diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java index 67b593f74f42..e7987e3d1cb8 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java @@ -739,7 +739,6 @@ public static void copyAndShareFileLink(FileActivity activity, Snackbar snackbar = Snackbar.make(activity.findViewById(android.R.id.content), R.string.clipboard_text_copied, Snackbar.LENGTH_LONG) .setAction(R.string.share, v -> showShareLinkDialog(activity, file, link)); - viewThemeUtils.material.themeSnackbar(snackbar); snackbar.show(); } } @@ -809,7 +808,6 @@ private void onUpdateShareInformation(RemoteOperationResult result, @StringRes i snackbar = Snackbar.make(sharingFragment.getView(), result.getMessage(), Snackbar.LENGTH_LONG); } - viewThemeUtils.material.themeSnackbar(snackbar); snackbar.show(); } } @@ -886,7 +884,6 @@ private void onCreateShareViaLinkOperationFinish(CreateShareViaLinkOperation ope operation, getResources()), Snackbar.LENGTH_LONG); - viewThemeUtils.material.themeSnackbar(snackbar); snackbar.show(); } } diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java index 8158c1a0c112..8445f411103e 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -54,6 +54,7 @@ import com.nextcloud.ui.fileactions.FileAction; import com.nextcloud.ui.fileactions.FileActionsBottomSheet; import com.nextcloud.utils.EditorUtils; +import com.nmc.android.utils.FabThemeUtils; import com.nextcloud.utils.ShortcutUtil; import com.nextcloud.utils.extensions.BundleExtensionsKt; import com.nextcloud.utils.extensions.FileExtensionsKt; @@ -336,7 +337,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, if (mFabMain != null) { // is not available in FolderPickerActivity - viewThemeUtils.material.themeFAB(mFabMain); + //NMC customization + FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain); } Log_OC.i(TAG, "onCreateView() end"); @@ -524,7 +526,8 @@ public void registerFabListener() { } // is not available in FolderPickerActivity - viewThemeUtils.material.themeFAB(mFabMain); + //NMC customization + FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain); mFabMain.setOnClickListener(v -> { PermissionUtil.requestMediaLocationPermission(fileActivity); final OCFileListBottomSheetDialog dialog = new OCFileListBottomSheetDialog(fileActivity, @@ -2273,7 +2276,8 @@ public void setFabVisible(final boolean visible) { activity.runOnUiThread(() -> { if (visible) { mFabMain.show(); - viewThemeUtils.material.themeFAB(mFabMain); + // NMC customization + FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain); } else { mFabMain.hide(); } @@ -2305,10 +2309,12 @@ public void setFabEnabled(final boolean enabled) { getActivity().runOnUiThread(() -> { if (enabled) { mFabMain.setEnabled(true); - viewThemeUtils.material.themeFAB(mFabMain); + //NMC customization + FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain); } else { mFabMain.setEnabled(false); - viewThemeUtils.material.themeFAB(mFabMain); + //NMC customization + FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain); } }); } diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java index b9aa3f092a5f..9dcd02cd2fbc 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java @@ -19,6 +19,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.nextcloud.android.lib.richWorkspace.RichWorkspaceDirectEditingRemoteOperation; import com.nextcloud.utils.extensions.FileExtensionsKt; +import com.nmc.android.utils.FabThemeUtils; import com.owncloud.android.R; import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.ui.activity.FileDisplayActivity; @@ -85,7 +86,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, fabMain.setOnClickListener(v -> edit()); fabMain.setImageResource(R.drawable.ic_edit); - viewThemeUtils.material.themeFAB(fabMain); + //NMC customization + FabThemeUtils.colorFloatingActionButton(requireActivity(), fabMain); return view; } diff --git a/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt b/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt index cca5cd86753f..4c1e9d55b028 100644 --- a/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt +++ b/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt @@ -189,7 +189,7 @@ object PermissionUtil { Snackbar.LENGTH_INDEFINITE ).setAction(R.string.common_ok) { doRequest() - }.also { viewThemeUtils.material.themeSnackbar(it) }.show() + }.show() } else { // No explanation needed, request the permission. doRequest() diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index db1e1d218038..e51fe9edd7db 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -39,4 +39,69 @@ @android:color/white #101418 + + + #FFFFFF + @color/grey_30 + @color/grey_30 + #CCCCCC + @color/grey_70 + @color/grey_80 + #2D2D2D + @color/grey_70 + @color/grey_70 + + + @color/grey_80 + @color/grey_0 + + + @color/grey_80 + @color/grey_0 + + + @color/grey_60 + @color/grey_0 + @color/grey_0 + @color/grey_30 + #FFFFFF + @color/grey_30 + @color/grey_80 + #FFFFFF + + + @color/grey_80 + @color/grey_30 + @color/grey_0 + + + @color/grey_80 + @color/grey_0 + @color/grey_80 + + + @color/grey_70 + @color/grey_60 + + + @color/grey_70 + @color/grey_70 + + + #FFFFFF + @color/grey_30 + @color/grey_0 + @color/grey_0 + @color/grey_0 + @color/grey_0 + @color/grey_60 + @color/grey_0 + #FFFFFF + #7d94f9 + + + #121212 + @color/grey_0 + @color/grey_80 + @color/grey_80 diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 19b3ce692520..eb839d0b746f 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -19,6 +19,10 @@ false true true + + @style/SnackBarBackgroundStyle + @style/SnackBarActionButtonStyle + @style/SnackBarTextViewStyle @style/Widget.App.TextInputLayout @style/Nextcloud.Widget.PopupMenu @style/ThemeOverlay.App.BottomSheetDialog diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 02287ed52f2a..dde709c6a49a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -87,4 +87,94 @@ #A5A5A5 #F7F9FF + + + #191919 + @color/primary + #191919 + #191919 + @color/grey_30 + @android:color/white + #FFFFFF + @color/grey_0 + #CCCCCC + #77c4ff + #B3FFFFFF + @color/grey_10 + + + #101010 + #F2F2F2 + #E5E5E5 + #B2B2B2 + #666666 + #4C4C4C + #333333 + + + @color/design_snackbar_background_color + @color/white + + + #FFFFFF + #191919 + + + @color/grey_0 + #191919 + @color/primary + #191919 + @color/primary + @color/grey_30 + @color/white + #191919 + + + #FFFFFF + #191919 + #191919 + + + #FFFFFF + #191919 + #FFFFFF + + + @color/primary + #F399C7 + #FFFFFF + @color/grey_30 + @color/grey_10 + @color/grey_0 + + + @color/primary + @color/grey_30 + @color/grey_30 + #CCCCCC + + + #191919 + @color/grey_30 + #191919 + #191919 + #191919 + #191919 + @color/grey_30 + #191919 + #000000 + #191919 + #F6E5EB + #C16F81 + #0D39DF + #0099ff + #2238df + + + @color/grey_0 + #191919 + @color/grey_0 + @color/grey_30 + #77b6bb + #5077b6bb diff --git a/app/src/main/res/values/nmc_snackbar_styles.xml b/app/src/main/res/values/nmc_snackbar_styles.xml new file mode 100644 index 000000000000..23aadc577694 --- /dev/null +++ b/app/src/main/res/values/nmc_snackbar_styles.xml @@ -0,0 +1,16 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 17cdbaabca4a..d6cc6f2224d3 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -27,6 +27,10 @@ @color/primary_dark @color/secondary_text_color @style/ownCloud.SearchView + + @style/SnackBarBackgroundStyle + @style/SnackBarActionButtonStyle + @style/SnackBarTextViewStyle @color/action_mode_background @style/FallbackDatePickerDialogTheme @color/bg_default @@ -47,6 +51,10 @@ @color/bg_default @color/secondary_text_color @style/FallbackTheming.Dialog + + @style/SnackBarBackgroundStyle + @style/SnackBarActionButtonStyle + @style/SnackBarTextViewStyle @color/action_mode_background @style/FallbackDatePickerDialogTheme @color/bg_default @@ -291,6 +299,10 @@