Skip to content

Commit

Permalink
Snackbar theme customized.
Browse files Browse the repository at this point in the history
  • Loading branch information
@surinder-tsys
surinder-tsys committed Feb 14, 2024
1 parent f59caa7 commit 490d8be
Show file tree
Hide file tree
Showing 6 changed files with 183 additions and 5 deletions.
1 change: 0 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,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();
}
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,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();
}

Expand Down Expand Up @@ -771,7 +770,6 @@ private void onUpdateShareInformation(RemoteOperationResult result, @StringRes i
snackbar = Snackbar.make(sharingFragment.getView(), result.getMessage(), Snackbar.LENGTH_LONG);
}

viewThemeUtils.material.themeSnackbar(snackbar);
snackbar.show();
}
}
Expand Down Expand Up @@ -841,7 +839,6 @@ private void onCreateShareViaLinkOperationFinish(CreateShareViaLinkOperation ope
operation,
getResources()),
Snackbar.LENGTH_LONG);
viewThemeUtils.material.themeSnackbar(snackbar);
snackbar.show();
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
64 changes: 64 additions & 0 deletions app/src/main/res/values-night/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,68 @@
<!-- App bar -->
<color name="appbar">#1E1E1E</color>
<color name="fontAppbar">@android:color/white</color>

<!-- NMC Colors -->
<color name="icon_color">#FFFFFF</color>
<color name="sort_text_color">@color/grey_30</color>
<color name="list_icon_color">@color/grey_30</color>
<color name="warning_icon_color">#CCCCCC</color>
<color name="divider_color">@color/grey_70</color>
<color name="spinner_bg_color">@color/grey_80</color>
<color name="refresh_layout_bg_color">#2D2D2D</color>
<color name="primary_button_disabled_color">@color/grey_70</color>
<color name="toolbar_divider_color">@color/grey_70</color>

<!-- Snackbar Colors -->
<color name="snackbar_bg_color">@color/grey_80</color>
<color name="snackbar_txt_color">@color/grey_0</color>

<!-- Alert Dialog Colors -->
<color name="alert_bg_color">@color/grey_80</color>
<color name="alert_txt_color">@color/grey_0</color>

<!-- NavigationView colors -->
<color name="nav_selected_bg_color">@color/grey_60</color>
<color name="nav_txt_unselected_color">@color/grey_0</color>
<color name="nav_txt_selected_color">@color/grey_0</color>
<color name="nav_icon_unselected_color">@color/grey_30</color>
<color name="nav_icon_selected_color">#FFFFFF</color>
<color name="nav_divider_color">@color/grey_30</color>
<color name="nav_bg_color">@color/grey_80</color>
<color name="drawer_quota_txt_color">#FFFFFF</color>

<!-- Bottom Sheet Colors -->
<color name="bottom_sheet_bg_color">@color/grey_80</color>
<color name="bottom_sheet_icon_color">@color/grey_30</color>
<color name="bottom_sheet_txt_color">@color/grey_0</color>

<!-- Popup Menu Colors -->
<color name="popup_menu_bg">@color/grey_80</color>
<color name="popup_menu_txt_color">@color/grey_0</color>
<color name="overflow_bg_color">@color/grey_80</color>

<!-- Switch Compat Colors -->
<color name="switch_thumb_disabled">@color/grey_70</color>
<color name="switch_track_disabled">@color/grey_60</color>

<!-- Checkbox Colors -->
<color name="checkbox_checked_disabled">@color/grey_70</color>
<color name="checkbox_unchecked_disabled">@color/grey_70</color>

<!-- Share Colors -->
<color name="share_title_txt_color">#FFFFFF</color>
<color name="share_subtitle_txt_color">@color/grey_30</color>
<color name="share_info_txt_color">@color/grey_0</color>
<color name="share_search_border_color">@color/grey_0</color>
<color name="share_btn_txt_color">@color/grey_0</color>
<color name="share_list_item_txt_color">@color/grey_0</color>
<color name="share_disabled_txt_color">@color/grey_60</color>
<color name="share_txt_color">@color/grey_0</color>
<color name="share_et_divider">#FFFFFF</color>

<!-- Scan Colors -->
<color name="scan_doc_bg_color">#121212</color>
<color name="scan_text_color">@color/grey_0</color>
<color name="scan_edit_bottom_color">@color/grey_80</color>
<color name="scan_count_bg_color">@color/grey_80</color>
</resources>
89 changes: 89 additions & 0 deletions app/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,93 @@
<color name="appbar">@android:color/white</color>
<color name="fontAppbar">#666666</color>
<color name="fontSecondaryAppbar">#A5A5A5</color>

<!-- NMC Colors -->
<color name="icon_color">#191919</color>
<color name="sort_text_color">@color/primary</color>
<color name="list_icon_color">#191919</color>
<color name="warning_icon_color">#191919</color>
<color name="divider_color">@color/grey_30</color>
<color name="spinner_bg_color">@android:color/white</color>
<color name="refresh_layout_bg_color">#FFFFFF</color>
<color name="primary_button_disabled_color">@color/grey_0</color>
<color name="toolbar_divider_color">#CCCCCC</color>
<color name="et_highlight_color">#77c4ff</color>
<color name="white_trans_70">#B3FFFFFF</color>
<color name="progress_bar_background">@color/grey_10</color>

<!-- Grey Colors -->
<color name="dark_grey">#101010</color>
<color name="grey_0">#F2F2F2</color>
<color name="grey_10">#E5E5E5</color>
<color name="grey_30">#B2B2B2</color>
<color name="grey_60">#666666</color>
<color name="grey_70">#4C4C4C</color>
<color name="grey_80">#333333</color>

<!-- Snackbar Colors -->
<color name="snackbar_bg_color">@color/design_snackbar_background_color</color>
<color name="snackbar_txt_color">@color/white</color>

<!-- Alert Dialog Colors -->
<color name="alert_bg_color">#FFFFFF</color>
<color name="alert_txt_color">#191919</color>

<!-- NavigationView colors -->
<color name="nav_selected_bg_color">@color/grey_0</color>
<color name="nav_txt_unselected_color">#191919</color>
<color name="nav_txt_selected_color">@color/primary</color>
<color name="nav_icon_unselected_color">#191919</color>
<color name="nav_icon_selected_color">@color/primary</color>
<color name="nav_divider_color">@color/grey_30</color>
<color name="nav_bg_color">@color/white</color>
<color name="drawer_quota_txt_color">#191919</color>

<!-- Bottom Sheet Colors -->
<color name="bottom_sheet_bg_color">#FFFFFF</color>
<color name="bottom_sheet_icon_color">#191919</color>
<color name="bottom_sheet_txt_color">#191919</color>

<!-- Popup Menu Colors -->
<color name="popup_menu_bg">#FFFFFF</color>
<color name="popup_menu_txt_color">#191919</color>
<color name="overflow_bg_color">#FFFFFF</color>

<!-- Switch Compat Colors -->
<color name="switch_thumb_checked_enabled">@color/primary</color>
<color name="switch_track_checked_enabled">#F399C7</color>
<color name="switch_thumb_unchecked_enabled">#FFFFFF</color>
<color name="switch_track_unchecked_enabled">@color/grey_30</color>
<color name="switch_thumb_disabled">@color/grey_10</color>
<color name="switch_track_disabled">@color/grey_0</color>

<!-- Checkbox Colors -->
<color name="checkbox_checked_enabled">@color/primary</color>
<color name="checkbox_unchecked_enabled">@color/grey_30</color>
<color name="checkbox_checked_disabled">@color/grey_30</color>
<color name="checkbox_unchecked_disabled">#CCCCCC</color>

<!-- Share Colors -->
<color name="share_title_txt_color">#191919</color>
<color name="share_subtitle_txt_color">@color/grey_30</color>
<color name="share_info_txt_color">#191919</color>
<color name="share_search_border_color">#191919</color>
<color name="share_btn_txt_color">#191919</color>
<color name="share_list_item_txt_color">#191919</color>
<color name="share_disabled_txt_color">@color/grey_30</color>
<color name="share_txt_color">#191919</color>
<color name="share_et_divider">#000000</color>
<color name="share_warning_txt_color">#191919</color>
<color name="sharing_warning_bg_color">#F6E5EB</color>
<color name="sharing_warning_border_color">#C16F81</color>
<color name="share_color">#0D39DF</color>
<color name="shared_with_me_color">#0099ff</color>

<!-- Scan Colors -->
<color name="scan_doc_bg_color">@color/grey_0</color>
<color name="scan_text_color">#191919</color>
<color name="scan_edit_bottom_color">@color/grey_0</color>
<color name="scan_count_bg_color">@color/grey_30</color>
<color name="neptune">#77b6bb</color>
<color name="neptune_50">#5077b6bb</color>
</resources>
29 changes: 29 additions & 0 deletions app/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorSecondary">@color/secondary_text_color</item>
<item name="searchViewStyle">@style/ownCloud.SearchView</item>
<!-- SnackBar Styling -->
<item name="snackbarStyle">@style/SnackBarBackgroundStyle</item>
<item name="snackbarButtonStyle">@style/SnackBarActionButtonStyle</item>
<item name="snackbarTextViewStyle">@style/SnackBarTextViewStyle</item>
<item name="android:actionModeBackground">@color/action_mode_background</item>
<item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
<item name="android:navigationBarColor">@color/bg_default</item>
Expand All @@ -52,6 +56,10 @@
<item name="android:windowBackground">@color/bg_default</item>
<item name="colorSecondary">@color/secondary_text_color</item>
<item name="dialogTheme">@style/FallbackTheming.Dialog</item>
<!-- SnackBar Styling -->
<item name="snackbarStyle">@style/SnackBarBackgroundStyle</item>
<item name="snackbarButtonStyle">@style/SnackBarActionButtonStyle</item>
<item name="snackbarTextViewStyle">@style/SnackBarTextViewStyle</item>
<item name="android:actionModeBackground">@color/action_mode_background</item>
<item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
<item name="android:navigationBarColor">@color/bg_default</item>
Expand Down Expand Up @@ -119,6 +127,10 @@
<item name="windowActionBar">false</item>
<item name="windowActionModeOverlay">true</item>
<item name="windowNoTitle">true</item>
<!-- SnackBar Styling -->
<item name="snackbarStyle">@style/SnackBarBackgroundStyle</item>
<item name="snackbarButtonStyle">@style/SnackBarActionButtonStyle</item>
<item name="snackbarTextViewStyle">@style/SnackBarTextViewStyle</item>
<item name="textInputStyle">@style/Widget.App.TextInputLayout</item>
<item name="popupMenuStyle">@style/Nextcloud.Widget.PopupMenu</item>
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog</item>
Expand Down Expand Up @@ -307,6 +319,10 @@
<style name="Theme.ownCloud.Dialog.NoTitle" parent="@style/Theme.ownCloud.Dialog">
<item name="windowNoTitle">true</item>
<item name="colorAccent">@color/color_accent</item>
<!-- SnackBar Styling -->
<item name="snackbarStyle">@style/SnackBarBackgroundStyle</item>
<item name="snackbarButtonStyle">@style/SnackBarActionButtonStyle</item>
<item name="snackbarTextViewStyle">@style/SnackBarTextViewStyle</item>
</style>

<style name="NavigationView_ItemTextAppearance">
Expand Down Expand Up @@ -454,6 +470,19 @@
<item name="android:textStyle">bold</item>
</style>

<style name="SnackBarBackgroundStyle" parent="Widget.Material3.Snackbar">
<item name="android:backgroundTint">@color/snackbar_bg_color</item>
<item name="backgroundTint">@color/snackbar_bg_color</item>
</style>

<style name="SnackBarActionButtonStyle" parent="Widget.Material3.Button.TextButton.Snackbar">
<item name="android:textColor">@color/white</item>
</style>

<style name="SnackBarTextViewStyle" parent="Widget.Material3.Snackbar.TextView">
<item name="android:textColor">@color/snackbar_txt_color</item>
</style>

<style name="Widget.Nextcloud.AppWidget.Container" parent="android:Widget">
<item name="android:id">@android:id/background</item>
<item name="android:background">?android:attr/colorBackground</item>
Expand Down

0 comments on commit 490d8be

Please sign in to comment.