Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 22:59:54 +01:00
Code Issues Projects Releases Wiki Activity

About menu: Added tor version and small wording fixes

Browse Source
This commit is contained in:
FlyingP1g FlyingP1g
2022-07-12 22:26:58 +03:00
parent 8ea7204cf6
commit c13c2d62f5
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/build.gradle
View File

@@ -29,6 +29,7 @@ android {
versionCode 10410 versionCode 10410
versionName "1.4.10" versionName "1.4.10"
applicationId "org.briarproject.briar.android" applicationId "org.briarproject.briar.android"
buildConfigField "String", "TorVersion", "\"$tor_version\""
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
buildConfigField "String", "GitHash", buildConfigField "String", "GitHash",

4
briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java
View File

@@ -34,6 +34,7 @@ public class AboutFragment extends Fragment {
private static final Logger LOG = getLogger(TAG); private static final Logger LOG = getLogger(TAG);
private TextView briarVersion; private TextView briarVersion;
private TextView torVersion;
private TextView briarWebsite; private TextView briarWebsite;
private TextView briarSourceCode; private TextView briarSourceCode;
private TextView briarChangelog; private TextView briarChangelog;
@@ -54,6 +55,9 @@ public class AboutFragment extends Fragment {
briarVersion = requireActivity().findViewById(R.id.BriarVersion); briarVersion = requireActivity().findViewById(R.id.BriarVersion);
briarVersion.setText( briarVersion.setText(
getString(R.string.briar_version, BuildConfig.VERSION_NAME)); getString(R.string.briar_version, BuildConfig.VERSION_NAME));
torVersion = requireActivity().findViewById(R.id.TorVersion);
torVersion.setText(
getString(R.string.tor_version, BuildConfig.TorVersion));
briarWebsite = requireActivity().findViewById(R.id.BriarWebsite); briarWebsite = requireActivity().findViewById(R.id.BriarWebsite);
briarSourceCode = requireActivity().findViewById(R.id.BriarSourceCode); briarSourceCode = requireActivity().findViewById(R.id.BriarSourceCode);
briarChangelog = requireActivity().findViewById(R.id.BriarChangelog); briarChangelog = requireActivity().findViewById(R.id.BriarChangelog);

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

@@ -14,6 +14,15 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/TorVersion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/tor_version"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/BriarVersion" />
<TextView <TextView
android:id="@+id/LinksTitle" android:id="@+id/LinksTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -22,7 +31,7 @@
android:text="@string/links" android:text="@string/links"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/BriarVersion" /> app:layout_constraintTop_toBottomOf="@+id/TorVersion" />
<TextView <TextView
android:id="@+id/BriarWebsite" android:id="@+id/BriarWebsite"

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

@@ -314,7 +314,7 @@
<string name="different_person_button">Different Person</string> <string name="different_person_button">Different Person</string>
<string name="duplicate_link_dialog_text_3">%1$s and %2$s sent you the same link.\n\nOne of them may be trying to discover who your contacts are.\n\nDon\'t tell them you received the same link from someone else.</string> <string name="duplicate_link_dialog_text_3">%1$s and %2$s sent you the same link.\n\nOne of them may be trying to discover who your contacts are.\n\nDon\'t tell them you received the same link from someone else.</string>
<string name="pending_contact_updated_toast">Pending contact updated</string> <string name="pending_contact_updated_toast">Pending contact updated</string>
<!-- Peer trust levels --> <!-- Peer trust levels -->
<string name="peer_trust_level_unverified">Unverified contact</string> <string name="peer_trust_level_unverified">Unverified contact</string>
@@ -693,7 +693,8 @@
<!-- About --> <!-- About -->
<string name="about_title">About</string> <string name="about_title">About</string>
<string name="briar_version">Briar Version: %s</string> <string name="briar_version">Briar version: %s</string>
<string name="tor_version">Tor version: %s</string>
<string name="links">Links</string> <string name="links">Links</string>
<string name="briar_website">\u2022 <a href="">Website</a></string> <string name="briar_website">\u2022 <a href="">Website</a></string>
<string name="briar_source_code">\u2022 <a href="">Source code</a></string> <string name="briar_source_code">\u2022 <a href="">Source code</a></string>