diff options
author | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2023-02-12 00:34:16 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-12 00:34:16 +0300 |
commit | 23a8635d0a76edeeb2aa02eff296590b7695e80c (patch) | |
tree | b3ad6fd319782ebb5e590f2f5a53e2e24e9d7b3f /app/src/main/res | |
parent | a70b7edcba351e45f97e26f840a1744fb64fb2d8 (diff) |
feat(theming): Integrate android-common Nextcloud library for unified M3 theming (#1431)
* refactor(branding): Use android-common to apply branding
* refactor(branding): Rename BrandingUtil to ViewThemeUtils
* refactor(branding): Move DeckViewThemeUtils to own class
* refactor(branding): Apply theming to NavigationView
* refactor(branding): Roll out android-common based theming
* refactor(branding): Change terminology from "branding" to "theming"
* refactor(branding): Get rid of DeckColorUtil
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/activity_pick_stack.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/layout/dialog_move_card.xml | 8 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_card_edit_tab_attachments.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/xml/settings.xml | 24 |
5 files changed, 19 insertions, 17 deletions
diff --git a/app/src/main/res/layout/activity_pick_stack.xml b/app/src/main/res/layout/activity_pick_stack.xml index 9251cb474..8c456fc13 100644 --- a/app/src/main/res/layout/activity_pick_stack.xml +++ b/app/src/main/res/layout/activity_pick_stack.xml @@ -95,6 +95,7 @@ <com.google.android.material.button.MaterialButton android:id="@+id/submit" style="@style/Widget.Material3.Button" + android:enabled="false" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="@dimen/spacer_1x" diff --git a/app/src/main/res/layout/dialog_move_card.xml b/app/src/main/res/layout/dialog_move_card.xml index 7f37f8130..0466ed915 100644 --- a/app/src/main/res/layout/dialog_move_card.xml +++ b/app/src/main/res/layout/dialog_move_card.xml @@ -57,9 +57,9 @@ android:orientation="horizontal" app:justifyContent="space_between"> - <Button + <com.google.android.material.button.MaterialButton android:id="@+id/cancel" - style="@style/Widget.AppCompat.Button.ButtonBar.AlertDialog" + style="@style/Widget.Material3.Button.TextButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="start" @@ -67,9 +67,9 @@ android:text="@android:string/cancel" android:textColor="@color/defaultBrand" /> - <Button + <com.google.android.material.button.MaterialButton android:id="@+id/submit" - style="@style/Widget.AppCompat.Button.ButtonBar.AlertDialog" + style="@style/Widget.Material3.Button.TextButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="end" diff --git a/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml b/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml index c1cccc310..c300edcb1 100644 --- a/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml +++ b/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml @@ -54,6 +54,7 @@ app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> <RelativeLayout + android:id="@+id/pickerHeader" android:layout_width="match_parent" android:layout_height="@dimen/spacer_2x" android:background="@drawable/bottom_sheet_rounded"> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9a2e999b0..30cb73eec 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,7 +21,7 @@ <string name="simple_filter">Filter</string> <string name="simple_overdue">Overdue</string> <string name="simple_clear">Clear</string> - <string name="simple_discard">discard</string> + <string name="simple_discard">Discard</string> <string name="simple_update">Update</string> <string name="simple_delete">Delete</string> <string name="simple_rename">Rename</string> diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml index 3340a4cb6..3896c8ebd 100644 --- a/app/src/main/res/xml/settings.xml +++ b/app/src/main/res/xml/settings.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - <it.niedermann.nextcloud.deck.ui.branding.BrandedPreferenceCategory app:title="@string/simple_synchronization"> - <it.niedermann.nextcloud.deck.ui.branding.BrandedSwitchPreference + <it.niedermann.nextcloud.deck.ui.theme.ThemedPreferenceCategory app:title="@string/simple_synchronization"> + <it.niedermann.nextcloud.deck.ui.theme.ThemedSwitchPreference android:defaultValue="@string/pref_value_wifi_and_mobile" android:icon="@drawable/ic_network_wifi_grey600_24dp" android:key="@string/pref_key_wifi_only" @@ -17,15 +17,15 @@ android:summary="%s" android:title="@string/settings_background_sync" /> - <it.niedermann.nextcloud.deck.ui.branding.BrandedSwitchPreference + <it.niedermann.nextcloud.deck.ui.theme.ThemedSwitchPreference android:icon="@drawable/ic_baseline_photo_size_select_small_24" android:key="@string/pref_key_compress_image_attachments" android:summary="@string/settings_compress_image_attachments_summary" android:title="@string/settings_compress_image_attachments" app:defaultValue="true" /> - </it.niedermann.nextcloud.deck.ui.branding.BrandedPreferenceCategory> + </it.niedermann.nextcloud.deck.ui.theme.ThemedPreferenceCategory> - <it.niedermann.nextcloud.deck.ui.branding.BrandedPreferenceCategory android:title="@string/simple_appearance"> + <it.niedermann.nextcloud.deck.ui.theme.ThemedPreferenceCategory android:title="@string/simple_appearance"> <ListPreference android:defaultValue="@string/pref_value_theme_system_default" android:entries="@array/darkmode_entries" @@ -35,32 +35,32 @@ android:summary="%s" android:title="@string/settings_theme_title" /> - <it.niedermann.nextcloud.deck.ui.branding.BrandedSwitchPreference + <it.niedermann.nextcloud.deck.ui.theme.ThemedSwitchPreference android:icon="@drawable/ic_baseline_compact_24" android:key="@string/pref_key_compact" android:title="@string/settings_compact_title" app:defaultValue="false" /> - <it.niedermann.nextcloud.deck.ui.branding.BrandedSwitchPreference + <it.niedermann.nextcloud.deck.ui.theme.ThemedSwitchPreference android:icon="@drawable/ic_image_grey600_24dp" android:key="@string/pref_key_cover_images" android:title="@string/settings_cover_images_title" app:defaultValue="true" /> - </it.niedermann.nextcloud.deck.ui.branding.BrandedPreferenceCategory> + </it.niedermann.nextcloud.deck.ui.theme.ThemedPreferenceCategory> - <it.niedermann.nextcloud.deck.ui.branding.BrandedPreferenceCategory android:title="@string/simple_expert_settings"> + <it.niedermann.nextcloud.deck.ui.theme.ThemedPreferenceCategory android:title="@string/simple_expert_settings"> - <it.niedermann.nextcloud.deck.ui.branding.BrandedSwitchPreference + <it.niedermann.nextcloud.deck.ui.theme.ThemedSwitchPreference android:icon="@drawable/ic_bug_report_black_24dp" android:key="@string/pref_key_debugging" android:title="@string/settings_debugging" app:defaultValue="false" /> - <it.niedermann.nextcloud.deck.ui.branding.BrandedSwitchPreference + <it.niedermann.nextcloud.deck.ui.theme.ThemedSwitchPreference android:icon="@drawable/ic_baseline_speed_24" android:key="@string/pref_key_etags" android:summary="@string/settings_etags_summary" android:title="@string/settings_etags" app:defaultValue="true" /> - </it.niedermann.nextcloud.deck.ui.branding.BrandedPreferenceCategory> + </it.niedermann.nextcloud.deck.ui.theme.ThemedPreferenceCategory> </PreferenceScreen> |