diff options
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/drawable/ic_person_24dp.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/drawable/ic_person_add_24dp.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/drawable/ic_settings_24dp.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/dialog_account_switcher.xml | 10 | ||||
-rw-r--r-- | app/src/main/res/layout/item_account_choose.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/layout/item_activity.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/item_comment.xml | 7 |
7 files changed, 22 insertions, 11 deletions
diff --git a/app/src/main/res/drawable/ic_person_24dp.xml b/app/src/main/res/drawable/ic_person_24dp.xml index 23b5b1c10..9e18df4f4 100644 --- a/app/src/main/res/drawable/ic_person_24dp.xml +++ b/app/src/main/res/drawable/ic_person_24dp.xml @@ -3,7 +3,8 @@ android:height="24dp" android:autoMirrored="true" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?attr/colorOnSurface"> <path android:fillColor="#757575" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" /> diff --git a/app/src/main/res/drawable/ic_person_add_24dp.xml b/app/src/main/res/drawable/ic_person_add_24dp.xml index 0c7a217da..0dadeaeda 100644 --- a/app/src/main/res/drawable/ic_person_add_24dp.xml +++ b/app/src/main/res/drawable/ic_person_add_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24.0" + android:tint="?attr/colorOnSurface" 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="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/> </vector> diff --git a/app/src/main/res/drawable/ic_settings_24dp.xml b/app/src/main/res/drawable/ic_settings_24dp.xml index 8521eec7b..8ce6afc9b 100644 --- a/app/src/main/res/drawable/ic_settings_24dp.xml +++ b/app/src/main/res/drawable/ic_settings_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24" + android:tint="?attr/colorOnSurface" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF000000" android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/> </vector> diff --git a/app/src/main/res/layout/dialog_account_switcher.xml b/app/src/main/res/layout/dialog_account_switcher.xml index 9d0b7b122..feff52fe3 100644 --- a/app/src/main/res/layout/dialog_account_switcher.xml +++ b/app/src/main/res/layout/dialog_account_switcher.xml @@ -91,6 +91,7 @@ android:paddingBottom="@dimen/spacer_1x"> <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/add_account_icon" android:layout_width="36dp" android:layout_height="36dp" android:contentDescription="@null" @@ -98,7 +99,8 @@ android:scaleType="center" app:srcCompat="@drawable/ic_person_add_24dp" /> - <TextView + <com.google.android.material.textview.MaterialTextView + android:id="@+id/add_account_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" @@ -107,7 +109,7 @@ android:singleLine="true" android:text="@string/add_account" android:textAppearance="@style/TextAppearance.AppCompat.Widget.TextView.SpinnerItem" - android:textColor="?android:textColorPrimary" /> + android:textColor="?attr/colorOnSurface" /> </LinearLayout> @@ -124,6 +126,7 @@ android:paddingBottom="@dimen/spacer_1x"> <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/manage_accounts_icon" android:layout_width="36dp" android:layout_height="36dp" android:contentDescription="@null" @@ -132,6 +135,7 @@ app:srcCompat="@drawable/ic_settings_24dp" /> <TextView + android:id="@+id/manage_accounts_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" @@ -140,7 +144,7 @@ android:singleLine="true" android:text="@string/manage_accounts" android:textAppearance="@style/TextAppearance.AppCompat.Widget.TextView.SpinnerItem" - android:textColor="?android:textColorPrimary" /> + android:textColor="?attr/colorOnSurface" /> </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/item_account_choose.xml b/app/src/main/res/layout/item_account_choose.xml index a734d8593..9d880bec8 100644 --- a/app/src/main/res/layout/item_account_choose.xml +++ b/app/src/main/res/layout/item_account_choose.xml @@ -5,8 +5,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" - android:orientation="horizontal" android:gravity="center_vertical" + android:orientation="horizontal" android:padding="@dimen/spacer_3x"> <FrameLayout @@ -70,5 +70,6 @@ android:scaleType="center" android:visibility="gone" app:srcCompat="@drawable/ic_delete_24dp" + app:tint="?attr/colorOnSurface" tools:visibility="visible" /> </LinearLayout> diff --git a/app/src/main/res/layout/item_activity.xml b/app/src/main/res/layout/item_activity.xml index 85fc740f8..436e47ffc 100644 --- a/app/src/main/res/layout/item_activity.xml +++ b/app/src/main/res/layout/item_activity.xml @@ -8,12 +8,13 @@ android:orientation="vertical" android:padding="@dimen/spacer_2x"> - <TextView + <com.google.android.material.textview.MaterialTextView android:id="@+id/date" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="56dp" android:textAppearance="?attr/textAppearanceListItemSecondary" + android:textColor="?attr/colorOnSurfaceVariant" tools:text="4 days ago" /> <LinearLayout @@ -28,11 +29,12 @@ android:layout_marginEnd="@dimen/spacer_2x" app:srcCompat="@drawable/type_change_36dp" /> - <TextView + <com.google.android.material.textview.MaterialTextView android:id="@+id/subject" android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?attr/textAppearanceListItem" + android:textColor="?attr/colorOnSurface" tools:maxLength="150" tools:text="@tools:sample/lorem/random" /> </LinearLayout> diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml index af06cb008..655d88c2f 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -13,8 +13,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="54dp" + android:layout_marginBottom="@dimen/spacer_1x" android:orientation="horizontal" - android:paddingBottom="@dimen/spacer_1x" android:visibility="gone" tools:visibility="visible"> @@ -22,7 +22,7 @@ android:id="@+id/parentBorder" android:layout_width="2dp" android:layout_height="match_parent" - android:textColor="?attr/colorSecondary" /> + android:background="?attr/colorSecondary" /> <TextView android:id="@+id/parent" @@ -30,6 +30,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="@integer/comment_parent_max_lines" + android:paddingVertical="@dimen/spacer_1hx" android:paddingStart="@dimen/spacer_1x" android:paddingEnd="@null" android:textColor="?attr/colorOnSurfaceVariant" @@ -95,6 +96,7 @@ android:layout_gravity="center" android:textAppearance="?attr/textAppearanceListItemSecondary" android:textColor="?attr/colorOnSurface" + android:textColorHighlight="?attr/colorOnSurfaceVariant" tools:text="@tools:sample/date/day_of_week" /> </LinearLayout> @@ -105,6 +107,7 @@ android:layout_gravity="center" android:autofillHints="@null" android:textAppearance="?attr/textAppearanceListItem" + android:textColor="?attr/colorOnSurface" tools:maxLength="200" tools:text="@tools:sample/lorem/random" /> </LinearLayout> |