blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Closes #873 - Themes History Fragment colors

master
Emily Kager 2019-03-11 15:15:32 -07:00 committed by Jeff Boek
parent fd4acf6e92
commit dc257a09aa
5 changed files with 72 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/history_header.xml
View File

@ -15,5 +15,5 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="17sp"
android:textColor="@color/history_header"/>
</FrameLayout>
android:textColor="?attr/historyHeader"/>
</FrameLayout>

43
app/src/main/res/layout/history_list_item.xml
View File

@ -1,13 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:padding="4dp"
android:paddingStart="20dp"
android:background="?android:attr/selectableItemBackground"
xmlns:app="http://schemas.android.com/apk/res-auto">
android:paddingStart="20dp">
<CheckBox
android:id="@+id/should_remove_checkbox"
@ -15,7 +18,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/history_title" />
app:layout_constraintTop_toTopOf="@id/history_title" />
<ImageView
android:id="@+id/history_favicon"
@ -29,14 +32,14 @@
android:id="@+id/history_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="20dp"
android:textColor="@color/history_title"
android:textAlignment="viewStart"
android:textSize="18sp"
android:singleLine="true"
android:ellipsize="end"
android:singleLine="true"
android:textAlignment="viewStart"
android:textColor="?attr/historyTitleColor"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/history_favicon"
app:layout_constraintTop_toTopOf="parent" />
@ -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" />
<ImageButton
android:id="@+id/history_item_overflow"
android:layout_width="@dimen/glyph_button_height"
android:layout_height="@dimen/glyph_button_height"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/content_description_history_menu"
android:src="@drawable/ic_menu"
android:tint="?attr/menuButtonTint"
android:contentDescription="@string/content_description_history_menu"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

55
app/src/main/res/values/attrs.xml
View File

@ -8,36 +8,41 @@
<attr name="listItemIcon" format="reference" />
</declare-styleable>
<attr name="searchBarColor" format="reference"/>
<attr name="fenixPrimary" format="reference"/>
<attr name="iconColor" format="reference"/>
<attr name="toolbarColor" format="reference"/>
<attr name="searchBarColor" format="reference" />
<attr name="fenixPrimary" format="reference" />
<attr name="iconColor" format="reference" />
<attr name="toolbarColor" format="reference" />
<!-- Home fragment -->
<attr name="homeBackgroundTopGradient" format="reference"/>
<attr name="homeBackgroundBottomGradient" format="reference"/>
<attr name="homeBackgroundGradient" format="reference"/>
<attr name="privateBrowsingButtonBackground" format="reference"/>
<attr name="privateBrowsingButtonTint" format="reference"/>
<attr name="fenixLogo" format="reference"/>
<attr name="menuButtonTint" format="reference"/>
<attr name="toolbarWrapperBackground" format="reference"/>
<attr name="toolbarTextColor" format="reference"/>
<attr name="navigationBarColorHome" format="reference"/>
<attr name="homeBackgroundTopGradient" format="reference" />
<attr name="homeBackgroundBottomGradient" format="reference" />
<attr name="homeBackgroundGradient" format="reference" />
<attr name="privateBrowsingButtonBackground" format="reference" />
<attr name="privateBrowsingButtonTint" format="reference" />
<attr name="fenixLogo" format="reference" />
<attr name="menuButtonTint" format="reference" />
<attr name="toolbarWrapperBackground" format="reference" />
<attr name="toolbarTextColor" format="reference" />
<attr name="navigationBarColorHome" format="reference" />
<attr name="homeDividerColor" format="reference" />
<attr name="sessionBackgroundColor" format="reference"/>
<attr name="sessionBorderColor" format="reference"/>
<attr name="sessionBackgroundColor" format="reference" />
<attr name="sessionBorderColor" format="reference" />
<!-- Search fragment -->
<attr name="searchBackground" format="reference"/>
<attr name="searchShortcutsTextColor" format="reference"/>
<attr name="pillWrapperBackground" format="reference"/>
<attr name="suggestionBackground" format="reference"/>
<attr name="searchBackground" format="reference" />
<attr name="searchShortcutsTextColor" format="reference" />
<attr name="pillWrapperBackground" format="reference" />
<attr name="suggestionBackground" format="reference" />
<!-- Browser fragment -->
<attr name="browserUrlBarBackground" format="reference"/>
<attr name="browserToolbarBackground" format="reference"/>
<attr name="browserToolbarIcons" format="reference"/>
<attr name="browserToolbarMenuIcons" format="reference"/>
<attr name="navigationBarColorBrowser" format="reference"/>
<attr name="browserUrlBarBackground" format="reference" />
<attr name="browserToolbarBackground" format="reference" />
<attr name="browserToolbarIcons" format="reference" />
<attr name="browserToolbarMenuIcons" format="reference" />
<attr name="navigationBarColorBrowser" format="reference" />
<!-- History Fragment -->
<attr name="historyURLColor" format="reference" />
<attr name="historyTitleColor" format="reference" />
<attr name="historyHeader" format="reference" />
</resources>

10
app/src/main/res/values/colors.xml
View File

@ -61,7 +61,11 @@
<color name="library_key_icon_background">#FFF4C3</color>
<color name="library_key_icon">#C13905</color>
<color name="history_header">#696A6A</color>
<color name="history_title">#000000</color>
<color name="history_url">#696A6A</color>
<color name="history_header_light_theme">#696A6A</color>
<color name="history_title_light_theme">#000000</color>
<color name="history_url_light_theme">#696A6A</color>
<color name="history_header_private_theme">@color/photonGrey40</color>
<color name="history_title_private_theme">@color/off_white</color>
<color name="history_url_private_theme">@color/photonGrey40</color>
</resources>

10
app/src/main/res/values/styles.xml
View File

@ -45,6 +45,11 @@
<item name="browserToolbarBackground">@color/off_white</item>
<item name="browserToolbarIcons">@color/icons_light_mode</item>
<item name="browserToolbarMenuIcons">@color/icons_light_mode</item>
<!-- History fragment colors -->
<item name="historyTitleColor">@color/history_title_light_theme</item>
<item name="historyURLColor">@color/history_url_light_theme</item>
<item name="historyHeader">@color/history_header_light_theme</item>
</style>
<style name="LightTheme" parent="LightThemeBase">
@ -93,6 +98,11 @@
<item name="browserToolbarBackground">@color/private_browsing_top_gradient</item>
<item name="browserToolbarIcons">@color/icons_dark_mode</item>
<item name="browserToolbarMenuIcons">@color/icons_dark_mode</item>
<!-- History fragment colors -->
<item name="historyTitleColor">@color/history_title_private_theme</item>
<item name="historyURLColor">@color/history_url_private_theme</item>
<item name="historyHeader">@color/history_header_private_theme</item>
</style>
<style name="PrivateTheme" parent="PrivateThemeBase">