6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Join room from room preview

Browse Source
This commit is contained in:
Benoit Marty
2019-05-28 17:03:27 +02:00
parent 33fbcc8ba3
commit 6244913ab9
14 changed files with 277 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
vector/src/main/res/layout/fragment_room_preview_no_preview.xml
View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/roomPreviewNoPreviewRoot"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -64,15 +66,31 @@
android:textAppearance="@style/TextAppearance.Vector.Subtitle2"
android:textSize="14sp" />
<Button
android:id="@+id/roomPreviewNoPreviewJoin"
style="@style/VectorButtonStyle"
<TextView
android:id="@+id/roomPreviewNoPreviewError"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="center"
android:textColor="@color/vector_error_color"
android:textSize="15sp"
android:visibility="gone"
tools:text="Error"
tools:visibility="visible" />
<im.vector.riotredesign.core.platform.ButtonStateView
android:id="@+id/roomPreviewNoPreviewJoin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="@dimen/layout_vertical_margin"
android:minWidth="120dp"
android:text="@string/join" />
app:bsv_button_text="@string/join"
app:bsv_loaded_image_src="@drawable/ic_tick"
app:bsv_use_flat_button="false"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator" />
</LinearLayout>

1
vector/src/main/res/layout/item_public_room.xml
View File

@ -65,6 +65,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
app:bsv_use_flat_button="true"
app:bsv_button_text="@string/join"
app:bsv_loaded_image_src="@drawable/ic_tick"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"

14
vector/src/main/res/layout/view_button_state.xml
View File

@ -7,7 +7,7 @@
tools:parentTag="android.widget.FrameLayout">
<Button
android:id="@+id/buttonStateButton"
android:id="@+id/buttonStateButtonFlat"
style="@style/VectorButtonStyleFlat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -17,6 +17,18 @@
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/join" />
<Button
android:id="@+id/buttonStateButtonBig"
style="@style/VectorButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:minWidth="120dp"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/join" />
<ProgressBar
android:id="@+id/buttonStateLoading"
android:layout_width="32dp"

1
vector/src/main/res/values/attrs_state_button.xml
View File

@ -3,6 +3,7 @@
<declare-styleable name="ButtonStateView">
<attr name="bsv_use_flat_button" format="boolean" />
<attr name="bsv_loaded_image_src" format="reference" />
<attr name="bsv_button_text" format="reference|string" />