Skip to content

Commit 34ccaaa

Browse files
surinder-tsyssurinder-tsys
committed
Snackbar theme customized.
1 parent e625f45 commit 34ccaaa

File tree

6 files changed

+183
-5
lines changed

6 files changed

+183
-5
lines changed

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

93-
viewThemeUtils.material.themeSnackbar(snackbar);
9493
setLoadingSnackbar(snackbar);
9594
snackbar.show();
9695
}

‎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

@@ -784,7 +783,6 @@ private void onUpdateShareInformation(RemoteOperationResult result, @StringRes i
784783
snackbar = Snackbar.make(sharingFragment.getView(), result.getMessage(), Snackbar.LENGTH_LONG);
785784
}
786785

787-
viewThemeUtils.material.themeSnackbar(snackbar);
788786
snackbar.show();
789787
}
790788
}
@@ -854,7 +852,6 @@ private void onCreateShareViaLinkOperationFinish(CreateShareViaLinkOperation ope
854852
operation,
855853
getResources()),
856854
Snackbar.LENGTH_LONG);
857-
viewThemeUtils.material.themeSnackbar(snackbar);
858855
snackbar.show();
859856
}
860857
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ object PermissionUtil {
189189
Snackbar.LENGTH_INDEFINITE
190190
).setAction(R.string.common_ok) {
191191
doRequest()
192-
}.also { viewThemeUtils.material.themeSnackbar(it) }.show()
192+
}.show()
193193
} else {
194194
// No explanation needed, request the permission.
195195
doRequest()

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,68 @@
4848
<!-- App bar -->
4949
<color name="appbar">#1E1E1E</color>
5050
<color name="fontAppbar">@android:color/white</color>
51+
52+
<!-- NMC Colors -->
53+
<color name="icon_color">#FFFFFF</color>
54+
<color name="sort_text_color">@color/grey_30</color>
55+
<color name="list_icon_color">@color/grey_30</color>
56+
<color name="warning_icon_color">#CCCCCC</color>
57+
<color name="divider_color">@color/grey_70</color>
58+
<color name="spinner_bg_color">@color/grey_80</color>
59+
<color name="refresh_layout_bg_color">#2D2D2D</color>
60+
<color name="primary_button_disabled_color">@color/grey_70</color>
61+
<color name="toolbar_divider_color">@color/grey_70</color>
62+
63+
<!-- Snackbar Colors -->
64+
<color name="snackbar_bg_color">@color/grey_80</color>
65+
<color name="snackbar_txt_color">@color/grey_0</color>
66+
67+
<!-- Alert Dialog Colors -->
68+
<color name="alert_bg_color">@color/grey_80</color>
69+
<color name="alert_txt_color">@color/grey_0</color>
70+
71+
<!-- NavigationView colors -->
72+
<color name="nav_selected_bg_color">@color/grey_60</color>
73+
<color name="nav_txt_unselected_color">@color/grey_0</color>
74+
<color name="nav_txt_selected_color">@color/grey_0</color>
75+
<color name="nav_icon_unselected_color">@color/grey_30</color>
76+
<color name="nav_icon_selected_color">#FFFFFF</color>
77+
<color name="nav_divider_color">@color/grey_30</color>
78+
<color name="nav_bg_color">@color/grey_80</color>
79+
<color name="drawer_quota_txt_color">#FFFFFF</color>
80+
81+
<!-- Bottom Sheet Colors -->
82+
<color name="bottom_sheet_bg_color">@color/grey_80</color>
83+
<color name="bottom_sheet_icon_color">@color/grey_30</color>
84+
<color name="bottom_sheet_txt_color">@color/grey_0</color>
85+
86+
<!-- Popup Menu Colors -->
87+
<color name="popup_menu_bg">@color/grey_80</color>
88+
<color name="popup_menu_txt_color">@color/grey_0</color>
89+
<color name="overflow_bg_color">@color/grey_80</color>
90+
91+
<!-- Switch Compat Colors -->
92+
<color name="switch_thumb_disabled">@color/grey_70</color>
93+
<color name="switch_track_disabled">@color/grey_60</color>
94+
95+
<!-- Checkbox Colors -->
96+
<color name="checkbox_checked_disabled">@color/grey_70</color>
97+
<color name="checkbox_unchecked_disabled">@color/grey_70</color>
98+
99+
<!-- Share Colors -->
100+
<color name="share_title_txt_color">#FFFFFF</color>
101+
<color name="share_subtitle_txt_color">@color/grey_30</color>
102+
<color name="share_info_txt_color">@color/grey_0</color>
103+
<color name="share_search_border_color">@color/grey_0</color>
104+
<color name="share_btn_txt_color">@color/grey_0</color>
105+
<color name="share_list_item_txt_color">@color/grey_0</color>
106+
<color name="share_disabled_txt_color">@color/grey_60</color>
107+
<color name="share_txt_color">@color/grey_0</color>
108+
<color name="share_et_divider">#FFFFFF</color>
109+
110+
<!-- Scan Colors -->
111+
<color name="scan_doc_bg_color">#121212</color>
112+
<color name="scan_text_color">@color/grey_0</color>
113+
<color name="scan_edit_bottom_color">@color/grey_80</color>
114+
<color name="scan_count_bg_color">@color/grey_80</color>
51115
</resources>

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

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

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
<item name="colorPrimaryDark">@color/primary_dark</item>
3535
<item name="colorSecondary">@color/secondary_text_color</item>
3636
<item name="searchViewStyle">@style/ownCloud.SearchView</item>
37+
<!-- SnackBar Styling -->
38+
<item name="snackbarStyle">@style/SnackBarBackgroundStyle</item>
39+
<item name="snackbarButtonStyle">@style/SnackBarActionButtonStyle</item>
40+
<item name="snackbarTextViewStyle">@style/SnackBarTextViewStyle</item>
3741
<item name="android:actionModeBackground">@color/action_mode_background</item>
3842
<item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
3943
<item name="android:navigationBarColor">@color/bg_default</item>
@@ -52,6 +56,10 @@
5256
<item name="android:windowBackground">@color/bg_default</item>
5357
<item name="colorSecondary">@color/secondary_text_color</item>
5458
<item name="dialogTheme">@style/FallbackTheming.Dialog</item>
59+
<!-- SnackBar Styling -->
60+
<item name="snackbarStyle">@style/SnackBarBackgroundStyle</item>
61+
<item name="snackbarButtonStyle">@style/SnackBarActionButtonStyle</item>
62+
<item name="snackbarTextViewStyle">@style/SnackBarTextViewStyle</item>
5563
<item name="android:actionModeBackground">@color/action_mode_background</item>
5664
<item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
5765
<item name="android:navigationBarColor">@color/bg_default</item>
@@ -119,6 +127,10 @@
119127
<item name="windowActionBar">false</item>
120128
<item name="windowActionModeOverlay">true</item>
121129
<item name="windowNoTitle">true</item>
130+
<!-- SnackBar Styling -->
131+
<item name="snackbarStyle">@style/SnackBarBackgroundStyle</item>
132+
<item name="snackbarButtonStyle">@style/SnackBarActionButtonStyle</item>
133+
<item name="snackbarTextViewStyle">@style/SnackBarTextViewStyle</item>
122134
<item name="textInputStyle">@style/Widget.App.TextInputLayout</item>
123135
<item name="popupMenuStyle">@style/Nextcloud.Widget.PopupMenu</item>
124136
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog</item>
@@ -307,6 +319,10 @@
307319
<style name="Theme.ownCloud.Dialog.NoTitle" parent="@style/Theme.ownCloud.Dialog">
308320
<item name="windowNoTitle">true</item>
309321
<item name="colorAccent">@color/color_accent</item>
322+
<!-- SnackBar Styling -->
323+
<item name="snackbarStyle">@style/SnackBarBackgroundStyle</item>
324+
<item name="snackbarButtonStyle">@style/SnackBarActionButtonStyle</item>
325+
<item name="snackbarTextViewStyle">@style/SnackBarTextViewStyle</item>
310326
</style>
311327

312328
<style name="NavigationView_ItemTextAppearance">
@@ -454,6 +470,19 @@
454470
<item name="android:textStyle">bold</item>
455471
</style>
456472

473+
<style name="SnackBarBackgroundStyle" parent="Widget.Material3.Snackbar">
474+
<item name="android:backgroundTint">@color/snackbar_bg_color</item>
475+
<item name="backgroundTint">@color/snackbar_bg_color</item>
476+
</style>
477+
478+
<style name="SnackBarActionButtonStyle" parent="Widget.Material3.Button.TextButton.Snackbar">
479+
<item name="android:textColor">@color/white</item>
480+
</style>
481+
482+
<style name="SnackBarTextViewStyle" parent="Widget.Material3.Snackbar.TextView">
483+
<item name="android:textColor">@color/snackbar_txt_color</item>
484+
</style>
485+
457486
<style name="Widget.Nextcloud.AppWidget.Container" parent="android:Widget">
458487
<item name="android:id">@android:id/background</item>
459488
<item name="android:background">?android:attr/colorBackground</item>

0 commit comments

Comments
 (0)