diff options
author | Stefan Niedermann <info@niedermann.it> | 2020-06-30 12:08:22 +0300 |
---|---|---|
committer | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2020-06-30 13:58:19 +0300 |
commit | abd056cd1a5a6e0c19c9253d12c17c959ed76b2e (patch) | |
tree | ad1b72020e7836316c256d23c89a34be4d0d3d63 /app/src/main/res | |
parent | 1297e06dcbe98300934fb582900f881262c7aed4 (diff) |
#525 Adjust design to new style of Nextcloud app
Cards
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/activity_about.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_edit.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_main.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/layout/dialog_filter.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/item_card.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/values-night/colors.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values/colors.xml | 3 |
7 files changed, 10 insertions, 7 deletions
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 12f7ec0ce..67c7a900c 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -21,9 +21,10 @@ android:id="@+id/tab_layout" android:layout_width="match_parent" android:layout_height="wrap_content" + app:tabBackground="?attr/colorPrimary" app:tabIndicatorColor="@color/defaultBrand" app:tabMode="fixed" - app:tabTextColor="@color/accent" /> + app:tabTextColor="?attr/colorAccent" /> </com.google.android.material.appbar.AppBarLayout> <androidx.viewpager2.widget.ViewPager2 diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml index 1fc777ad9..4d59b296f 100644 --- a/app/src/main/res/layout/activity_edit.xml +++ b/app/src/main/res/layout/activity_edit.xml @@ -33,11 +33,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:theme="@style/ThemeOverlay.AppCompat.Dark" + app:tabBackground="?attr/colorPrimary" app:tabGravity="center" app:tabIconTint="?attr/colorAccent" app:tabIndicatorColor="@color/defaultBrand" app:tabMode="fixed" - app:tabTextColor="@color/accent" /> + app:tabTextColor="?attr/colorAccent" /> </com.google.android.material.appbar.AppBarLayout> <androidx.viewpager2.widget.ViewPager2 diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 73414da84..71df4675b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -162,10 +162,11 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" + app:tabBackground="?attr/colorPrimary" app:tabGravity="center" app:tabIndicatorColor="@color/defaultBrand" app:tabMode="fixed" - app:tabTextColor="@color/accent" /> + app:tabTextColor="?attr/colorAccent" /> <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/list_menu_button" diff --git a/app/src/main/res/layout/dialog_filter.xml b/app/src/main/res/layout/dialog_filter.xml index 37daef3ba..8741e7e36 100644 --- a/app/src/main/res/layout/dialog_filter.xml +++ b/app/src/main/res/layout/dialog_filter.xml @@ -12,7 +12,7 @@ app:tabIndicatorColor="@color/defaultBrand" app:tabInlineLabel="true" app:tabMode="fixed" - app:tabTextColor="@color/accent" + app:tabTextColor="?attr/colorAccent" app:tabUnboundedRipple="true" /> <androidx.viewpager2.widget.ViewPager2 diff --git a/app/src/main/res/layout/item_card.xml b/app/src/main/res/layout/item_card.xml index 16fa17632..fe59eefd4 100644 --- a/app/src/main/res/layout/item_card.xml +++ b/app/src/main/res/layout/item_card.xml @@ -9,6 +9,7 @@ android:layout_marginTop="@dimen/spacer_1x" android:layout_marginEnd="@dimen/spacer_2x" android:layout_marginBottom="@dimen/spacer_1x" + app:cardBackgroundColor="@color/bg_card" android:focusable="true"> <LinearLayout diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 8505e99ca..e138aad7a 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -5,7 +5,7 @@ <color name="fg_secondary">#666</color> <color name="bg_highlighted">#2a2a2a</color> <color name="bg_info_box">#222222</color> - <color name="avatars_overlapping_border_color">#424242</color> + <color name="bg_card">#212121</color> <color name="widget_background">#cc212121</color> <color name="widget_foreground">#ccf5f5f5</color> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a026f322e..7badd377d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -11,8 +11,7 @@ <color name="bg_highlighted">#eee</color> <color name="grey600">#757575</color> <color name="bg_info_box">#dddddd</color> - - <color name="avatars_overlapping_border_color">#ffffff</color> + <color name="bg_card">#ffffff</color> <color name="dark_fg_primary">#e5e5e5</color> |