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

Plug screens together

Browse Source
This commit is contained in:
Benoit Marty
2019-05-27 17:28:18 +02:00
parent 02a81dd9e1
commit dde94c0d0f
12 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/res/layout/fragment_home_detail.xml
View File

@ -57,9 +57,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:labelVisibilityMode="unlabeled"
app:itemIconTint="@android:color/white"
app:itemTextColor="@color/home_bottom_nav_view_tint"
app:labelVisibilityMode="unlabeled"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

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

@ -149,7 +149,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/roomToolbar"
app:layout_constraintVertical_bias="1.0"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

6
vector/src/main/res/layout/vector_invite_view.xml
View File

@ -40,7 +40,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inviteNameView"
tools:text="\@matthew:matrix.org" />
tools:text=" @matthew:matrix.org" />
<TextView
android:id="@+id/inviteLabelView"
@ -55,11 +55,13 @@
<Button
android:id="@+id/inviteRejectView"
style="@style/VectorButtonStyleFlat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="4dp"
android:layout_marginRight="4dp"
android:minWidth="120dp"
android:text="@string/reject"
app:layout_constraintEnd_toStartOf="@+id/inviteAcceptView"
app:layout_constraintHorizontal_chainStyle="packed"
@ -68,10 +70,12 @@
<Button
android:id="@+id/inviteAcceptView"
style="@style/VectorButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:minWidth="120dp"
android:text="@string/accept"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="packed"

5
vector/src/main/res/menu/home.xml
View File

@ -6,9 +6,4 @@
android:icon="@drawable/ic_material_exit_to_app"
android:title="@string/action_sign_out" />
<!-- TODO Temporary code -->
<item
android:id="@+id/tmp_menu_create_room"
android:title="@string/room_recents_create_room" />
</menu>

2
vector/src/main/res/values/strings_riotX.xml
View File

@ -27,5 +27,7 @@
<string name="error_no_network">No network. Please check your Internet connection.</string>
<string name="action_change">"Change"</string>
<string name="please_wait">"Please wait…"</string>
<string name="group_all_communities">"All Communities"</string>
</resources>