Commit 2c99a75b authored by Torsten Grote's avatar Torsten Grote

Merge branch 'settings-screen' into 'master'

Use lighter text colour for preference categories and fix layout

See merge request akwizgran/briar!799
parents 5c068ed0 dcbb3e76
Pipeline #1504 passed with stage
in 13 minutes and 35 seconds
<?xml version="1.0" encoding="utf-8"?>
<View xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider">
</View>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:textSize="14sp"
android:textStyle="bold"
android:textColor="@color/briar_blue_light"/>
\ No newline at end of file
......@@ -2,8 +2,10 @@
<resources>
<color name="briar_blue">#2D3E50</color>
<color name="briar_blue_dark">#0F1720</color>
<color name="briar_blue_light">#4F6C8C</color>
<color name="briar_gold">#FCCF1C</color>
<color name="briar_green_light">#95D220</color>
<color name="briar_link">#06B9FF</color>
<color name="window_background">#eceff1</color>
<color name="action_bar_text">#FFFFFF</color>
......@@ -19,23 +21,20 @@
<color name="control_normal_light">#757575</color>
<!-- text colors -->
<color name="briar_text_link">#06b9ff</color>
<color name="briar_text_link">@color/briar_link</color>
<color name="briar_text_primary">#df000000</color>
<color name="briar_text_primary_inverse">#ffffff</color>
<color name="briar_text_secondary">#8a000000</color>
<color name="briar_text_secondary_inverse">#b4ffffff</color>
<color name="briar_text_tertiary">#61000000</color>
<color name="briar_text_tertiary_inverse">#80ffffff</color>
<color name="briar_button_positive">#06b9ff</color>
<color name="briar_button_positive">@color/briar_link</color>
<color name="briar_button_negative">#ff0000</color>
<color name="briar_warning_background">#ff0000</color>
<color name="emoji_text_color">#ff000000</color>
<color name="emoji_pager_background">@color/window_background</color>
<!-- this is needed as preference_category_material layout uses this color as the text color -->
<color name="preference_fallback_accent_color">@color/briar_accent</color>
<color name="thread_indicator">#9e9e9e</color>
<color name="divider">#c1c1c1</color>
<color name="menu_background">#FFFFFF</color>
......
......@@ -9,10 +9,7 @@
<item name="android:textColorLink">@color/briar_text_link</item>
<item name="android:windowBackground">@color/window_background</item>
<item name="android:windowAnimationStyle">@style/ActivityAnimation</item>
<!-- These fix a long-standing UI bug in the support preference library -->
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="android:listSeparatorTextViewStyle">@style/BriarTheme.ListSeparatorTextView</item>
</style>
<style name="BriarTheme.NoActionBar" parent="BriarTheme">
......@@ -56,13 +53,4 @@
<item name="buttonBarNeutralButtonStyle">@style/Widget.AppCompat.Button.Borderless</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>
</resources>
\ No newline at end of file
......@@ -3,6 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:layout="@layout/preferences_category"
android:title="@string/network_settings_title">
<ListPreference
......@@ -25,9 +26,8 @@
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/divider_preference"/>
<PreferenceCategory
android:layout="@layout/preferences_category"
android:title="@string/security_settings_title">
<Preference
......@@ -41,9 +41,8 @@
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/divider_preference"/>
<PreferenceCategory
android:layout="@layout/preferences_category"
android:title="@string/panic_setting_title">
<Preference
......@@ -58,9 +57,8 @@
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/divider_preference"/>
<PreferenceCategory
android:layout="@layout/preferences_category"
android:title="@string/notification_settings_title">
<CheckBoxPreference
......@@ -111,9 +109,8 @@
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/divider_preference"/>
<PreferenceCategory
android:layout="@layout/preferences_category"
android:title="@string/feedback_settings_title">
<Preference
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment