Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 11:49:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'md3' into 'master'

Browse Source 
Migrate app to Material Design 3

Closes #2460

See merge request briar/briar!1825
This commit is contained in:
akwizgran
2024-06-10 16:55:38 +00:00
parent 6f937eb929 07ab0146dd
commit f6f5570ac6
100 changed files with 556 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:color="@color/briar_button_text_disabled"
android:state_enabled="false"/>
<item
android:color="#ffffffff"/>
</selector>

7
briar-android/src/main/res/drawable-v21/button_outline.xml
View File

@@ -1,7 +0,0 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item
android:id="@android:id/mask"
android:drawable="@drawable/button_outline_mask" />
<item android:drawable="@drawable/button_outline_background" />
</ripple>

19
briar-android/src/main/res/drawable-v21/button_outline_background.xml
View File

@@ -1,19 +0,0 @@
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetLeft="4dp"
android:insetTop="6dp"
android:insetRight="4dp"
android:insetBottom="6dp">
<shape
android:shape="rectangle">
<corners android:radius="2dp" />
<solid android:color="@android:color/transparent" />
<stroke
android:width="1dp"
android:color="@color/briar_button_outline" />
<padding
android:bottom="4dp"
android:left="8dp"
android:right="8dp"
android:top="4dp" />
</shape>
</inset>

19
briar-android/src/main/res/drawable-v21/button_outline_mask.xml
View File

@@ -1,19 +0,0 @@
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetLeft="4dp"
android:insetTop="6dp"
android:insetRight="4dp"
android:insetBottom="6dp">
<shape
android:shape="rectangle">
<corners android:radius="2dp" />
<solid android:color="@android:color/white" />
<stroke
android:width="1dp"
android:color="@android:color/white" />
<padding
android:bottom="4dp"
android:left="8dp"
android:right="8dp"
android:top="4dp" />
</shape>
</inset>

2
briar-android/src/main/res/drawable/bubble_completed.xml
View File

@@ -7,7 +7,7 @@
android:radius="32dp"/>
<solid
android:color="@color/briar_lime_600"/>
android:color="?colorTertiaryContainer"/>
</shape>

2
briar-android/src/main/res/drawable/bubble_accent.xml → briar-android/src/main/res/drawable/bubble_current.xml
View File

@@ -7,7 +7,7 @@
android:radius="32dp"/>
<solid
android:color="@color/briar_accent"/>
android:color="?colorTertiary"/>
</shape>

13
briar-android/src/main/res/drawable/bubble_future.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners
android:radius="32dp"/>
<solid
android:color="?colorSurfaceDim"/>
</shape>

16
briar-android/src/main/res/drawable/button_outline.xml
View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="6dp"
android:left="4dp"
android:right="4dp"
android:top="6dp">
<shape android:shape="rectangle">
<corners android:radius="2dp" />
<solid android:color="@android:color/transparent" />
<stroke
android:width="1dp"
android:color="@color/briar_button_outline" />
</shape>
</item>
</layer-list>

32
briar-android/src/main/res/layout/activity_change_password.xml
View File

@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
tools:context=".android.login.ChangePasswordActivity">
<androidx.constraintlayout.widget.ConstraintLayout
@@ -64,15 +65,27 @@
android:maxLines="1" />
</com.google.android.material.textfield.TextInputLayout>
<org.briarproject.briar.android.login.StrengthMeter
android:id="@+id/strength_meter"
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginTop="8dp"
android:visibility="invisible"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/new_password_entry_wrapper"
tools:visibility="visible" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/new_password_confirm_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
app:errorEnabled="true"
app:hintEnabled="false"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/new_password_entry_wrapper"
app:layout_constraintTop_toBottomOf="@id/strength_meter"
app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText
@@ -86,15 +99,6 @@
android:maxLines="1" />
</com.google.android.material.textfield.TextInputLayout>
<org.briarproject.briar.android.login.StrengthMeter
android:id="@+id/strength_meter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="invisible"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/new_password_confirm_wrapper" />
<Button
android:id="@+id/change_password"
style="@style/BriarButton"
@@ -103,16 +107,20 @@
android:layout_marginTop="@dimen/margin_medium"
android:enabled="false"
android:text="@string/change_password"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/strength_meter"
app:layout_constraintTop_toBottomOf="@id/new_password_confirm_wrapper"
app:layout_constraintVertical_bias="1.0"
tools:enabled="true" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress_wheel"
style="@style/CircularProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/change_password"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/change_password" />

4
briar-android/src/main/res/layout/activity_conversation.xml
View File

@@ -12,7 +12,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/BriarToolbar"
android:layout_width="match_parent"
@@ -40,7 +40,7 @@
</LinearLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>

3
briar-android/src/main/res/layout/activity_create_forum.xml
View File

@@ -35,8 +35,9 @@
android:text="@string/create_forum_button"
tools:enabled="true" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/createForumProgressBar"
style="@style/CircularProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

4
briar-android/src/main/res/layout/activity_image.xml
View File

@@ -18,7 +18,7 @@
android:layout_height="wrap_content"
android:background="@color/msg_status_bubble_background">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/BriarToolbar"
android:layout_width="match_parent"
@@ -50,7 +50,7 @@
</LinearLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>

4
briar-android/src/main/res/layout/activity_mailbox.xml
View File

@@ -5,9 +5,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="?android:progressBarStyleLarge"
style="@style/CircularProgress.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

4
briar-android/src/main/res/layout/activity_write_blog_post.xml
View File

@@ -19,9 +19,9 @@
</org.briarproject.briar.android.view.LargeTextInputView>
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
style="@style/CircularProgress.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

4
briar-android/src/main/res/layout/briar_button.xml
View File

@@ -6,12 +6,14 @@
<!-- Button gets added programmatically so we can pass on the styles -->
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/briar_button_progress_bar"
style="@style/CircularProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="invisible"
tools:progress="50"
tools:visibility="visible" />
</merge>

4
briar-android/src/main/res/layout/briar_recycler_view.xml
View File

@@ -15,9 +15,9 @@
tools:listitem="@layout/list_item_contact"
tools:visibility="visible" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
style="@style/CircularProgress.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"

4
briar-android/src/main/res/layout/fragment_alias_dialog.xml
View File

@@ -21,6 +21,7 @@
android:id="@+id/aliasEditLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
app:errorEnabled="true"
app:hintEnabled="false">
@@ -28,7 +29,6 @@
android:id="@+id/aliasEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:hint="@string/set_contact_alias_hint"
android:imeOptions="flagNoPersonalizedLearning"
android:inputType="text|textCapWords"
@@ -41,7 +41,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_xxlarge"
android:layout_marginLeft="@dimen/margin_xxlarge"
android:layout_marginBottom="8dp"
android:gravity="end"
android:orientation="horizontal">

4
briar-android/src/main/res/layout/fragment_blog_post.xml
View File

@@ -19,9 +19,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
style="@style/CircularProgress.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />

1
briar-android/src/main/res/layout/fragment_bluetooth_intro.xml
View File

@@ -34,7 +34,6 @@
android:text="@string/connect_via_bluetooth_intro"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/introImageView" />

4
briar-android/src/main/res/layout/fragment_bluetooth_progress.xml
View File

@@ -17,12 +17,12 @@
app:layout_constraintVertical_chainStyle="packed"
app:srcCompat="@drawable/il_bluetooth_connect" />
<ProgressBar
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:indeterminate="true"
app:indicatorColor="@color/briar_accent"
app:layout_constraintBottom_toTopOf="@+id/textView"
app:layout_constraintEnd_toEndOf="@+id/introImageView"
app:layout_constraintStart_toStartOf="@+id/introImageView"

3
briar-android/src/main/res/layout/fragment_contact_list.xml
View File

@@ -18,8 +18,7 @@
app:fab_fabDrawable="@drawable/ic_action_add"
app:fab_fabRippleColor="@android:color/transparent"
app:fab_menu="@menu/contact_list_actions"
app:fab_miniFabTextBackground="@color/briar_accent"
app:fab_miniFabTextColor="@android:color/white"
app:fab_miniFabTextBackground="?attr/colorPrimary"
app:layout_anchorGravity="bottom|right|end"
app:layout_behavior="org.briarproject.briar.android.view.SnackbarAwareBehavior" />

5
briar-android/src/main/res/layout/fragment_conversation_settings.xml
View File

@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/BriarToolbar"
android:layout_width="match_parent"
@@ -40,7 +40,7 @@
app:tint="?attr/colorControlNormal"
tools:ignore="ContentDescription" />
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switchDisappearingMessages"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -50,6 +50,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageViewBomb"
tools:checked="true"
tools:enabled="true" />
<Button

3
briar-android/src/main/res/layout/fragment_create_group.xml
View File

@@ -35,8 +35,9 @@
android:text="@string/groups_create_group_button"
tools:enabled="true" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="@style/CircularProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

4
briar-android/src/main/res/layout/fragment_hotspot_fallback.xml
View File

@@ -37,9 +37,9 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fallbackIntro" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="?android:progressBarStyle"
style="@style/CircularProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"

10
briar-android/src/main/res/layout/fragment_hotspot_intro.xml
View File

@@ -59,19 +59,17 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/margin_large"
android:drawablePadding="8dp"
android:text="@string/hotspot_button_start_sharing"
app:drawableLeftCompat="@drawable/ic_wifi_tethering"
app:drawableStartCompat="@drawable/ic_wifi_tethering"
app:drawableTint="@color/button_text"
app:icon="@drawable/ic_wifi_tethering"
app:iconTint="?attr/colorOnPrimary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:visibility="visible" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="?android:attr/progressBarStyle"
style="@style/CircularProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"

12
briar-android/src/main/res/layout/fragment_hotspot_tabs.xml
View File

@@ -76,11 +76,9 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="6dp"
android:drawablePadding="8dp"
android:text="@string/hotspot_button_connected"
app:drawableLeftCompat="@drawable/ic_check_white"
app:drawableStartCompat="@drawable/ic_check_white"
app:drawableTint="@color/button_text"
app:icon="@drawable/ic_check_white"
app:iconTint="?attr/colorOnPrimary"
app:layout_constraintBottom_toTopOf="@+id/stopButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -94,11 +92,9 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="6dp"
android:drawablePadding="8dp"
android:text="@string/hotspot_button_stop_sharing"
app:drawableLeftCompat="@drawable/ic_portable_wifi_off"
app:drawableStartCompat="@drawable/ic_portable_wifi_off"
app:drawableTint="@color/briar_red_500"
app:icon="@drawable/ic_portable_wifi_off"
app:iconTint="@color/briar_red_500"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

4
briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
View File

@@ -27,9 +27,9 @@
android:visibility="invisible"
tools:visibility="visible">
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/connect_progress"
style="?android:attr/progressBarStyleLarge"
style="@style/CircularProgress.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/connect_status"

27
briar-android/src/main/res/layout/fragment_link_exchange.xml
View File

@@ -49,7 +49,7 @@
android:layout_height="1dp"
android:layout_margin="16dp"
android:alpha="0.5"
android:background="@color/briar_accent"
android:background="?colorTertiary"
app:layout_constraintBottom_toBottomOf="@+id/stepOne"
app:layout_constraintEnd_toStartOf="@+id/stepTwo"
app:layout_constraintStart_toEndOf="@+id/stepOne"
@@ -94,12 +94,12 @@
android:layout_width="38dp"
android:layout_height="38dp"
android:layout_marginTop="8dp"
android:background="@drawable/bubble_accent"
android:background="@drawable/bubble_current"
android:scaleType="center"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView"
app:srcCompat="@drawable/ic_call_made"
app:tint="@android:color/white" />
app:tint="?colorOnTertiary" />
<TextView
android:id="@+id/yourLink"
@@ -137,11 +137,10 @@
style="@style/BriarButtonFlat.Positive.Tiny"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="8dp"
android:enabled="false"
android:text="@string/copy_button"
app:drawableLeftCompat="@drawable/ic_content_copy"
app:drawableStartCompat="@drawable/ic_content_copy"
app:icon="@drawable/ic_content_copy"
app:iconPadding="8dp"
app:layout_constraintEnd_toStartOf="@id/shareButton"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintHorizontal_chainStyle="packed"
@@ -153,11 +152,10 @@
style="@style/BriarButtonFlat.Positive.Tiny"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="8dp"
android:enabled="false"
android:text="@string/share_button"
app:drawableLeftCompat="@drawable/social_share_blue"
app:drawableStartCompat="@drawable/social_share_blue"
app:icon="@drawable/social_share_blue"
app:iconPadding="8dp"
app:layout_constraintBottom_toBottomOf="@id/copyButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/copyButton"
@@ -168,12 +166,12 @@
android:layout_width="38dp"
android:layout_height="38dp"
android:layout_marginTop="16dp"
android:background="@drawable/bubble_accent"
android:background="@drawable/bubble_current"
android:scaleType="center"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/copyButton"
app:srcCompat="@drawable/ic_call_received"
app:tint="@android:color/white" />
app:tint="?colorOnTertiary" />
<TextView
android:id="@+id/inputLink"
@@ -216,15 +214,14 @@
style="@style/BriarButtonFlat.Positive.Tiny"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="8dp"
android:text="@string/paste_button"
app:drawableLeftCompat="@drawable/ic_content_paste"
app:drawableStartCompat="@drawable/ic_content_paste"
app:icon="@drawable/ic_content_paste"
app:iconPadding="8dp"
app:layout_constraintBottom_toTopOf="@+id/infoView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/linkInputLayout"
app:layout_constraintBottom_toTopOf="@+id/infoView"
app:layout_constraintVertical_bias="0.0" />
<org.briarproject.briar.android.view.InfoView

7
briar-android/src/main/res/layout/fragment_mailbox_connecting.xml
View File

@@ -20,18 +20,19 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
<ProgressBar
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/margin_xlarge"
android:layout_marginTop="@dimen/margin_xlarge"
android:max="100"
app:indicatorColor="@color/briar_accent"
app:layout_constraintBottom_toTopOf="@+id/info"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title" />
app:layout_constraintTop_toBottomOf="@+id/title"
tools:progress="50" />
<TextView
android:id="@+id/info"

6
briar-android/src/main/res/layout/fragment_mailbox_setup_download.xml
View File

@@ -52,11 +52,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/margin_large"
android:drawablePadding="8dp"
android:text="@string/mailbox_setup_button_scan"
app:drawableLeftCompat="@drawable/ic_qr_code"
app:drawableStartCompat="@drawable/ic_qr_code"
app:drawableTint="@color/button_text"
app:icon="@drawable/ic_qr_code"
app:iconTint="?attr/colorOnPrimary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

4
briar-android/src/main/res/layout/fragment_mailbox_status.xml
View File

@@ -95,7 +95,6 @@
android:layout_marginTop="6dp"
android:text="@string/mailbox_error_wizard_button"
android:visibility="gone"
app:drawableTint="@color/briar_button_text_positive"
app:layout_constraintBottom_toTopOf="@+id/unlinkButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -114,8 +113,9 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/unlinkProgress"
style="@style/CircularProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"

6
briar-android/src/main/res/layout/fragment_nickname.xml
View File

@@ -49,7 +49,7 @@
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_margin="16dp"
android:background="@color/briar_accent"
android:background="?colorTertiary"
app:layout_constraintBottom_toBottomOf="@+id/stepOne"
app:layout_constraintEnd_toStartOf="@+id/stepTwo"
app:layout_constraintStart_toEndOf="@+id/stepOne"
@@ -96,13 +96,13 @@
android:layout_width="38dp"
android:layout_height="38dp"
android:layout_marginTop="32dp"
android:background="@drawable/bubble_accent"
android:background="@drawable/bubble_current"
android:scaleType="center"
app:layout_constraintBottom_toTopOf="@+id/contactNameLayout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView"
app:srcCompat="@drawable/ic_person"
app:tint="@android:color/white" />
app:tint="?colorOnTertiary" />
<TextView
android:id="@+id/nicknameIntro"

2
briar-android/src/main/res/layout/fragment_onboarding_full.xml
View File

@@ -7,7 +7,7 @@
android:background="@color/briar_primary"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/BriarToolbar"
android:layout_width="match_parent"

8
briar-android/src/main/res/layout/fragment_open_database.xml
View File

@@ -20,15 +20,17 @@
app:tint="@color/briar_accent"
tools:ignore="ContentDescription" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
style="@style/CircularProgress.Large"
android:layout_width="0dp"
android:layout_height="0dp"
app:indicatorColor="@color/briar_accent"
app:layout_constraintBottom_toBottomOf="@+id/imageView"
app:layout_constraintEnd_toEndOf="@+id/imageView"
app:layout_constraintStart_toStartOf="@+id/imageView"
app:layout_constraintTop_toTopOf="@+id/imageView" />
app:layout_constraintTop_toTopOf="@+id/imageView"
tools:progress="50" />
<TextView
android:id="@+id/textView"

12
briar-android/src/main/res/layout/fragment_password.xml
View File

@@ -64,22 +64,21 @@
</com.google.android.material.textfield.TextInputLayout>
<TextView
<Button
android:id="@+id/btn_forgotten"
style="@style/BriarButtonFlat.Neutral"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:clickable="true"
android:focusable="true"
android:layout_marginBottom="8dp"
android:text="@string/forgotten_password"
android:textColor="?android:attr/textColorLink"
app:layout_constraintBottom_toTopOf="@+id/btn_sign_in"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/password_layout" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_sign_in"
style="@style/BriarButton"
android:layout_width="match_parent"
@@ -89,8 +88,9 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress_wheel"
style="@style/CircularProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"

4
briar-android/src/main/res/layout/fragment_progress.xml
View File

@@ -11,9 +11,9 @@
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_xlarge">
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
style="?android:attr/progressBarStyleLarge"
style="@style/CircularProgress.Large"
android:layout_width="@dimen/hero_square"
android:layout_height="@dimen/hero_square"
android:indeterminate="true"

4
briar-android/src/main/res/layout/fragment_reblog.xml
View File

@@ -22,9 +22,9 @@
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_small" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
style="@style/CircularProgress.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true" />

5
briar-android/src/main/res/layout/fragment_report_form.xml
View File

@@ -40,6 +40,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_large"
android:layout_marginLeft="@dimen/margin_large"
android:layout_marginTop="8dp"
android:layout_marginEnd="@dimen/margin_large"
android:layout_marginRight="@dimen/margin_large"
app:hintEnabled="false"
@@ -109,9 +110,9 @@
tools:listitem="@layout/list_item_crash"
tools:visibility="visible" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress_wheel"
style="?android:attr/progressBarStyleLarge"
style="@style/CircularProgress.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"

4
briar-android/src/main/res/layout/fragment_rss_feed_import.xml
View File

@@ -42,9 +42,9 @@
android:text="@string/blogs_rss_feeds_import_button"
tools:enabled="true" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="?android:attr/progressBarStyle"
style="@style/CircularProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

7
briar-android/src/main/res/layout/fragment_setup_author_name.xml
View File

@@ -68,15 +68,14 @@
</com.google.android.material.textfield.TextInputLayout>
<androidx.appcompat.widget.AppCompatButton
<Button
android:id="@+id/info_button"
style="@style/BriarButtonFlat.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_info_white"
android:drawablePadding="8dp"
android:text="@string/more_info"
app:drawableTint="@color/briar_button_text_positive"
app:icon="@drawable/ic_info_white"
app:iconPadding="8dp"
app:layout_constraintBottom_toTopOf="@+id/next"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/nickname_entry_wrapper" />

4
briar-android/src/main/res/layout/fragment_setup_doze.xml
View File

@@ -87,9 +87,9 @@
app:layout_constraintStart_toStartOf="parent"
tools:enabled="true" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
style="?android:attr/progressBarStyle"
style="@style/CircularProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"

11
briar-android/src/main/res/layout/fragment_setup_password.xml
View File

@@ -106,15 +106,14 @@
android:maxLines="1" />
</com.google.android.material.textfield.TextInputLayout>
<androidx.appcompat.widget.AppCompatButton
<Button
android:id="@+id/info_button"
style="@style/BriarButtonFlat.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_info_white"
android:drawablePadding="8dp"
android:text="@string/more_info"
app:drawableTint="@color/briar_button_text_positive"
app:icon="@drawable/ic_info_white"
app:iconPadding="8dp"
app:layout_constraintBottom_toTopOf="@+id/next"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/password_confirm_wrapper" />
@@ -131,9 +130,9 @@
app:layout_constraintRight_toRightOf="parent"
tools:enabled="true" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
style="?android:attr/progressBarStyle"
style="@style/CircularProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"

5
briar-android/src/main/res/layout/fragment_sign_out.xml
View File

@@ -20,11 +20,12 @@
app:tint="@color/briar_accent"
tools:ignore="ContentDescription" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
style="@style/CircularProgress.Large"
android:layout_width="0dp"
android:layout_height="0dp"
app:indicatorColor="@color/briar_accent"
app:layout_constraintBottom_toBottomOf="@+id/imageView"
app:layout_constraintEnd_toEndOf="@+id/imageView"
app:layout_constraintStart_toStartOf="@+id/imageView"

4
briar-android/src/main/res/layout/fragment_transfer_data_receive.xml
View File

@@ -30,15 +30,15 @@
app:srcCompat="@drawable/il_transfer_data_receive"
tools:ignore="ContentDescription" />
<ProgressBar
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/margin_xlarge"
android:layout_marginTop="@dimen/margin_xlarge"
android:indeterminate="true"
android:visibility="gone"
app:indicatorColor="@color/briar_accent"
app:layout_constraintBottom_toTopOf="@+id/introTextView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

5
briar-android/src/main/res/layout/fragment_transfer_data_send.xml
View File

@@ -30,18 +30,19 @@
app:srcCompat="@drawable/il_transfer_data_send"
tools:ignore="ContentDescription" />
<ProgressBar
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/margin_xlarge"
android:layout_marginTop="@dimen/margin_xlarge"
android:visibility="gone"
app:indicatorColor="@color/briar_accent"
app:layout_constraintBottom_toTopOf="@+id/introTextView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView"
tools:progress="50"
tools:visibility="visible" />
<TextView

6
briar-android/src/main/res/layout/image_preview.xml
View File

@@ -38,13 +38,15 @@
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
app:backgroundTint="@color/briar_accent"
android:contentDescription="@string/close"
app:backgroundTint="?colorSecondary"
app:fabCustomSize="26dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0"
app:maxImageSize="18dp"
app:srcCompat="@drawable/ic_close" />
app:srcCompat="@drawable/ic_close"
app:tint="?colorOnSecondary" />
</merge>

1
briar-android/src/main/res/layout/info_view.xml
View File

@@ -14,7 +14,6 @@
android:contentDescription="@string/info"
android:drawablePadding="@dimen/margin_medium"
android:gravity="center_vertical"
app:drawableLeftCompat="@drawable/ic_info_dark"
app:drawableStartCompat="@drawable/ic_info_dark"
app:drawableTint="?attr/colorControlNormal"
tools:text="Did you know that if you took all the veins out of your body and laid them out end to end, you would die?" />

4
briar-android/src/main/res/layout/introduction_message.xml
View File

@@ -86,9 +86,9 @@
app:barrierDirection="bottom"
app:constraint_referenced_ids="nameContact1,nameContact2" />
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
style="@style/CircularProgress.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_large"

4
briar-android/src/main/res/layout/list_item_image_preview.xml
View File

@@ -6,9 +6,9 @@
android:layout_height="match_parent"
tools:layout_height="200dp">
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
style="@style/CircularProgress.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"

4
briar-android/src/main/res/layout/list_item_image_preview_single.xml
View File

@@ -6,9 +6,9 @@
android:layout_height="match_parent"
tools:layout_height="200dp">
<ProgressBar
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
style="@style/CircularProgress.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"

2
briar-android/src/main/res/layout/list_item_transport_card.xml
View File

@@ -38,7 +38,7 @@
</LinearLayout>
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switchCompat"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
briar-android/src/main/res/layout/power_view.xml
View File

@@ -36,7 +36,7 @@
<Button
android:id="@+id/button"
style="@style/BriarButton"
style="@style/BriarButtonOutline"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_medium"
@@ -55,7 +55,7 @@
app:layout_constraintBottom_toBottomOf="@+id/button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/button"
app:srcCompat="@drawable/ic_help_outline_white"
app:srcCompat="@drawable/ic_info_white"
app:tint="@color/briar_button_text_positive" />
</merge>

1
briar-android/src/main/res/layout/preference_avatar.xml
View File

@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:background="?colorSecondary"
android:layout_height="wrap_content"
tools:layout_width="800dp"
tools:layout_height="75dp">

9
briar-android/src/main/res/layout/preference_switch.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.materialswitch.MaterialSwitch
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/switchWidget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:clickable="false"
android:background="@null" />

4
briar-android/src/main/res/layout/qr_code_view.xml
View File

@@ -4,8 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
tools:showIn="@layout/fragment_keyagreement_qr">
<ProgressBar
style="?android:attr/progressBarStyleLarge"
<com.google.android.material.progressindicator.CircularProgressIndicator
style="@style/CircularProgress.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />

5
briar-android/src/main/res/layout/text_input_view_large.xml
View File

@@ -33,10 +33,7 @@
<Button
android:id="@+id/compositeSendButton"
style="@style/BriarButton"
android:layout_marginStart="@dimen/margin_small"
android:layout_marginLeft="@dimen/margin_small"
android:layout_marginEnd="@dimen/margin_small"
android:layout_marginRight="@dimen/margin_small"
android:layout_margin="@dimen/margin_medium"
tools:text="@string/send" />
</merge>

6
briar-android/src/main/res/layout/toolbar.xml
View File

@@ -5,10 +5,12 @@
android:layout_height="wrap_content"
tools:context="org.briarproject.briar.android.navdrawer.NavDrawerActivity">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/BriarToolbar"
tools:subtitle="Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
tools:title="MaterialToolbar title" />
</com.google.android.material.appbar.AppBarLayout>

3
briar-android/src/main/res/layout/view_composite_send_button.xml
View File

@@ -35,7 +35,7 @@
android:padding="4dp"
android:scaleType="center"
app:srcCompat="@drawable/social_send_now_white"
app:tint="@color/briar_accent" />
app:tint="?colorPrimary" />
<ImageView
android:id="@+id/bombBadge"
@@ -51,6 +51,7 @@
<ProgressBar
android:id="@+id/progressBar"
style="@style/CircularProgress"
android:layout_width="@dimen/text_input_height"
android:layout_height="@dimen/text_input_height"
android:visibility="invisible" />

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

@@ -3,7 +3,6 @@
<color name="briar_primary">@color/briar_night_800</color>
<color name="briar_accent">@color/briar_lime_600</color>
<color name="preference_category">@color/briar_accent</color>
<color name="preference_category_background">@color/briar_night_950</color>
<color name="color_primary">@android:color/white</color>
@@ -18,7 +17,6 @@
<color name="card_background">@color/briar_night_800</color>
<color name="item_background_highlight">@color/briar_night_700</color>
<color name="briar_button_background_color">@color/briar_night_500</color>
<color name="briar_button_text_neutral">@color/briar_blue_400</color>
<color name="briar_button_text_disabled">#23cccccc</color>
@@ -32,4 +30,13 @@
<color name="il_lime">@color/briar_lime_400_new</color>
<color name="il_orange">@color/briar_orange_400</color>
<color name="il_red">@color/briar_red_500_new</color>
<color name="md_theme_tertiary">@color/briar_blue_400_new</color>
<color name="md_theme_onTertiary">@color/briar_blue_900</color>
<color name="md_theme_tertiaryContainer">@color/briar_blue_800_new</color>
<color name="md_theme_onTertiaryContainer">@color/briar_blue_300</color>
<color name="md_theme_onBackground">#E0E4D2</color>
<color name="md_theme_onSurface">#E0E4D2</color>
<color name="md_theme_surfaceDim">@color/briar_night_700_new</color>
<color name="md_theme_error">@color/briar_red_400</color>
</resources>

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

@@ -1,19 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="briar_lime_950">#283E0F</color>
<color name="briar_lime_600">#67a60f</color>
<color name="briar_lime_600_new">#65A30D</color>
<color name="briar_lime_500">#82C91E</color>
<color name="briar_lime_400">#82c91e</color>
<color name="briar_lime_400_new">#A3E635</color>
<color name="briar_blue_900">#184080</color>
<color name="briar_blue_800">#134a81</color>
<color name="briar_blue_800_new">#1649A0</color>
<color name="briar_blue_600">#1b69b6</color>
<color name="briar_blue_600_new">#196FDE</color>
<color name="briar_blue_400">#418cd8</color>
<color name="briar_blue_400_new">#52ADF9</color>
<color name="briar_blue_300">#8BCAFD</color>
<color name="briar_blue_100">#DDEDFE</color>
<color name="briar_orange_200">#fed69f</color>
<color name="briar_orange_400">#FBBF24</color>
<color name="briar_orange_500">#fc9403</color>
<color name="briar_orange_500_new">#F59E0B</color>
<color name="briar_red_400">#f87171</color>
<color name="briar_red_500">#db3b21</color>
<color name="briar_red_500_new">#EF4444</color>
<color name="briar_red_600">#DC2626</color>
@@ -21,14 +30,18 @@
<color name="briar_night_950">#0e171f</color>
<color name="briar_night_800">#212d3b</color>
<color name="briar_night_700">#2e3d4f</color>
<color name="briar_night_700_new">#334155</color>
<color name="briar_night_600">#475569</color>
<color name="briar_night_500">#435b77</color>
<color name="briar_night_100">#F1F5F9</color>
<color name="briar_night_50">#ebf3fa</color>
<color name="briar_gray_900">#2e2e2e</color>
<color name="briar_gray_700">#374151</color>
<color name="briar_gray_500">#a7a7a7</color>
<color name="briar_gray_300">#cccccc</color>
<color name="briar_gray_200">#dfdfdf</color>
<color name="briar_gray_200_new">#E5E7EB</color>
<color name="briar_gray_100">#f2f2f2</color>
<color name="briar_brand_blue">@color/briar_night_700</color>
@@ -73,19 +86,34 @@
<color name="briar_text_secondary_inverse">#b4ffffff</color>
<color name="briar_text_tertiary_inverse">#80ffffff</color>
<color name="preference_category">@color/briar_night_500</color>
<color name="preference_category_background">@color/window_background</color>
<color name="briar_button_background_color">@color/briar_accent</color>
<color name="briar_button_text_positive">@color/briar_blue_400</color>
<color name="briar_button_text_neutral">@color/briar_night_500</color>
<color name="briar_button_text_negative">@color/briar_red_500</color>
<color name="briar_button_text_disabled">#28000000</color>
<color name="briar_button_outline">@android:color/secondary_text_dark</color>
<color name="thread_indicator">@color/briar_gray_500</color>
<color name="thread_item_background">@color/window_background</color>
<color name="thread_item_highlight">@android:color/white</color>
<color name="divider">@color/briar_gray_200</color>
<color name="md_theme_primary">@color/briar_lime_500</color>
<color name="md_theme_onPrimary">@color/briar_lime_950</color>
<color name="md_theme_primaryContainer">@color/briar_night_700</color>
<color name="md_theme_onPrimaryContainer">@android:color/white</color>
<color name="md_theme_inversePrimary">#98DA27</color>
<color name="md_theme_secondary">@color/briar_night_700</color>
<color name="md_theme_onSecondary">@android:color/white</color>
<color name="md_theme_tertiaryContainer">@color/briar_blue_100</color>
<color name="md_theme_onTertiaryContainer">@color/briar_blue_600_new</color>
<color name="md_theme_tertiary">@color/briar_blue_600_new</color>
<color name="md_theme_onTertiary">@android:color/white</color>
<color name="md_theme_onBackground">#191D12</color>
<color name="md_theme_onSurface">#191D12</color>
<color name="md_theme_surfaceDim">@color/briar_gray_200_new</color>
<color name="md_theme_error">@color/briar_red_600</color>
</resources>

73
briar-android/src/main/res/values/styles.xml
View File

@@ -1,15 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<style name="BriarToolbar" parent="Widget.AppCompat.Toolbar">
<item name="android:background">?colorPrimary</item>
<item name="android:textColorPrimary">@color/briar_text_primary_inverse</item>
<item name="android:textSize">@dimen/text_size_medium</item>
<item name="colorPrimary">@color/briar_primary</item>
<item name="titleTextAppearance">@style/BriarToolbarTitleTextAppearance</item>
<item name="subtitleTextAppearance">@style/BriarToolbarSubTitleTextAppearance</item>
<style name="BriarToolbar" parent="Widget.Material3.Toolbar">
<item name="android:background">@color/briar_primary</item>
<item name="titleTextColor">@color/briar_text_primary_inverse</item>
<item name="subtitleTextColor">@color/briar_text_secondary_inverse</item>
<item name="android:theme">@style/BriarToolbarTheme</item>
<item name="popupTheme">@style/PopupMenu</item>
</style>
@@ -18,46 +13,36 @@
<item name="colorControlNormal">@color/briar_text_primary_inverse</item>
</style>
<style name="BriarToolbarTitleTextAppearance" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
<item name="android:textColor">@color/briar_text_primary_inverse</item>
</style>
<style name="BriarToolbarSubTitleTextAppearance" parent="TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
<item name="android:textColor">@color/briar_text_secondary_inverse</item>
</style>
<style name="PopupMenu" parent="Theme.AppCompat.DayNight.DarkActionBar">
<style name="PopupMenu" parent="Theme.Material3.DayNight">
<item name="android:colorBackground">@color/window_background</item>
</style>
<style name="ButtonTheme" parent="Theme.AppCompat.DayNight">
<!-- A strange hack needed only to override button color on all API levels -->
<item name="colorAccent">@color/briar_button_background_color</item>
</style>
<style name="BriarButton" parent="Widget.AppCompat.Button.Colored">
<item name="android:theme">@style/ButtonTheme</item>
<style name="BriarButton" parent="Widget.Material3.Button">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:padding">@dimen/margin_large</item>
<item name="android:textColor">@color/button_text</item>
<item name="android:minHeight">@dimen/button_size</item>
<item name="cornerRadius">6dp</item>
</style>
<style name="BriarButtonFlat" parent="Widget.AppCompat.Button.Borderless">
<style name="BriarButtonFlat" parent="Widget.Material3.Button.TextButton">
<item name="android:textSize">@dimen/text_size_medium</item>
</style>
<style name="BriarButtonFlat.Negative" parent="BriarButtonFlat">
<item name="android:textColor">@color/briar_button_text_negative</item>
<item name="iconTint">@color/briar_button_text_negative</item>
</style>
<style name="BriarButtonFlat.Positive" parent="BriarButtonFlat">
<item name="android:textColor">@color/briar_button_text_positive</item>
<item name="iconTint">@color/briar_button_text_positive</item>
</style>
<style name="BriarButtonFlat.Neutral" parent="BriarButtonFlat">
<item name="android:textColor">@color/briar_button_text_neutral</item>
<item name="iconTint">@color/briar_button_text_neutral</item>
</style>
<style name="BriarButtonFlat.Positive.Tiny" parent="BriarButtonFlat.Positive">
@@ -66,12 +51,13 @@
<item name="android:minWidth">@dimen/button_size</item>
</style>
<style name="BriarButtonOutline" parent="Widget.AppCompat.Button.Borderless">
<style name="BriarButtonOutline" parent="Widget.Material3.Button.OutlinedButton">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:background">@drawable/button_outline</item>
<item name="android:padding">@dimen/margin_large</item>
<item name="android:minHeight">@dimen/button_size</item>
<item name="cornerRadius">6dp</item>
</style>
<style name="BriarButtonOutline.Negative" parent="BriarButtonOutline">
@@ -106,6 +92,17 @@
<item name="android:background">@color/thread_indicator</item>
</style>
<style name="CircularProgress" parent="Widget.Material3.CircularProgressIndicator">
<item name="android:indeterminate">true</item>
<item name="indicatorColor">@color/briar_accent</item>
</style>
<style name="CircularProgress.Large" parent="Widget.Material3.CircularProgressIndicator">
<item name="android:indeterminate">true</item>
<item name="indicatorColor">@color/briar_accent</item>
<item name="indicatorSize">76dp</item>
</style>
<style name="BriarAvatar">
<item name="civ_border_width">@dimen/avatar_border_width</item>
<item name="civ_border_color">?android:attr/textColorSecondary</item>
@@ -135,7 +132,7 @@
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">@dimen/forum_nested_line_width</item>
<item name="android:layout_marginLeft">5dp</item>
<item name="android:layout_marginStart" tools:targetApi="jelly_bean_mr1">5dp</item>
<item name="android:layout_marginStart">5dp</item>
<item name="android:background">@color/thread_indicator</item>
<item name="android:visibility">gone</item>
</style>
@@ -149,20 +146,28 @@
<style name="StepBubble">
<item name="android:layout_width">28dp</item>
<item name="android:layout_height">28dp</item>
<item name="android:background">@drawable/bubble_accent</item>
<item name="android:background">@drawable/bubble_current</item>
<item name="android:gravity">center</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textColor">?colorOnTertiary</item>
<item name="android:textSize">18sp</item>
</style>
<style name="StepBubble.Upcoming">
<item name="android:alpha">0.5</item>
<item name="android:background">@drawable/bubble_future</item>
<item name="android:textColor">?colorOnSurface</item>
</style>
<style name="StepBubble.Completed">
<item name="android:background">@drawable/bubble_completed</item>
<item name="android:scaleType">center</item>
<item name="tint">?colorOnTertiaryContainer</item>
<item name="srcCompat">@drawable/ic_check_white</item>
</style>
<style name="Preference.SwitchPreferenceCompat"
parent="@style/Preference.SwitchPreferenceCompat.Material"
tools:ignore="ResourceCycle">
<item name="widgetLayout">@layout/preference_switch</item>
</style>
</resources>

44
briar-android/src/main/res/values/themes.xml
View File

@@ -1,16 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="BriarTheme" parent="Theme.Material3.DayNight">
<item name="colorPrimary">@color/md_theme_primary</item>
<item name="colorOnPrimary">@color/md_theme_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_primary</item>
<item name="colorOnPrimaryContainer">@color/md_theme_onPrimary</item>
<item name="colorSecondary">@color/md_theme_secondary</item>
<item name="colorOnSecondary">@color/md_theme_onSecondary</item>
<item name="colorTertiary">@color/md_theme_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
<item name="android:colorBackground">@color/window_background</item>
<item name="colorOnBackground">@color/md_theme_onBackground</item>
<item name="colorSurface">@color/card_background</item>
<item name="colorOnSurface">@color/md_theme_onSurface</item>
<item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
<item name="colorError">@color/md_theme_error</item>
<item name="android:statusBarColor">#000000</item>
<style name="BriarTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
<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:textColorLink">@color/briar_text_link</item>
<item name="android:windowBackground">@color/window_background</item>
<item name="android:textColorLink">@color/briar_text_link</item>
<item name="android:windowAnimationStyle">@style/ActivityAnimation</item>
<item name="windowActionModeOverlay">true</item>
<item name="toolbarStyle">@style/BriarToolbar</item>
<item name="alertDialogTheme">@style/BriarDialogTheme.Neutral</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14</item>
<item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
</style>
<style name="BriarTheme.NoActionBar" parent="BriarTheme">
@@ -30,10 +48,8 @@
<item name="android:activityCloseExitAnimation">@anim/screen_new_out</item>
</style>
<style name="BriarDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.MinWidth">
<style name="BriarDialogTheme" parent="Theme.Material3.DayNight.Dialog">
<item name="colorPrimary">@color/briar_primary</item>
<item name="colorPrimaryDark">@color/briar_primary_dark</item>
<item name="colorAccent">@color/briar_accent</item>
<item name="buttonBarPositiveButtonStyle">@style/BriarButtonFlat.Positive</item>
<item name="buttonBarNeutralButtonStyle">@style/BriarButtonFlat.Neutral</item>
<item name="buttonBarNegativeButtonStyle">@style/BriarButtonFlat.Negative</item>
@@ -71,13 +87,11 @@
</style>
<style name="OnboardingDialogTheme" parent="BriarDialogTheme">
<item name="android:background">@color/briar_primary</item>
<item name="android:textColorPrimary">@color/briar_text_primary_inverse</item>
<item name="android:textColorSecondary">@color/briar_text_secondary_inverse</item>
<item name="buttonBarNeutralButtonStyle">@style/Widget.AppCompat.Button.Borderless</item>
<item name="android:background">@color/md_theme_primaryContainer</item>
<item name="android:textColorPrimary">@color/md_theme_onPrimaryContainer</item>
</style>
<style name="TranslucentTheme" parent="Theme.AppCompat.NoActionBar">
<style name="TranslucentTheme" parent="Theme.Material3.DayNight.NoActionBar">
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowAnimationStyle">@android:style/Animation</item>
<item name="android:windowBackground">@android:color/transparent</item>