TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-02 07:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean

Browse Source
This commit is contained in:
Niels Andriesse
2019-08-23 13:22:52 +10:00
parent 5d34314a00
commit d831274920
9 changed files with 47 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/layout/activity_new_conversation.xml → res/layout/fragment_new_conversation.xml
View File

@@ -18,7 +18,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
app:labeledEditText_background="@color/loki_darkest_gray"
app:labeledEditText_label="@string/activity_new_conversation_public_key_edit_text_label"/>
app:labeledEditText_label="@string/fragment_new_conversation_public_key_edit_text_label"/>
<TextView
android:id="@+id/explanationTextView"
@@ -26,7 +26,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="@string/activity_new_conversation_public_key_explanation" />
android:text="@string/fragment_new_conversation_public_key_explanation" />
<Button
android:id="@+id/qrCodeButton"
@@ -35,7 +35,7 @@
android:layout_marginTop="20dp"
android:background="@color/transparent"
android:textColor="@color/signal_primary"
android:text="@string/activity_new_conversation_qr_code_button_title"
android:text="@string/fragment_new_conversation_qr_code_button_title"
android:elevation="0dp"
android:stateListAnimator="@null" />
@@ -52,7 +52,7 @@
app:cpb_colorProgress="@color/textsecure_primary"
app:cpb_cornerRadius="4dp"
app:cpb_selectorIdle="@drawable/progress_button_state"
app:cpb_textIdle="@string/activity_new_conversation_next_button_title" />
app:cpb_textIdle="@string/fragment_new_conversation_next_button_title" />
</LinearLayout>

1
res/layout/fragment_qr_code.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">

2
res/layout/fragment_scan_qr_code.xml
View File

@@ -12,7 +12,7 @@
app:camera="0" />
<LinearLayout
android:id="@+id/overlay"
android:id="@+id/overlayView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"