Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1251-dark-theme-fixes' into 'master'

Browse Source 
Dark Theme Fixes

See merge request briar/briar!844
This commit is contained in:
akwizgran
2018-06-21 12:49:15 +00:00
parent 912b1b5b1d 679c1c3719
commit 55918a88b2
5 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/res/color/button_text.xml
View File

@@ -2,7 +2,7 @@
<selector <selector
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:color="?attr/colorControlNormal" android:color="@color/briar_button_text_disabled"
android:state_enabled="false"/> android:state_enabled="false"/>
<item <item
android:color="#ffffffff"/> android:color="#ffffffff"/>

31
briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
View File

@@ -22,10 +22,11 @@
android:padding="@dimen/margin_medium" android:padding="@dimen/margin_medium"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/qr_code_intro" android:src="@drawable/qr_code_intro"
app:layout_constraintTop_toTopOf="parent" android:tint="@color/color_primary"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="@id/explanationText"
app:layout_constraintEnd_toStartOf="@id/explanationText" app:layout_constraintEnd_toStartOf="@id/explanationText"
app:layout_constraintBottom_toBottomOf="@id/explanationText"/> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<ImageView <ImageView
android:id="@+id/explanationImage" android:id="@+id/explanationImage"
@@ -33,16 +34,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:paddingTop="@dimen/margin_large"
android:paddingLeft="@dimen/margin_large" android:paddingLeft="@dimen/margin_large"
android:paddingRight="@dimen/margin_large" android:paddingRight="@dimen/margin_large"
android:paddingTop="@dimen/margin_large"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/qr_code_explanation" android:src="@drawable/qr_code_explanation"
tools:ignore="ContentDescription" app:layout_constraintBottom_toTopOf="@id/explanationText"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@id/diagram"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/explanationText"/> app:layout_constraintStart_toEndOf="@id/diagram"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription"/>
<TextView <TextView
android:id="@+id/explanationText" android:id="@+id/explanationText"
@@ -51,19 +52,19 @@
android:layout_weight="1" android:layout_weight="1"
android:padding="@dimen/margin_large" android:padding="@dimen/margin_large"
android:text="@string/face_to_face" android:text="@string/face_to_face"
app:layout_constraintTop_toBottomOf="@id/explanationImage" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/diagram" app:layout_constraintStart_toEndOf="@id/diagram"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintTop_toBottomOf="@id/explanationImage"/>
<View <View
android:id="@+id/explanationBorder" android:id="@+id/explanationBorder"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:background="@drawable/border_explanation" android:background="@drawable/border_explanation"
app:layout_constraintTop_toTopOf="@id/explanationImage" app:layout_constraintBottom_toBottomOf="@id/explanationText"
app:layout_constraintStart_toStartOf="@id/explanationImage"
app:layout_constraintEnd_toEndOf="@id/explanationImage" app:layout_constraintEnd_toEndOf="@id/explanationImage"
app:layout_constraintBottom_toBottomOf="@id/explanationText"/> app:layout_constraintStart_toStartOf="@id/explanationImage"
app:layout_constraintTop_toTopOf="@id/explanationImage"/>
<android.support.constraint.Barrier <android.support.constraint.Barrier
android:id="@+id/barrier" android:id="@+id/barrier"
@@ -80,8 +81,8 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/margin_medium" android:layout_marginTop="@dimen/margin_medium"
android:text="@string/continue_button" android:text="@string/continue_button"
app:layout_constraintTop_toBottomOf="@id/barrier" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/> app:layout_constraintTop_toBottomOf="@id/barrier"/>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>

13
briar-android/src/main/res/layout/list_item_rss_feed.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -19,16 +20,16 @@
android:textSize="@dimen/text_size_medium" android:textSize="@dimen/text_size_medium"
tools:text="This is a name of a RSS Feed"/> tools:text="This is a name of a RSS Feed"/>
<ImageButton <android.support.v7.widget.AppCompatImageButton
android:id="@+id/deleteButton" android:id="@+id/deleteButton"
android:layout_width="wrap_content" android:layout_width="@dimen/button_size"
android:layout_height="wrap_content" android:layout_height="@dimen/button_size"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginEnd="@dimen/listitem_horizontal_margin" android:background="?attr/selectableItemBackground"
android:layout_marginRight="@dimen/listitem_horizontal_margin"
android:contentDescription="@string/delete" android:contentDescription="@string/delete"
android:src="@drawable/action_delete_black"/> android:src="@drawable/action_delete_black"
app:tint="?attr/colorControlNormal"/>
<TextView <TextView
android:id="@+id/author" android:id="@+id/author"

2
briar-android/src/main/res/values-night/color.xml
View File

@@ -10,6 +10,8 @@
<color name="card_background">@color/cardview_dark_background</color> <color name="card_background">@color/cardview_dark_background</color>
<color name="divider">#666666</color> <color name="divider">#666666</color>
<color name="briar_button_text_disabled">#23cccccc</color>
<color name="thread_item_background">@color/window_background</color> <color name="thread_item_background">@color/window_background</color>
<color name="thread_item_highlight">#000000</color> <color name="thread_item_highlight">#000000</color>

1
briar-android/src/main/res/values/color.xml
View File

@@ -30,6 +30,7 @@
<color name="briar_button_positive">@color/briar_link</color> <color name="briar_button_positive">@color/briar_link</color>
<color name="briar_button_negative">#ff0000</color> <color name="briar_button_negative">#ff0000</color>
<color name="briar_button_text_disabled">#28000000</color>
<color name="briar_warning_background">#ff0000</color> <color name="briar_warning_background">#ff0000</color>
<color name="thread_indicator">#9e9e9e</color> <color name="thread_indicator">#9e9e9e</color>