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

Implement join public chat screen redesign

Browse Source
This commit is contained in:
Niels Andriesse
2019-12-18 15:25:23 +01:00
parent 6dbe9b0ca9
commit 95dc4e6590
12 changed files with 281 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
res/layout/activity_new_private_chat.xml → res/layout/activity_create_private_chat.xml
View File

14
res/layout/activity_join_public_chat.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>

47
res/layout/fragment_enter_chat_url.xml Normal file
View File

@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/contentView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/default_session_background"
android:orientation="vertical">
<EditText
style="@style/SessionEditText"
android:id="@+id/chatURLEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:hint="https://chat.lokinet.org" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/small_font_size"
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" />
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<Button
style="@style/MediumProminentOutlineButton"
android:id="@+id/joinPublicChatButton"
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_scan_qr_code_v2.xml
View File

@@ -24,7 +24,7 @@
android:layout_height="0dp"/>
<TextView
android:id="@+id/descriptionTextView"
android:id="@+id/messageTextView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"