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

Partially implement device linking redesign & fix copy

Browse Source
This commit is contained in:
Niels Andriesse
2020-01-08 15:16:34 +11:00
parent 7da4f1f6ae
commit df61cbb30d
23 changed files with 487 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/anim/slide_from_bottom.xml
View File

@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android" >
<set
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator">
<translate
android:duration="350"
android:fromYDelta="100%"
android:toYDelta="0%" />
android:duration="250"
android:fromYDelta="100%"
android:toYDelta="0%" />
</set>

1
res/anim/slide_from_right.xml
View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<set
xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator">

14
res/layout/activity_link_device.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.view.ViewPager
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<android.support.design.widget.TabLayout
style="@style/Session.DarkTabLayout"
android:id="@+id/tabLayout"
android:layout_width="match_parent"
android:layout_height="@dimen/tab_bar_height" />
</android.support.v4.view.ViewPager>

4
res/layout/activity_restore.xml
View File

@@ -30,7 +30,7 @@
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text"
android:text="Enter the seed that was given to you when you signed up to restore your account." />
android:text="Enter the recovery phrase that was given to you when you signed up to restore your account." />
<EditText
style="@style/SessionEditText"
@@ -40,7 +40,7 @@
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="20dp"
android:layout_marginRight="@dimen/very_large_spacing"
android:hint="Enter your seed" />
android:hint="Enter your recovery phrase" />
<View
android:layout_width="match_parent"

4
res/layout/activity_settings.xml
View File

@@ -205,6 +205,7 @@
android:text="Chats" />
<View
android:id="@+id/linkedDevicesButtonTopSeparator"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/separator" />
@@ -221,6 +222,7 @@
android:text="Linked Devices" />
<View
android:id="@+id/seedButtonTopSeparator"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/separator" />
@@ -234,7 +236,7 @@
android:textSize="@dimen/medium_font_size"
android:textStyle="bold"
android:gravity="center"
android:text="Show Seed" />
android:text="Show Recovery Phrase" />
<View
android:layout_width="match_parent"

63
res/layout/dialog_link_device_slave_mode.xml Normal file
View File

@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/default_dialog_background_inset"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingLeft="32dp"
android:paddingTop="@dimen/medium_spacing"
android:paddingRight="32dp"
android:paddingBottom="@dimen/medium_spacing">
<com.github.ybq.android.spinkit.SpinKitView
style="@style/SpinKitView.DoubleBounce"
android:id="@+id/spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_centerInParent="true"
app:SpinKit_Color="@color/text" />
<TextView
android:id="@+id/titleTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/large_spacing"
android:text="Waiting for Authorization"
android:textColor="@color/text"
android:textStyle="bold"
android:textSize="@dimen/medium_font_size" />
<TextView
android:id="@+id/explanationTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/large_spacing"
android:text="Please check that the words below match those shown on your other device."
android:textColor="@color/text"
android:alpha="0.6"
android:textSize="@dimen/small_font_size"
android:textAlignment="center" />
<TextView
android:id="@+id/mnemonicTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/large_spacing"
android:text="puffin circle idled"
android:textColor="@color/text"
android:textSize="@dimen/small_font_size"
android:textAlignment="center" />
<Button
style="@style/UnimportantDialogButton"
android:id="@+id/cancelButton"
android:layout_width="match_parent"
android:layout_height="@dimen/small_button_height"
android:layout_marginTop="@dimen/large_spacing"
android:text="Cancel" />
</LinearLayout>

4
res/layout/dialog_seed.xml
View File

@@ -14,7 +14,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Your Seed"
android:text="Your Recovery Phrase"
android:textColor="@color/text"
android:textStyle="bold"
android:textSize="@dimen/medium_font_size" />
@@ -33,7 +33,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/large_spacing"
android:text="This is your personal password. It can be used to restore your account or migrate your account to a new device."
android:text="This is your personal recovery phrase. It can be used to restore your account or migrate your account to a new device."
android:textColor="@color/text"
android:textSize="@dimen/small_font_size"
android:textAlignment="center"

2
res/layout/fragment_enter_chat_url.xml
View File

@@ -27,7 +27,7 @@
android:textColor="@color/text"
android:alpha="0.6"
android:textAlignment="center"
android:text="Enter the URL of the public chat you'd like to join" />
android:text="Enter the URL of the channel you'd like to join" />
<View
android:layout_width="0dp"

59
res/layout/fragment_enter_session_id.xml Normal file
View File

@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/default_session_background"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/large_spacing"
android:layout_marginRight="@dimen/large_spacing"
android:textSize="@dimen/very_large_font_size"
android:textStyle="bold"
android:textColor="@color/text"
android:text="Link your device" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/large_spacing"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginRight="@dimen/large_spacing"
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text"
android:text="Enter your Session ID to start the linking process." />
<EditText
style="@style/SessionEditText"
android:id="@+id/sessionIDEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/large_spacing"
android:layout_marginTop="20dp"
android:layout_marginRight="@dimen/large_spacing"
android:hint="Enter your session ID" />
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
<Button
style="@style/MediumProminentOutlineButton"
android:id="@+id/requestDeviceLinkButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"
android:layout_marginLeft="90dp"
android:layout_marginRight="90dp"
android:layout_marginBottom="@dimen/medium_spacing"
android:text="Next" />
</LinearLayout>

2
res/layout/fragment_view_my_qr_code.xml
View File

@@ -53,7 +53,7 @@
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text"
android:textAlignment="center"
android:text="This is your unique public QR code. Other users may scan this in order to begin a conversation with you." />
android:text="This is your unique public QR code. Other users can scan this to start a conversation with you." />
<Button
style="@style/MediumUnimportantOutlineButton"

4
res/layout/view_fake_chat.xml
View File

@@ -22,7 +22,7 @@
android:layout_width="@dimen/fake_chat_view_bubble_width"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_spacing"
android:text="It's a secure, decentralized cross-platform private messaging app"
android:text="It's a secure, decentralized private messaging app"
android:layout_gravity="left" />
<TextView
@@ -31,7 +31,7 @@
android:layout_width="@dimen/fake_chat_view_bubble_width"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_spacing"
android:text="So it doesn't collect my personal information or my conversation metadata? How's it work?"
android:text="So it doesn't collect my personal information or my conversation metadata? How does it work?"
android:layout_gravity="right" />
<TextView

2
res/layout/view_separator.xml
View File

@@ -13,6 +13,6 @@
android:textColor="@color/text"
android:alpha="0.6"
android:textSize="@dimen/small_font_size"
android:text="Your Public Key" />
android:text="Your Session ID" />
</RelativeLayout>