TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 07:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add show QR code button to settings

Browse Source
This commit is contained in:
Niels Andriesse
2019-08-23 11:00:07 +10:00
parent 67b7a1d8c2
commit f3377fe384
8 changed files with 99 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/drawable/icon_qr_code.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector android:height="24dp" android:viewportHeight="512"
android:viewportWidth="448" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<group
android:scaleX="0.88"
android:scaleY="0.88"
android:translateX="64">
<path android:fillColor="?attr/pref_icon_tint" android:pathData="M0,224h192L192,32L0,32v192zM64,96h64v64L64,160L64,96zM256,32v192h192L448,32L256,32zM384,160h-64L320,96h64v64zM0,480h192L192,288L0,288v192zM64,352h64v64L64,416v-64zM416,288h32v128h-96v-32h-32v96h-64L256,288h96v32h64v-32zM416,448h32v32h-32v-32zM352,448h32v32h-32v-32z"/>
</group>
</vector>

33
res/layout/fragment_qr_code.xml Normal file
View File

@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
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">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginEnd="32dp"
android:orientation="vertical"
android:gravity="center_horizontal">
<TextView
android:id="@+id/explanationTextView"
style="@style/Signal.Text.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/fragment_qr_code_explanation" />
<ImageView
android:id="@+id/qrCodeImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:background="@color/white" />
</LinearLayout>
</ScrollView>

4
res/values/strings.xml
View File

@@ -1569,6 +1569,7 @@
<!-- Settings activity -->
<string name="activity_settings_public_key_copied_message">Copied to Clipboard</string>
<string name="activity_settings_share_public_key_button_title">Share Public Key</string>
<string name="activity_settings_show_qr_code_button_title">Show QR Code</string>
<string name="activity_settings_show_seed_button_title">Show Seed</string>
<string name="activity_settings_seed_dialog_title">Your Seed</string>
<string name="activity_settings_seed_dialog_copy_button_title">Copy</string>
@@ -1602,5 +1603,8 @@
<!-- Conversation activity -->
<string name="activity_conversation_pending_friend_request_hint">Pending Friend Request…</string>
<string name="activity_conversation_default_hint">New Message</string>
<!-- QR code fragment -->
<string name="fragment_qr_code_title">Your QR Code</string>
<string name="fragment_qr_code_explanation">This is your personal QR code. Other people can scan it to start a secure conversation with you.</string>
</resources>

4
res/xml/preferences.xml
View File

@@ -37,6 +37,10 @@
android:title="@string/activity_settings_share_public_key_button_title"
android:icon="@drawable/icon_share"/>
<Preference android:key="preference_category_qr_code"
android:title="@string/activity_settings_show_qr_code_button_title"
android:icon="@drawable/icon_qr_code"/>
<Preference android:key="preference_category_seed"
android:title="@string/activity_settings_show_seed_button_title"
android:icon="@drawable/icon_seedling"/>