diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml index d7a712b6..5f383bae 100644 --- a/app/src/main/res/layout/item_account.xml +++ b/app/src/main/res/layout/item_account.xml @@ -30,8 +30,7 @@ android:layout_marginEnd="64dp" android:ellipsize="middle" android:singleLine="true" - android:textColor="@color/fg_default" - android:textAppearance="@style/NavigationItem" + android:textColor="?android:textColorPrimary" tools:hint="Username"/> \ No newline at end of file diff --git a/app/src/main/res/layout/item_category.xml b/app/src/main/res/layout/item_category.xml index ae18e766..95c76732 100644 --- a/app/src/main/res/layout/item_category.xml +++ b/app/src/main/res/layout/item_category.xml @@ -28,7 +28,7 @@ android:layout_weight="1" android:ellipsize="middle" android:singleLine="true" - android:textColor="@color/fg_default" + android:textColor="?android:textColorPrimary" tools:hint="@string/menu_change_category" /> + android:paddingLeft="6dp" + android:paddingEnd="8dp" + android:paddingRight="8dp"> + app:srcCompat="@drawable/ic_folder_grey600_24dp" /> + android:textColor="?android:textColorPrimary" + tools:text="37" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_notes_list_note_item.xml b/app/src/main/res/layout/item_notes_list_note_item.xml index 23eda711..19ba07b4 100644 --- a/app/src/main/res/layout/item_notes_list_note_item.xml +++ b/app/src/main/res/layout/item_notes_list_note_item.xml @@ -81,8 +81,8 @@ android:layout_height="wrap_content" android:singleLine="true" android:layout_weight="1" - android:textColor="@drawable/list_item_color_selector" android:textSize="@dimen/primary_font_size" + android:textColor="?android:textColorPrimary" tools:text="The title of the note"/> @@ -102,7 +102,6 @@ android:paddingBottom="1dp" android:paddingTop="1dp" android:layout_weight="1" - android:textColor="@drawable/list_item_color_selector_low" android:textSize="@dimen/secondary_font_size" tools:text="This is the content of the first line."/> @@ -121,7 +120,7 @@ android:layout_marginStart="8dp" android:layout_marginLeft="8dp" android:singleLine="true" - android:textColor="@drawable/list_item_color_selector" + android:textColor="?android:textColorPrimary" android:textSize="@dimen/secondary_font_size" tools:text="My fancy category"/> diff --git a/app/src/main/res/layout/item_pref.xml b/app/src/main/res/layout/item_pref.xml index 2140d9ca..8237bdad 100644 --- a/app/src/main/res/layout/item_pref.xml +++ b/app/src/main/res/layout/item_pref.xml @@ -30,7 +30,7 @@ android:ellipsize="marquee" android:fadingEdge="horizontal" android:singleLine="true" - android:textColor="@color/fg_default" + android:textColor="?android:textColorPrimary" tools:text="@string/action_settings" /> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 24e89cf5..70516c53 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,21 +1,17 @@ - @@ -31,10 +27,4 @@ - - \ No newline at end of file