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/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java index d6725c51d7ef..687900033b78 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 @@ -56,6 +56,7 @@ import com.nextcloud.common.NextcloudClient; 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; @@ -332,7 +333,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"); @@ -484,7 +486,8 @@ public void registerFabListener() { if (mFabMain != null) { // is not available in FolderPickerActivity - viewThemeUtils.material.themeFAB(mFabMain); + //NMC customization + FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain); mFabMain.setOnClickListener(v -> { final OCFileListBottomSheetDialog dialog = new OCFileListBottomSheetDialog(activity, @@ -2059,7 +2062,8 @@ public void setFabVisible(final boolean visible) { getActivity().runOnUiThread(() -> { if (visible) { mFabMain.show(); - viewThemeUtils.material.themeFAB(mFabMain); + //NMC customization + FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain); } else { mFabMain.hide(); } @@ -2109,10 +2113,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/res/values/colors.xml b/app/src/main/res/values/colors.xml index 89ed00a08bf2..46992e0a67c6 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -75,4 +75,93 @@ @android:color/white #666666 #A5A5A5 + + + #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 + + + @color/grey_0 + #191919 + @color/grey_0 + @color/grey_30 + #77b6bb + #5077b6bb