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

Merge branch 'master' of https://code.briarproject.org/johndoe4221/briar into 2329-translations-for-trust-indicator-view-trust-levels

Browse Source
This commit is contained in:
johndoe4221
2022-07-11 14:28:28 +02:00
parent 543b1178a1 87ee8cd653
commit 380921ce25
9 changed files with 173 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
briar-android/src/main/res/drawable/ic_info_dark.xml Normal file
View File

@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:width="24dp"
android:height="24dp"
android:tint="?android:attr/textColorPrimary"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
tools:ignore="NewApi">
<path
android:fillColor="#FF000000"
android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
</vector>

45
briar-android/src/main/res/layout/fragment_about.xml Normal file
View File

@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<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="match_parent"
android:padding="16dp">
<TextView
android:id="@+id/BriarVersion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/briar_version"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/LinksTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/links"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:layout_marginTop="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/BriarVersion" />
<TextView
android:id="@+id/BriarWebsite"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/briar_website"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/LinksTitle" />
<TextView
android:id="@+id/BriarSourceCode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/briar_source_code"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/BriarWebsite" />
</androidx.constraintlayout.widget.ConstraintLayout>

7
briar-android/src/main/res/values/strings.xml
View File

@@ -691,6 +691,13 @@
<string name="mailbox_error_wizard_info2">Please come back to this screen when you have access to the device.</string>
<string name="mailbox_error_wizard_info3">Please unlink your mailbox using the button below.\n\nAfter unlinking your old Mailbox, you can set up a new Mailbox at any time.</string>
<!-- About -->
<string name="about_title">About</string>
<string name="briar_version">Briar Version: %s</string>
<string name="links">Links</string>
<string name="briar_website">\u2022 <a href="">Briar website</a></string>
<string name="briar_source_code">\u2022 <a href="">Briar source code</a></string>
<!-- Conversation Settings -->
<string name="disappearing_messages_title">Disappearing messages</string>
<string name="disappearing_messages_explanation_long">Turning on this setting will make new

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

@@ -29,6 +29,11 @@
android:title="@string/mailbox_settings_title"
app:icon="@drawable/ic_mailbox" />
<Preference
android:title="@string/about_title"
app:fragment="org.briarproject.briar.android.settings.AboutFragment"
app:icon="@drawable/ic_info_dark" />
<PreferenceCategory
android:key="pref_key_actions"
android:layout="@layout/preferences_category"