Skip to content

Commit 84c1730

Browse files
surinder-tsyssurinder-tsys
committed
Snackbar theme customized.
1 parent f8e49f2 commit 84c1730

9 files changed

Lines changed: 190 additions & 5 deletions

File tree

‎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
@@ -82,7 +82,6 @@ public void onUrlLoaded(String loadedUrl) {
8282
R.string.timeout_richDocuments, Snackbar.LENGTH_INDEFINITE)
8383
.setAction(R.string.common_cancel, v -> closeView());
8484

85-
viewThemeUtils.material.themeSnackbar(snackbar);
8685
setLoadingSnackbar(snackbar);
8786
snackbar.show();
8887
}

‎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
@@ -694,7 +694,6 @@ public static void copyAndShareFileLink(FileActivity activity,
694694
Snackbar snackbar = Snackbar.make(activity.findViewById(android.R.id.content), R.string.clipboard_text_copied,
695695
Snackbar.LENGTH_LONG)
696696
.setAction(R.string.share, v -> showShareLinkDialog(activity, file, link));
697-
viewThemeUtils.material.themeSnackbar(snackbar);
698697
snackbar.show();
699698
}
700699

@@ -763,7 +762,6 @@ private void onUpdateShareInformation(RemoteOperationResult result, @StringRes i
763762
snackbar = Snackbar.make(sharingFragment.getView(), result.getMessage(), Snackbar.LENGTH_LONG);
764763
}
765764

766-
viewThemeUtils.material.themeSnackbar(snackbar);
767765
snackbar.show();
768766
}
769767
}
@@ -833,7 +831,6 @@ private void onCreateShareViaLinkOperationFinish(CreateShareViaLinkOperation ope
833831
operation,
834832
getResources()),
835833
Snackbar.LENGTH_LONG);
836-
viewThemeUtils.material.themeSnackbar(snackbar);
837834
snackbar.show();
838835
}
839836
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ object PermissionUtil {
174174
Snackbar.LENGTH_INDEFINITE
175175
).setAction(R.string.common_ok) {
176176
doRequest()
177-
}.also { viewThemeUtils.material.themeSnackbar(it) }.show()
177+
}.show()
178178
} else {
179179
// No explanation needed, request the permission.
180180
doRequest()

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,68 @@
3636
<!-- App bar -->
3737
<color name="appbar">#1E1E1E</color>
3838
<color name="fontAppbar">@android:color/white</color>
39+
40+
<!-- NMC Colors -->
41+
<color name="icon_color">#FFFFFF</color>
42+
<color name="sort_text_color">@color/grey_30</color>
43+
<color name="list_icon_color">@color/grey_30</color>
44+
<color name="warning_icon_color">#CCCCCC</color>
45+
<color name="divider_color">@color/grey_70</color>
46+
<color name="spinner_bg_color">@color/grey_80</color>
47+
<color name="refresh_layout_bg_color">#2D2D2D</color>
48+
<color name="primary_button_disabled_color">@color/grey_70</color>
49+
<color name="toolbar_divider_color">@color/grey_70</color>
50+
51+
<!-- Snackbar Colors -->
52+
<color name="snackbar_bg_color">@color/grey_80</color>
53+
<color name="snackbar_txt_color">@color/grey_0</color>
54+
55+
<!-- Alert Dialog Colors -->
56+
<color name="alert_bg_color">@color/grey_80</color>
57+
<color name="alert_txt_color">@color/grey_0</color>
58+
59+
<!-- NavigationView colors -->
60+
<color name="nav_selected_bg_color">@color/grey_60</color>
61+
<color name="nav_txt_unselected_color">@color/grey_0</color>
62+
<color name="nav_txt_selected_color">@color/grey_0</color>
63+
<color name="nav_icon_unselected_color">@color/grey_30</color>
64+
<color name="nav_icon_selected_color">#FFFFFF</color>
65+
<color name="nav_divider_color">@color/grey_30</color>
66+
<color name="nav_bg_color">@color/grey_80</color>
67+
<color name="drawer_quota_txt_color">#FFFFFF</color>
68+
69+
<!-- Bottom Sheet Colors -->
70+
<color name="bottom_sheet_bg_color">@color/grey_80</color>
71+
<color name="bottom_sheet_icon_color">@color/grey_30</color>
72+
<color name="bottom_sheet_txt_color">@color/grey_0</color>
73+
74+
<!-- Popup Menu Colors -->
75+
<color name="popup_menu_bg">@color/grey_80</color>
76+
<color name="popup_menu_txt_color">@color/grey_0</color>
77+
<color name="overflow_bg_color">@color/grey_80</color>
78+
79+
<!-- Switch Compat Colors -->
80+
<color name="switch_thumb_disabled">@color/grey_70</color>
81+
<color name="switch_track_disabled">@color/grey_60</color>
82+
83+
<!-- Checkbox Colors -->
84+
<color name="checkbox_checked_disabled">@color/grey_70</color>
85+
<color name="checkbox_unchecked_disabled">@color/grey_70</color>
86+
87+
<!-- Share Colors -->
88+
<color name="share_title_txt_color">#FFFFFF</color>
89+
<color name="share_subtitle_txt_color">@color/grey_30</color>
90+
<color name="share_info_txt_color">@color/grey_0</color>
91+
<color name="share_search_border_color">@color/grey_0</color>
92+
<color name="share_btn_txt_color">@color/grey_0</color>
93+
<color name="share_list_item_txt_color">@color/grey_0</color>
94+
<color name="share_disabled_txt_color">@color/grey_60</color>
95+
<color name="share_txt_color">@color/grey_0</color>
96+
<color name="share_et_divider">#FFFFFF</color>
97+
98+
<!-- Scan Colors -->
99+
<color name="scan_doc_bg_color">#121212</color>
100+
<color name="scan_text_color">@color/grey_0</color>
101+
<color name="scan_edit_bottom_color">@color/grey_80</color>
102+
<color name="scan_count_bg_color">@color/grey_80</color>
39103
</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: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,93 @@
7575
<color name="appbar">@android:color/white</color>
7676
<color name="fontAppbar">#666666</color>
7777
<color name="fontSecondaryAppbar">#A5A5A5</color>
78+
79+
<!-- NMC Colors -->
80+
<color name="icon_color">#191919</color>
81+
<color name="sort_text_color">@color/primary</color>
82+
<color name="list_icon_color">#191919</color>
83+
<color name="warning_icon_color">#191919</color>
84+
<color name="divider_color">@color/grey_30</color>
85+
<color name="spinner_bg_color">@android:color/white</color>
86+
<color name="refresh_layout_bg_color">#FFFFFF</color>
87+
<color name="primary_button_disabled_color">@color/grey_0</color>
88+
<color name="toolbar_divider_color">#CCCCCC</color>
89+
<color name="et_highlight_color">#77c4ff</color>
90+
<color name="white_trans_70">#B3FFFFFF</color>
91+
<color name="progress_bar_background">@color/grey_10</color>
92+
93+
<!-- Grey Colors -->
94+
<color name="dark_grey">#101010</color>
95+
<color name="grey_0">#F2F2F2</color>
96+
<color name="grey_10">#E5E5E5</color>
97+
<color name="grey_30">#B2B2B2</color>
98+
<color name="grey_60">#666666</color>
99+
<color name="grey_70">#4C4C4C</color>
100+
<color name="grey_80">#333333</color>
101+
102+
<!-- Snackbar Colors -->
103+
<color name="snackbar_bg_color">@color/design_snackbar_background_color</color>
104+
<color name="snackbar_txt_color">@color/white</color>
105+
106+
<!-- Alert Dialog Colors -->
107+
<color name="alert_bg_color">#FFFFFF</color>
108+
<color name="alert_txt_color">#191919</color>
109+
110+
<!-- NavigationView colors -->
111+
<color name="nav_selected_bg_color">@color/grey_0</color>
112+
<color name="nav_txt_unselected_color">#191919</color>
113+
<color name="nav_txt_selected_color">@color/primary</color>
114+
<color name="nav_icon_unselected_color">#191919</color>
115+
<color name="nav_icon_selected_color">@color/primary</color>
116+
<color name="nav_divider_color">@color/grey_30</color>
117+
<color name="nav_bg_color">@color/white</color>
118+
<color name="drawer_quota_txt_color">#191919</color>
119+
120+
<!-- Bottom Sheet Colors -->
121+
<color name="bottom_sheet_bg_color">#FFFFFF</color>
122+
<color name="bottom_sheet_icon_color">#191919</color>
123+
<color name="bottom_sheet_txt_color">#191919</color>
124+
125+
<!-- Popup Menu Colors -->
126+
<color name="popup_menu_bg">#FFFFFF</color>
127+
<color name="popup_menu_txt_color">#191919</color>
128+
<color name="overflow_bg_color">#FFFFFF</color>
129+
130+
<!-- Switch Compat Colors -->
131+
<color name="switch_thumb_checked_enabled">@color/primary</color>
132+
<color name="switch_track_checked_enabled">#F399C7</color>
133+
<color name="switch_thumb_unchecked_enabled">#FFFFFF</color>
134+
<color name="switch_track_unchecked_enabled">@color/grey_30</color>
135+
<color name="switch_thumb_disabled">@color/grey_10</color>
136+
<color name="switch_track_disabled">@color/grey_0</color>
137+
138+
<!-- Checkbox Colors -->
139+
<color name="checkbox_checked_enabled">@color/primary</color>
140+
<color name="checkbox_unchecked_enabled">@color/grey_30</color>
141+
<color name="checkbox_checked_disabled">@color/grey_30</color>
142+
<color name="checkbox_unchecked_disabled">#CCCCCC</color>
143+
144+
<!-- Share Colors -->
145+
<color name="share_title_txt_color">#191919</color>
146+
<color name="share_subtitle_txt_color">@color/grey_30</color>
147+
<color name="share_info_txt_color">#191919</color>
148+
<color name="share_search_border_color">#191919</color>
149+
<color name="share_btn_txt_color">#191919</color>
150+
<color name="share_list_item_txt_color">#191919</color>
151+
<color name="share_disabled_txt_color">@color/grey_30</color>
152+
<color name="share_txt_color">#191919</color>
153+
<color name="share_et_divider">#000000</color>
154+
<color name="share_warning_txt_color">#191919</color>
155+
<color name="sharing_warning_bg_color">#F6E5EB</color>
156+
<color name="sharing_warning_border_color">#C16F81</color>
157+
<color name="share_color">#0D39DF</color>
158+
<color name="shared_with_me_color">#0099ff</color>
159+
160+
<!-- Scan Colors -->
161+
<color name="scan_doc_bg_color">@color/grey_0</color>
162+
<color name="scan_text_color">#191919</color>
163+
<color name="scan_edit_bottom_color">@color/grey_0</color>
164+
<color name="scan_count_bg_color">@color/grey_30</color>
165+
<color name="neptune">#77b6bb</color>
166+
<color name="neptune_50">#5077b6bb</color>
78167
</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>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
<item name="colorPrimaryDark">@color/primary_dark</item>
2828
<item name="colorSecondary">@color/secondary_text_color</item>
2929
<item name="searchViewStyle">@style/ownCloud.SearchView</item>
30+
<!-- SnackBar Styling -->
31+
<item name="snackbarStyle">@style/SnackBarBackgroundStyle</item>
32+
<item name="snackbarButtonStyle">@style/SnackBarActionButtonStyle</item>
33+
<item name="snackbarTextViewStyle">@style/SnackBarTextViewStyle</item>
3034
<item name="android:actionModeBackground">@color/action_mode_background</item>
3135
<item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
3236
<item name="android:navigationBarColor">@color/bg_default</item>
@@ -45,6 +49,10 @@
4549
<item name="android:windowBackground">@color/bg_default</item>
4650
<item name="colorSecondary">@color/secondary_text_color</item>
4751
<item name="dialogTheme">@style/FallbackTheming.Dialog</item>
52+
<!-- SnackBar Styling -->
53+
<item name="snackbarStyle">@style/SnackBarBackgroundStyle</item>
54+
<item name="snackbarButtonStyle">@style/SnackBarActionButtonStyle</item>
55+
<item name="snackbarTextViewStyle">@style/SnackBarTextViewStyle</item>
4856
<item name="android:actionModeBackground">@color/action_mode_background</item>
4957
<item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
5058
<item name="android:navigationBarColor">@color/bg_default</item>
@@ -280,6 +288,10 @@
280288
<style name="Theme.ownCloud.Dialog.NoTitle" parent="@style/Theme.ownCloud.Dialog">
281289
<item name="windowNoTitle">true</item>
282290
<item name="colorAccent">@color/color_accent</item>
291+
<!-- SnackBar Styling -->
292+
<item name="snackbarStyle">@style/SnackBarBackgroundStyle</item>
293+
<item name="snackbarButtonStyle">@style/SnackBarActionButtonStyle</item>
294+
<item name="snackbarTextViewStyle">@style/SnackBarTextViewStyle</item>
283295
</style>
284296

285297
<style name="NavigationView_ItemTextAppearance">

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

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

0 commit comments

Comments
 (0)