diff options
-rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/util/SpannableUtil.java | 2 | ||||
-rw-r--r-- | app/src/main/res/drawable/ic_bug_report_24dp.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_attachments.xml | 8 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_main.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/dialog_preview.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/item_picker_native.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/widget_color_chooser.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/layout/widget_empty_content_view.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/widget_single_card.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/widget_stack.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/widget_upcoming.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-night/colors.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values/colors.xml | 3 |
13 files changed, 10 insertions, 28 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/util/SpannableUtil.java b/app/src/main/java/it/niedermann/nextcloud/deck/util/SpannableUtil.java index 664407d72..80a0dfe83 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/util/SpannableUtil.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/util/SpannableUtil.java @@ -33,7 +33,7 @@ public class SpannableUtil { public static SpannableString disabled(@NonNull CharSequence text, @NonNull Context context) { final var spannable = new SpannableString(text); spannable.setSpan(new StyleSpan(Typeface.ITALIC), 0, spannable.length(), 0); - spannable.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.fg_secondary)), 0, spannable.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + spannable.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.onSurfaceVariant)), 0, spannable.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); return spannable; } diff --git a/app/src/main/res/drawable/ic_bug_report_24dp.xml b/app/src/main/res/drawable/ic_bug_report_24dp.xml index 00e4bbf91..0e93d3935 100644 --- a/app/src/main/res/drawable/ic_bug_report_24dp.xml +++ b/app/src/main/res/drawable/ic_bug_report_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="?attr/colorOnSurface" android:viewportHeight="24.0" + android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF000000" android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/> </vector> diff --git a/app/src/main/res/layout/activity_attachments.xml b/app/src/main/res/layout/activity_attachments.xml index 87aee7010..c50338d96 100644 --- a/app/src/main/res/layout/activity_attachments.xml +++ b/app/src/main/res/layout/activity_attachments.xml @@ -24,12 +24,4 @@ android:id="@+id/view_pager" android:layout_width="match_parent" android:layout_height="match_parent" /> - -<!-- <androidx.appcompat.widget.AppCompatImageView--> -<!-- android:id="@+id/image"--> -<!-- android:layout_width="match_parent"--> -<!-- android:layout_height="match_parent"--> -<!-- android:contentDescription="@null"--> -<!-- android:transitionName="@string/transition_attachment_preview"--> -<!-- tools:src="@drawable/ic_image_grey600_24dp" />--> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 285b25962..4f4c813b9 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -61,7 +61,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_horizontal|bottom" - android:background="@color/bg_info_box" + android:background="?attr/colorSurfaceVariant" android:gravity="center" android:padding="@dimen/spacer_1hx" android:visibility="gone" @@ -74,7 +74,7 @@ android:gravity="center" android:paddingHorizontal="@dimen/spacer_1hx" android:text="@string/info_box_maintenance_mode" - android:textColor="@color/grey600" + android:textColor="?attr/colorOnSurfaceVariant" app:drawableStartCompat="@drawable/ic_info_outline_24dp" /> </LinearLayout> diff --git a/app/src/main/res/layout/dialog_preview.xml b/app/src/main/res/layout/dialog_preview.xml index 2765a659f..519875cb9 100644 --- a/app/src/main/res/layout/dialog_preview.xml +++ b/app/src/main/res/layout/dialog_preview.xml @@ -11,7 +11,7 @@ android:layout_height="200dp" android:contentDescription="@string/user_avatar" android:scaleType="centerCrop" - android:background="@color/bg_info_box" /> + android:background="?attr/colorSurfaceVariant" /> <TextView android:padding="?dialogPreferredPadding" diff --git a/app/src/main/res/layout/item_picker_native.xml b/app/src/main/res/layout/item_picker_native.xml index 1213e2f9c..9e3cf74ee 100644 --- a/app/src/main/res/layout/item_picker_native.xml +++ b/app/src/main/res/layout/item_picker_native.xml @@ -35,7 +35,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/bg_info_box" /> + android:background="?attr/colorOutlineVariant" /> <TextView android:id="@+id/subtitle" diff --git a/app/src/main/res/layout/widget_color_chooser.xml b/app/src/main/res/layout/widget_color_chooser.xml index 0230a2b31..d35c4105f 100644 --- a/app/src/main/res/layout/widget_color_chooser.xml +++ b/app/src/main/res/layout/widget_color_chooser.xml @@ -26,8 +26,7 @@ android:layout_marginTop="@dimen/spacer_1x" android:contentDescription="@string/pick_custom_color" app:layout_flexBasisPercent="15%" - app:srcCompat="@drawable/circle_alpha_colorize_36dp" - tools:tint="@color/grey600" /> + app:srcCompat="@drawable/circle_alpha_colorize_36dp" /> </com.google.android.flexbox.FlexboxLayout> <com.skydoves.colorpickerview.ColorPickerView diff --git a/app/src/main/res/layout/widget_empty_content_view.xml b/app/src/main/res/layout/widget_empty_content_view.xml index ab8b3b9b9..990a1f662 100644 --- a/app/src/main/res/layout/widget_empty_content_view.xml +++ b/app/src/main/res/layout/widget_empty_content_view.xml @@ -15,7 +15,7 @@ android:layout_above="@+id/title" android:layout_marginBottom="@dimen/spacer_2x" android:contentDescription="@null" - android:tint="@color/fg_secondary" + android:tint="?attr/colorSurfaceVariant" app:layout_constraintBottom_toTopOf="@id/title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/widget_single_card.xml b/app/src/main/res/layout/widget_single_card.xml index 21b5ffffb..2a9640c81 100644 --- a/app/src/main/res/layout/widget_single_card.xml +++ b/app/src/main/res/layout/widget_single_card.xml @@ -83,8 +83,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@null" - android:tint="@color/grey600" - tools:ignore="UseAppTint" tools:src="@drawable/ic_comment_24dp" /> <TextView @@ -118,8 +116,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@null" - android:tint="@color/grey600" - tools:ignore="UseAppTint" tools:src="@drawable/ic_attach_file_24dp" /> <TextView diff --git a/app/src/main/res/layout/widget_stack.xml b/app/src/main/res/layout/widget_stack.xml index 6c8f2de7b..f0b0c33fd 100644 --- a/app/src/main/res/layout/widget_stack.xml +++ b/app/src/main/res/layout/widget_stack.xml @@ -68,7 +68,7 @@ android:contentDescription="@string/widget_placeholder_icon" android:gravity="center" android:text="@string/app_name_short" - android:textColor="@color/fg_secondary" + android:textColor="?attr/colorOnSurfaceVariant" app:srcCompat="@drawable/ic_local_movies_24dp" tools:visibility="gone" /> diff --git a/app/src/main/res/layout/widget_upcoming.xml b/app/src/main/res/layout/widget_upcoming.xml index 4b5fba084..f95d87eb7 100644 --- a/app/src/main/res/layout/widget_upcoming.xml +++ b/app/src/main/res/layout/widget_upcoming.xml @@ -26,7 +26,7 @@ android:contentDescription="@string/widget_placeholder_icon" android:gravity="center" android:text="@string/app_name_short" - android:textColor="@color/fg_secondary" + android:textColor="?attr/colorOnSurfaceVariant" app:srcCompat="@drawable/ic_local_movies_24dp" tools:visibility="gone" /> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 303741645..e7a543f6e 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -42,9 +42,7 @@ <!-- TODO REMOVE --> <!-- ======================================= --> - <color name="fg_secondary">#666</color> <color name="bg_highlighted">#212121</color> - <color name="bg_info_box">#222222</color> <color name="bg_card">#1e1e1e</color> <color name="defaultTextHighlightBackground">#55eeeeff</color> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 44ef70b13..6b0b94c4f 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -46,10 +46,7 @@ <!-- ======================================= --> <color name="bottom_sheet_backdrop">#7f000000</color> - <color name="grey600">#757575</color> - <color name="fg_secondary">#999</color> <color name="bg_highlighted">#eee</color> - <color name="bg_info_box">#dddddd</color> <color name="bg_card">@android:color/white</color> <color name="defaultTextHighlightBackground">#2233334a</color> |