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

Merge remote-tracking branch 'loki/dev' into action-bar-back-buttons

Browse Source
This commit is contained in:
Anton Chekulaev
2020-09-18 12:52:48 +10:00
parent 6d1d1b527e 5fa7873f78
commit c2299beaf6
38 changed files with 833 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/activity_register.xml
View File

@@ -30,7 +30,7 @@
android:textColor="@color/text"
android:text="@string/activity_register_explanation" />
<TextView
<org.thoughtcrime.securesms.loki.views.TapJackingProofTextView
style="@style/SessionIDTextView"
android:id="@+id/publicKeyTextView"
android:layout_width="match_parent"
@@ -55,7 +55,7 @@
android:layout_marginRight="@dimen/massive_spacing"
android:text="@string/continue_2" />
<Button
<org.thoughtcrime.securesms.loki.views.TapJackingProofButton
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/copyButton"
android:layout_width="match_parent"

6
res/layout/activity_seed.xml
View File

@@ -36,7 +36,7 @@
android:textColor="@color/text"
android:text="@string/activity_seed_explanation" />
<TextView
<org.thoughtcrime.securesms.loki.views.TapJackingProofTextView
style="@style/SessionIDTextView"
android:id="@+id/seedTextView"
android:layout_width="match_parent"
@@ -49,7 +49,7 @@
android:textAlignment="center"
android:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
<TextView
<org.thoughtcrime.securesms.loki.views.TapJackingProofTextView
android:id="@+id/revealButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -66,7 +66,7 @@
android:layout_height="0dp"
android:layout_weight="1"/>
<Button
<org.thoughtcrime.securesms.loki.views.TapJackingProofButton
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/copyButton"
android:layout_width="196dp"

4
res/layout/dialog_seed.xml
View File

@@ -20,7 +20,7 @@
android:textAlignment="center"
android:textSize="@dimen/medium_font_size" />
<TextView
<org.thoughtcrime.securesms.loki.views.TapJackingProofTextView
style="@style/SessionIDTextView"
android:id="@+id/seedTextView"
android:layout_width="wrap_content"
@@ -56,7 +56,7 @@
android:layout_weight="1"
android:text="@string/cancel" />
<Button
<org.thoughtcrime.securesms.loki.views.TapJackingProofButton
style="@style/Widget.Session.Button.Dialog.Unimportant"
android:id="@+id/copyButton"
android:layout_width="0dp"

8
res/layout/fragment_enter_public_key.xml
View File

@@ -13,7 +13,7 @@
android:background="?android:dividerHorizontal"
android:elevation="1dp" />
<EditText
<org.thoughtcrime.securesms.loki.views.TapJackingProofEditText
style="@style/SmallSessionEditText"
android:id="@+id/publicKeyEditText"
android:layout_width="match_parent"
@@ -49,7 +49,7 @@
android:layout_marginTop="@dimen/large_spacing"
android:layout_marginRight="@dimen/large_spacing" />
<TextView
<org.thoughtcrime.securesms.loki.views.TapJackingProofTextView
android:id="@+id/publicKeyTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
android:layout_marginRight="@dimen/large_spacing"
android:orientation="horizontal">
<Button
<org.thoughtcrime.securesms.loki.views.TapJackingProofButton
style="@style/Widget.Session.Button.Common.UnimportantFilled"
android:id="@+id/copyButton"
android:layout_width="0dp"
@@ -78,7 +78,7 @@
android:layout_weight="1"
android:text="@string/copy" />
<Button
<org.thoughtcrime.securesms.loki.views.TapJackingProofButton
style="@style/Widget.Session.Button.Common.UnimportantFilled"
android:id="@+id/shareButton"
android:layout_width="0dp"