TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-27 08:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hook up signal device linking view.

Browse Source
This commit is contained in:
Mikunj
2019-11-20 09:50:40 +11:00
parent 549631848d
commit 0f5db5aa33
13 changed files with 919 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/device_list_item_view.xml
View File

@@ -12,9 +12,11 @@
android:singleLine="true"
android:ellipsize="marquee"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<!--
<TextView android:id="@+id/created"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -29,5 +31,5 @@
android:textColor="?attr/conversation_list_item_subject_color"
android:fontFamily="sans-serif-light"
android:layout_marginBottom="8dp" />
-->
</org.thoughtcrime.securesms.DeviceListItem>

3
res/values/strings.xml
View File

@@ -299,6 +299,7 @@
<string name="DeviceListActivity_unlinking_device">Unlinking device...</string>
<string name="DeviceListActivity_unlinking_device_no_ellipsis">Unlinking device</string>
<string name="DeviceListActivity_network_failed">Network failed!</string>
<string name="DeviceListActivity_unlinked_device">Successfully unlinked device</string>
<!-- DeviceListItem -->
<string name="DeviceListItem_unnamed_device">Unnamed device</string>
@@ -1576,7 +1577,7 @@
<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_link_device_button_title">Link Device</string>
<string name="activity_settings_linked_devices_button_title">Linked Device</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>

4
res/xml/preferences.xml
View File

@@ -41,8 +41,8 @@
android:title="@string/activity_settings_show_qr_code_button_title"
android:icon="@drawable/icon_qr_code"/>
<Preference android:key="preference_category_link_device"
android:title="Link Device"
<Preference android:key="preference_category_linked_devices"
android:title="@string/activity_settings_linked_devices_button_title"
android:icon="@drawable/icon_link"/>
<Preference android:key="preference_category_seed"