Skip to content

Commit d01fe67

Browse files
surinder-tsyssurinder-tsys
committed
NMC-2258: Snackbar theme customized.
NMC-2047: Customized floating action button.
1 parent a311dad commit d01fe67

File tree

12 files changed

+246
-11
lines changed

12 files changed

+246
-11
lines changed

‎app/src/main/java/com/nmc/android/utils/FabThemeUtils.kt‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package com.nmc.android.utils
2+
3+
import android.content.Context
4+
import android.content.res.ColorStateList
5+
import android.graphics.Color
6+
import com.google.android.material.floatingactionbutton.FloatingActionButton
7+
import com.owncloud.android.R
8+
9+
object FabThemeUtils {
10+
@JvmStatic
11+
fun colorFloatingActionButton(
12+
context: Context,
13+
button: FloatingActionButton
14+
) {
15+
val primaryColor = context.resources.getColor(R.color.primary, null)
16+
val disableColor = context.resources.getColor(R.color.grey_0, null)
17+
18+
val bgStates = arrayOf(
19+
intArrayOf(android.R.attr.state_enabled),
20+
intArrayOf(-android.R.attr.state_enabled),
21+
)
22+
val bgColors = intArrayOf(
23+
primaryColor,
24+
disableColor
25+
)
26+
27+
button.backgroundTintList = ColorStateList(bgStates, bgColors)
28+
29+
val imageStates = arrayOf(
30+
intArrayOf(android.R.attr.state_enabled),
31+
intArrayOf(-android.R.attr.state_enabled),
32+
)
33+
val imageColors = intArrayOf(
34+
Color.WHITE,
35+
disableColor
36+
)
37+
38+
button.imageTintList = ColorStateList(imageStates, imageColors)
39+
}
40+
}

‎app/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ public void onUrlLoaded(String loadedUrl) {
8585
R.string.timeout_richDocuments, Snackbar.LENGTH_INDEFINITE)
8686
.setAction(R.string.common_cancel, v -> closeView());
8787

88-
viewThemeUtils.material.themeSnackbar(snackbar);
8988
setLoadingSnackbar(snackbar);
9089
snackbar.show();
9190
}

‎app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,6 @@ public static void copyAndShareFileLink(FileActivity activity,
715715
Snackbar snackbar = Snackbar.make(activity.findViewById(android.R.id.content), R.string.clipboard_text_copied,
716716
Snackbar.LENGTH_LONG)
717717
.setAction(R.string.share, v -> showShareLinkDialog(activity, file, link));
718-
viewThemeUtils.material.themeSnackbar(snackbar);
719718
snackbar.show();
720719
}
721720
}
@@ -785,7 +784,6 @@ private void onUpdateShareInformation(RemoteOperationResult result, @StringRes i
785784
snackbar = Snackbar.make(sharingFragment.getView(), result.getMessage(), Snackbar.LENGTH_LONG);
786785
}
787786

788-
viewThemeUtils.material.themeSnackbar(snackbar);
789787
snackbar.show();
790788
}
791789
}
@@ -862,7 +860,6 @@ private void onCreateShareViaLinkOperationFinish(CreateShareViaLinkOperation ope
862860
operation,
863861
getResources()),
864862
Snackbar.LENGTH_LONG);
865-
viewThemeUtils.material.themeSnackbar(snackbar);
866863
snackbar.show();
867864
}
868865
}

‎app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
import com.nextcloud.common.NextcloudClient;
6060
import com.nextcloud.ui.fileactions.FileActionsBottomSheet;
6161
import com.nextcloud.utils.EditorUtils;
62+
import com.nmc.android.utils.FabThemeUtils;
6263
import com.nextcloud.utils.ShortcutUtil;
6364
import com.nextcloud.utils.extensions.BundleExtensionsKt;
6465
import com.nextcloud.utils.extensions.FileExtensionsKt;
@@ -341,7 +342,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
341342

342343
if (mFabMain != null) {
343344
// is not available in FolderPickerActivity
344-
viewThemeUtils.material.themeFAB(mFabMain);
345+
//NMC customization
346+
FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain);
345347
}
346348

347349
Log_OC.i(TAG, "onCreateView() end");
@@ -519,7 +521,8 @@ public void registerFabListener() {
519521

520522
if (mFabMain != null) {
521523
// is not available in FolderPickerActivity
522-
viewThemeUtils.material.themeFAB(mFabMain);
524+
//NMC customization
525+
FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain);
523526
mFabMain.setOnClickListener(v -> {
524527
PermissionUtil.requestMediaLocationPermission(activity);
525528

@@ -2219,7 +2222,8 @@ public void setFabVisible(final boolean visible) {
22192222
getActivity().runOnUiThread(() -> {
22202223
if (visible) {
22212224
mFabMain.show();
2222-
viewThemeUtils.material.themeFAB(mFabMain);
2225+
//NMC customization
2226+
FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain);
22232227
} else {
22242228
mFabMain.hide();
22252229
}
@@ -2269,10 +2273,12 @@ public void setFabEnabled(final boolean enabled) {
22692273
getActivity().runOnUiThread(() -> {
22702274
if (enabled) {
22712275
mFabMain.setEnabled(true);
2272-
viewThemeUtils.material.themeFAB(mFabMain);
2276+
//NMC customization
2277+
FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain);
22732278
} else {
22742279
mFabMain.setEnabled(false);
2275-
viewThemeUtils.material.themeFAB(mFabMain);
2280+
//NMC customization
2281+
FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain);
22762282
}
22772283
});
22782284
}

‎app/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.google.android.material.floatingactionbutton.FloatingActionButton;
2020
import com.nextcloud.android.lib.richWorkspace.RichWorkspaceDirectEditingRemoteOperation;
2121
import com.nextcloud.utils.extensions.FileExtensionsKt;
22+
import com.nmc.android.utils.FabThemeUtils;
2223
import com.owncloud.android.R;
2324
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
2425
import com.owncloud.android.ui.activity.FileDisplayActivity;
@@ -85,7 +86,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
8586
fabMain.setOnClickListener(v -> edit());
8687

8788
fabMain.setImageResource(R.drawable.ic_edit);
88-
viewThemeUtils.material.themeFAB(fabMain);
89+
//NMC customization
90+
FabThemeUtils.colorFloatingActionButton(requireActivity(), fabMain);
8991

9092
return view;
9193
}

‎app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ object PermissionUtil {
180180
Snackbar.LENGTH_INDEFINITE
181181
).setAction(R.string.common_ok) {
182182
doRequest()
183-
}.also { viewThemeUtils.material.themeSnackbar(it) }.show()
183+
}.show()
184184
} else {
185185
// No explanation needed, request the permission.
186186
doRequest()

‎app/src/main/res/values-night/colors.xml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,69 @@
3838
<color name="fontAppbar">@android:color/white</color>
3939

4040
<color name="actionbar_color">#101418</color>
41+
42+
<!-- NMC Colors -->
43+
<color name="icon_color">#FFFFFF</color>
44+
<color name="sort_text_color">@color/grey_30</color>
45+
<color name="list_icon_color">@color/grey_30</color>
46+
<color name="warning_icon_color">#CCCCCC</color>
47+
<color name="divider_color">@color/grey_70</color>
48+
<color name="spinner_bg_color">@color/grey_80</color>
49+
<color name="refresh_layout_bg_color">#2D2D2D</color>
50+
<color name="primary_button_disabled_color">@color/grey_70</color>
51+
<color name="toolbar_divider_color">@color/grey_70</color>
52+
53+
<!-- Snackbar Colors -->
54+
<color name="snackbar_bg_color">@color/grey_80</color>
55+
<color name="snackbar_txt_color">@color/grey_0</color>
56+
57+
<!-- Alert Dialog Colors -->
58+
<color name="alert_bg_color">@color/grey_80</color>
59+
<color name="alert_txt_color">@color/grey_0</color>
60+
61+
<!-- NavigationView colors -->
62+
<color name="nav_selected_bg_color">@color/grey_60</color>
63+
<color name="nav_txt_unselected_color">@color/grey_0</color>
64+
<color name="nav_txt_selected_color">@color/grey_0</color>
65+
<color name="nav_icon_unselected_color">@color/grey_30</color>
66+
<color name="nav_icon_selected_color">#FFFFFF</color>
67+
<color name="nav_divider_color">@color/grey_30</color>
68+
<color name="nav_bg_color">@color/grey_80</color>
69+
<color name="drawer_quota_txt_color">#FFFFFF</color>
70+
71+
<!-- Bottom Sheet Colors -->
72+
<color name="bottom_sheet_bg_color">@color/grey_80</color>
73+
<color name="bottom_sheet_icon_color">@color/grey_30</color>
74+
<color name="bottom_sheet_txt_color">@color/grey_0</color>
75+
76+
<!-- Popup Menu Colors -->
77+
<color name="popup_menu_bg">@color/grey_80</color>
78+
<color name="popup_menu_txt_color">@color/grey_0</color>
79+
<color name="overflow_bg_color">@color/grey_80</color>
80+
81+
<!-- Switch Compat Colors -->
82+
<color name="switch_thumb_disabled">@color/grey_70</color>
83+
<color name="switch_track_disabled">@color/grey_60</color>
84+
85+
<!-- Checkbox Colors -->
86+
<color name="checkbox_checked_disabled">@color/grey_70</color>
87+
<color name="checkbox_unchecked_disabled">@color/grey_70</color>
88+
89+
<!-- Share Colors -->
90+
<color name="share_title_txt_color">#FFFFFF</color>
91+
<color name="share_subtitle_txt_color">@color/grey_30</color>
92+
<color name="share_info_txt_color">@color/grey_0</color>
93+
<color name="share_search_border_color">@color/grey_0</color>
94+
<color name="share_btn_txt_color">@color/grey_0</color>
95+
<color name="share_list_item_txt_color">@color/grey_0</color>
96+
<color name="share_disabled_txt_color">@color/grey_60</color>
97+
<color name="share_txt_color">@color/grey_0</color>
98+
<color name="share_et_divider">#FFFFFF</color>
99+
<color name="share_blue_color">#7d94f9</color>
100+
101+
<!-- Scan Colors -->
102+
<color name="scan_doc_bg_color">#121212</color>
103+
<color name="scan_text_color">@color/grey_0</color>
104+
<color name="scan_edit_bottom_color">@color/grey_80</color>
105+
<color name="scan_count_bg_color">@color/grey_80</color>
41106
</resources>

‎app/src/main/res/values-night/themes.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
<item name="windowActionBar">false</item>
2020
<item name="windowActionModeOverlay">true</item>
2121
<item name="windowNoTitle">true</item>
22+
<!-- SnackBar Styling -->
23+
<item name="snackbarStyle">@style/SnackBarBackgroundStyle</item>
24+
<item name="snackbarButtonStyle">@style/SnackBarActionButtonStyle</item>
25+
<item name="snackbarTextViewStyle">@style/SnackBarTextViewStyle</item>
2226
<item name="textInputStyle">@style/Widget.App.TextInputLayout</item>
2327
<item name="popupMenuStyle">@style/Nextcloud.Widget.PopupMenu</item>
2428
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog</item>

‎app/src/main/res/values/colors.xml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,94 @@
7878
<color name="fontSecondaryAppbar">#A5A5A5</color>
7979

8080
<color name="actionbar_color">#F7F9FF</color>
81+
82+
<!-- NMC Colors -->
83+
<color name="icon_color">#191919</color>
84+
<color name="sort_text_color">@color/primary</color>
85+
<color name="list_icon_color">#191919</color>
86+
<color name="warning_icon_color">#191919</color>
87+
<color name="divider_color">@color/grey_30</color>
88+
<color name="spinner_bg_color">@android:color/white</color>
89+
<color name="refresh_layout_bg_color">#FFFFFF</color>
90+
<color name="primary_button_disabled_color">@color/grey_0</color>
91+
<color name="toolbar_divider_color">#CCCCCC</color>
92+
<color name="et_highlight_color">#77c4ff</color>
93+
<color name="white_trans_70">#B3FFFFFF</color>
94+
<color name="progress_bar_background">@color/grey_10</color>
95+
96+
<!-- Grey Colors -->
97+
<color name="dark_grey">#101010</color>
98+
<color name="grey_0">#F2F2F2</color>
99+
<color name="grey_10">#E5E5E5</color>
100+
<color name="grey_30">#B2B2B2</color>
101+
<color name="grey_60">#666666</color>
102+
<color name="grey_70">#4C4C4C</color>
103+
<color name="grey_80">#333333</color>
104+
105+
<!-- Snackbar Colors -->
106+
<color name="snackbar_bg_color">@color/design_snackbar_background_color</color>
107+
<color name="snackbar_txt_color">@color/white</color>
108+
109+
<!-- Alert Dialog Colors -->
110+
<color name="alert_bg_color">#FFFFFF</color>
111+
<color name="alert_txt_color">#191919</color>
112+
113+
<!-- NavigationView colors -->
114+
<color name="nav_selected_bg_color">@color/grey_0</color>
115+
<color name="nav_txt_unselected_color">#191919</color>
116+
<color name="nav_txt_selected_color">@color/primary</color>
117+
<color name="nav_icon_unselected_color">#191919</color>
118+
<color name="nav_icon_selected_color">@color/primary</color>
119+
<color name="nav_divider_color">@color/grey_30</color>
120+
<color name="nav_bg_color">@color/white</color>
121+
<color name="drawer_quota_txt_color">#191919</color>
122+
123+
<!-- Bottom Sheet Colors -->
124+
<color name="bottom_sheet_bg_color">#FFFFFF</color>
125+
<color name="bottom_sheet_icon_color">#191919</color>
126+
<color name="bottom_sheet_txt_color">#191919</color>
127+
128+
<!-- Popup Menu Colors -->
129+
<color name="popup_menu_bg">#FFFFFF</color>
130+
<color name="popup_menu_txt_color">#191919</color>
131+
<color name="overflow_bg_color">#FFFFFF</color>
132+
133+
<!-- Switch Compat Colors -->
134+
<color name="switch_thumb_checked_enabled">@color/primary</color>
135+
<color name="switch_track_checked_enabled">#F399C7</color>
136+
<color name="switch_thumb_unchecked_enabled">#FFFFFF</color>
137+
<color name="switch_track_unchecked_enabled">@color/grey_30</color>
138+
<color name="switch_thumb_disabled">@color/grey_10</color>
139+
<color name="switch_track_disabled">@color/grey_0</color>
140+
141+
<!-- Checkbox Colors -->
142+
<color name="checkbox_checked_enabled">@color/primary</color>
143+
<color name="checkbox_unchecked_enabled">@color/grey_30</color>
144+
<color name="checkbox_checked_disabled">@color/grey_30</color>
145+
<color name="checkbox_unchecked_disabled">#CCCCCC</color>
146+
147+
<!-- Share Colors -->
148+
<color name="share_title_txt_color">#191919</color>
149+
<color name="share_subtitle_txt_color">@color/grey_30</color>
150+
<color name="share_info_txt_color">#191919</color>
151+
<color name="share_search_border_color">#191919</color>
152+
<color name="share_btn_txt_color">#191919</color>
153+
<color name="share_list_item_txt_color">#191919</color>
154+
<color name="share_disabled_txt_color">@color/grey_30</color>
155+
<color name="share_txt_color">#191919</color>
156+
<color name="share_et_divider">#000000</color>
157+
<color name="share_warning_txt_color">#191919</color>
158+
<color name="sharing_warning_bg_color">#F6E5EB</color>
159+
<color name="sharing_warning_border_color">#C16F81</color>
160+
<color name="share_color">#0D39DF</color>
161+
<color name="shared_with_me_color">#0099ff</color>
162+
<color name="share_blue_color">#2238df</color>
163+
164+
<!-- Scan Colors -->
165+
<color name="scan_doc_bg_color">@color/grey_0</color>
166+
<color name="scan_text_color">#191919</color>
167+
<color name="scan_edit_bottom_color">@color/grey_0</color>
168+
<color name="scan_count_bg_color">@color/grey_30</color>
169+
<color name="neptune">#77b6bb</color>
170+
<color name="neptune_50">#5077b6bb</color>
81171
</resources>

‎app/src/main/res/values/nmc_snackbar_styles.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<style name="SnackBarBackgroundStyle" parent="Widget.Material3.Snackbar">
5+
<item name="android:backgroundTint">@color/snackbar_bg_color</item>
6+
<item name="backgroundTint">@color/snackbar_bg_color</item>
7+
</style>
8+
9+
<style name="SnackBarActionButtonStyle" parent="Widget.Material3.Button.TextButton.Snackbar">
10+
<item name="android:textColor">@color/white</item>
11+
</style>
12+
13+
<style name="SnackBarTextViewStyle" parent="Widget.Material3.Snackbar.TextView">
14+
<item name="android:textColor">@color/snackbar_txt_color</item>
15+
</style>
16+
</resources>

0 commit comments

Comments
 (0)