diff --git a/app/src/main/res/layout/history_header.xml b/app/src/main/res/layout/history_header.xml index 54e956e4b..1de36e27d 100644 --- a/app/src/main/res/layout/history_header.xml +++ b/app/src/main/res/layout/history_header.xml @@ -15,5 +15,5 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="17sp" - android:textColor="@color/history_header"/> - \ No newline at end of file + android:textColor="?attr/historyHeader"/> + diff --git a/app/src/main/res/layout/history_list_item.xml b/app/src/main/res/layout/history_list_item.xml index 086a92d70..76f806bb1 100644 --- a/app/src/main/res/layout/history_list_item.xml +++ b/app/src/main/res/layout/history_list_item.xml @@ -1,13 +1,16 @@ + + android:paddingStart="20dp"> + app:layout_constraintTop_toTopOf="@id/history_title" /> @@ -45,28 +48,28 @@ android:id="@+id/history_url" android:layout_width="0dp" android:layout_height="wrap_content" - android:textColor="@color/history_url" - android:textSize="12sp" - android:layout_marginTop="4dp" - android:layout_marginBottom="8dp" android:layout_marginStart="16dp" - android:singleLine="true" + android:layout_marginTop="4dp" android:layout_marginEnd="20dp" - android:textAlignment="viewStart" + android:layout_marginBottom="8dp" android:ellipsize="end" - app:layout_constraintStart_toEndOf="@id/history_favicon" - app:layout_constraintTop_toBottomOf="@id/history_title" + android:singleLine="true" + android:textAlignment="viewStart" + android:textColor="?attr/historyURLColor" + android:textSize="12sp" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/history_item_overflow" - app:layout_constraintBottom_toBottomOf="parent" /> + app:layout_constraintStart_toEndOf="@id/history_favicon" + app:layout_constraintTop_toBottomOf="@id/history_title" /> - \ No newline at end of file + diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index ef2a6b7f7..01d513dab 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -8,36 +8,41 @@ - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - + + - - - - + + + + - - - - - + + + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ab5bd6bfb..3a66deda5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -61,7 +61,11 @@ #FFF4C3 #C13905 - #696A6A - #000000 - #696A6A + #696A6A + #000000 + #696A6A + + @color/photonGrey40 + @color/off_white + @color/photonGrey40 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index cd9247473..cc3b75ac4 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -45,6 +45,11 @@ @color/off_white @color/icons_light_mode @color/icons_light_mode + + + @color/history_title_light_theme + @color/history_url_light_theme + @color/history_header_light_theme