TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-11-09 15:29:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/loki-project/session-android into backup-restore

Browse Source
This commit is contained in:
Anton Chekulaev
2020-11-05 11:28:22 +11:00
parent 68dbd91152 2c68cbeaf7
commit 3311cd0958
7 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout-sw400dp/fragment_enter_public_key.xml
View File

@@ -14,7 +14,7 @@
android:background="?android:dividerHorizontal"
android:elevation="1dp" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofEditText
<EditText
style="@style/SessionEditText"
android:id="@+id/publicKeyEditText"
android:layout_width="match_parent"

16
res/layout/activity_settings.xml
View File

@@ -176,6 +176,22 @@
android:gravity="center"
android:text="@string/activity_settings_devices_button_title" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:dividerHorizontal" />
<TextView
android:id="@+id/sendInvitationButton"
android:layout_width="match_parent"
android:layout_height="@dimen/setting_button_height"
android:background="@drawable/setting_button_background"
android:textColor="@color/text"
android:textSize="@dimen/medium_font_size"
android:textStyle="bold"
android:gravity="center"
android:text="Invite" />
<View
android:id="@+id/seedButtonTopSeparator"
android:layout_width="match_parent"

2
res/layout/fragment_enter_public_key.xml
View File

@@ -13,7 +13,7 @@
android:background="?android:dividerHorizontal"
android:elevation="1dp" />
<org.thoughtcrime.securesms.loki.views.TapJackingProofEditText
<EditText
style="@style/SmallSessionEditText"
android:id="@+id/publicKeyEditText"
android:layout_width="match_parent"