Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Font Colors and Separate Themes

Browse Source 
Once applied this commit will change the font colors according to the
design and move all themes into a dedicated file.

Closes #333
This commit is contained in:
Torsten Grote
2016-06-27 12:55:05 -03:00
parent f270624f39
commit 66a1f85859
20 changed files with 93 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
briar-android/res/values/styles.xml
View File

@@ -1,32 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="BriarBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="actionBarStyle">@style/BriarActionBar</item>
<item name="colorPrimary">@color/briar_primary</item>
<item name="colorPrimaryDark">@color/briar_primary_dark</item>
<item name="colorAccent">@color/briar_accent</item>
<item name="android:windowBackground">@color/window_background</item>
<item name="android:textColorPrimary">@color/briar_text_primary</item>
<item name="android:textColorPrimaryInverse">@color/briar_text_primary_inverse</item>
<item name="android:textColorSecondary">@color/briar_text_primary</item>
<item name="android:textColorLink">@color/briar_text_link</item>
</style>
<style name="BriarThemeNoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
<item name="toolbarStyle">@style/BriarToolbar</item>
<item name="colorPrimary">@color/briar_primary</item>
<item name="colorPrimaryDark">@color/briar_primary_dark</item>
<item name="colorAccent">@color/briar_primary</item>
<item name="android:windowBackground">@color/window_background</item>
<item name="android:textColorPrimary">@color/briar_text_primary</item>
<item name="android:textColorPrimaryInverse">@color/briar_text_primary_inverse</item>
<item name="android:textColorSecondary">@color/briar_text_primary</item>
<item name="android:textColorLink">@color/briar_text_link</item>
</style>
<style name="BriarThemeNoActionBar.Default" />
<style name="BriarToolbar" parent="Widget.AppCompat.Toolbar">
<item name="android:background">?colorPrimary</item>
<item name="android:textColorPrimary">@color/briar_text_primary_inverse</item>
@@ -44,21 +18,10 @@
<item name="android:textColor">@color/briar_text_primary_inverse</item>
</style>
<style name="BriarTheme" parent="BriarBaseTheme">
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="android:listSeparatorTextViewStyle">@style/BriarTheme.ListSeparatorTextView</item>
</style>
<style name="BriarActionBar" parent="Base.Widget.AppCompat.Light.ActionBar.Solid">
<item name="elevation">1dp</item>
</style>
<style name="BriarDialogTheme" parent="Theme.AppCompat.Light.Dialog">
<item name="colorPrimary">@color/briar_primary</item>
<item name="colorPrimaryDark">@color/briar_primary_dark</item>
<item name="colorAccent">@color/briar_accent</item>
</style>
<style name="BriarButton" parent="Widget.AppCompat.Button.Colored">
<item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:padding">@dimen/margin_large</item>
@@ -131,15 +94,6 @@
<item name="android:paddingLeft">@dimen/margin_large</item>
</style>
<!-- This fixes a UI bug in the support preference library -->
<style name="BriarTheme.ListSeparatorTextView">
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
<item name="android:textColor">@color/briar_accent</item>
<item name="android:paddingTop">16dp</item>
<item name="android:layout_marginBottom">16dp</item>
</style>
<style name="DiscussionLevelIndicator">
<item name="android:layout_marginLeft">4dp</item>
<item name="android:background">?android:attr/listDivider</item>