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 onboarding logic

Browse Source
This commit is contained in:
Niels Andriesse
2019-12-17 10:04:08 +01:00
parent f42e69388e
commit d4db46aeca
9 changed files with 233 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/activity_display_name_v2.xml
View File

@@ -48,6 +48,7 @@
<Button
style="@style/MediumProminentFilledButton"
android:id="@+id/registerButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"
android:layout_marginLeft="@dimen/massive_spacing"

6
res/layout/activity_register.xml
View File

@@ -33,6 +33,7 @@
<TextView
style="@style/SessionIDTextView"
android:id="@+id/publicKeyTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
@@ -46,8 +47,8 @@
android:layout_weight="1"/>
<Button
android:id="@+id/registerButton"
style="@style/MediumProminentFilledButton"
android:id="@+id/registerButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"
android:layout_marginLeft="@dimen/massive_spacing"
@@ -56,6 +57,7 @@
<Button
style="@style/MediumProminentOutlineButton"
android:id="@+id/copyButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"
android:layout_marginLeft="@dimen/massive_spacing"
@@ -64,7 +66,7 @@
android:text="Copy" />
<Button
android:id="@+id/legalButton"
android:id="@+id/termsButton"
android:layout_width="match_parent"
android:layout_height="@dimen/onboarding_button_bottom_offset"
android:layout_marginLeft="@dimen/massive_spacing"

3
res/layout/activity_restore.xml
View File

@@ -49,6 +49,7 @@
<Button
style="@style/MediumProminentFilledButton"
android:id="@+id/restoreButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"
android:layout_marginLeft="@dimen/massive_spacing"
@@ -57,7 +58,7 @@
android:text="Continue" />
<Button
android:id="@+id/legalButton"
android:id="@+id/termsButton"
android:layout_width="match_parent"
android:layout_height="@dimen/onboarding_button_bottom_offset"
android:layout_marginLeft="@dimen/massive_spacing"

6
res/values/strings.xml
View File

@@ -1652,4 +1652,10 @@
<string name="dialog_device_unlink_title">Device unlinked</string>
<string name="dialog_device_unlink_message">This device has been successfully unlinked</string>
<!-- Loki -->
<!-- Session -->
<string name="activity_register_public_key_copied_message">Copied to clipboard</string>
<!-- Session -->
</resources>