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

cleanup

Browse Source
This commit is contained in:
Benoit Marty
2019-05-29 14:19:40 +02:00
parent 2b8bbc550c
commit 6978ec4246
13 changed files with 91 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
vector/src/main/res/drawable/ic_plus_circle.xml
View File

@ -1,13 +1,22 @@
<vector android:height="24dp" android:viewportHeight="22"
android:viewportWidth="22" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#00000000" android:fillType="evenOdd"
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
<path
android:fillColor="#00000000"
android:fillType="evenOdd"
android:pathData="M11,11m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
android:strokeColor="#03B381" android:strokeLineCap="round"
android:strokeLineJoin="round" android:strokeWidth="1.4"/>
<path android:fillColor="#00000000" android:fillType="evenOdd"
android:pathData="M11,7L11,15" android:strokeColor="#03B381"
android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="1.4"/>
<path android:fillColor="#00000000" android:fillType="evenOdd"
android:pathData="M7,11L15,11" android:strokeColor="#03B381"
android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="1.4"/>
android:strokeWidth="1.4"
android:strokeColor="#03B381"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:fillColor="#00000000"
android:fillType="evenOdd"
android:pathData="M11,7v8M7,11h8"
android:strokeWidth="1.4"
android:strokeColor="#03B381"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</vector>

20
vector/src/main/res/drawable/ic_tick.xml
View File

@ -1,9 +1,13 @@
<vector android:height="24dp" android:viewportHeight="11"
android:viewportWidth="15" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#00000000" android:fillType="evenOdd"
android:pathData="M5.3033,10.0815L13.7886,1.5962"
android:strokeColor="#7E899C" android:strokeLineCap="round" android:strokeWidth="1.3"/>
<path android:fillColor="#00000000" android:fillType="evenOdd"
android:pathData="M5.3033,10.0815L1.0607,5.8388"
android:strokeColor="#7E899C" android:strokeLineCap="round" android:strokeWidth="1.3"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="15dp"
android:height="11dp"
android:viewportWidth="15"
android:viewportHeight="11">
<path
android:pathData="M5.303,10.081l8.486,-8.485M5.303,10.081L1.061,5.84"
android:strokeWidth="1.3"
android:fillColor="#00000000"
android:fillType="evenOdd"
android:strokeColor="#7E899C"
android:strokeLineCap="round"/>
</vector>

31
vector/src/main/res/drawable/ic_user.xml
View File

@ -1,11 +1,22 @@
<vector android:height="24dp" android:viewportHeight="16"
android:viewportWidth="15" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#00000000" android:fillType="evenOdd"
android:pathData="M14,15L14,13.4444C14,11.7262 12.5449,10.3333 10.75,10.3333L4.25,10.3333C2.4551,10.3333 1,11.7262 1,13.4444L1,15"
android:strokeColor="#7E899C" android:strokeLineCap="round"
android:strokeLineJoin="round" android:strokeWidth="1.16666667"/>
<path android:fillColor="#00000000" android:fillType="evenOdd"
android:pathData="M4.25,4.1111a3.25,3.1111 0,1 0,6.5 0a3.25,3.1111 0,1 0,-6.5 0z"
android:strokeColor="#7E899C" android:strokeLineCap="round"
android:strokeLineJoin="round" android:strokeWidth="1.16666667"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="15dp"
android:height="16dp"
android:viewportWidth="15"
android:viewportHeight="16">
<path
android:pathData="M14,15v-1.556c0,-1.718 -1.455,-3.11 -3.25,-3.11h-6.5c-1.795,0 -3.25,1.392 -3.25,3.11L1,15"
android:strokeLineJoin="round"
android:strokeWidth="1.167"
android:fillColor="#00000000"
android:fillType="evenOdd"
android:strokeColor="#7E899C"
android:strokeLineCap="round"/>
<path
android:pathData="M4.25,4.111a3.25,3.111 0,1 0,6.5 0a3.25,3.111 0,1 0,-6.5 0z"
android:strokeLineJoin="round"
android:strokeWidth="1.167"
android:fillColor="#00000000"
android:fillType="evenOdd"
android:strokeColor="#7E899C"
android:strokeLineCap="round"/>
</vector>

7
vector/src/main/res/layout/fragment_home_drawer.xml
View File

@ -61,12 +61,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:paddingStart="8dp"
android:paddingLeft="8dp"
android:paddingTop="8dp"
android:paddingEnd="16dp"
android:paddingRight="16dp"
android:paddingBottom="16dp"
android:padding="16dp"
android:src="@drawable/ic_settings_x"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />

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

@ -1,8 +1,8 @@
<?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:id="@+id/roomPreviewNoPreviewRoot"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -45,7 +45,7 @@
android:textAppearance="@style/TextAppearance.Vector.Title"
android:textSize="15sp"
android:textStyle="bold"
tools:text="Matrix HQ" />
tools:text="@sample/matrix.json/data/roomName" />
<TextView
android:id="@+id/roomPreviewNoPreviewTopic"
@ -55,7 +55,7 @@
android:gravity="center"
android:textAppearance="@style/TextAppearance.Vector.Subtitle"
android:textSize="15sp"
tools:text="Welcome to Matrix HQ! Here is the rest of the room topic…" />
tools:text="@sample/matrix.json/data/roomTopic" />
<TextView
android:id="@+id/roomPreviewNoPreviewLabel"
@ -83,14 +83,11 @@
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"
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" />
app:bsv_use_flat_button="false" />
</LinearLayout>

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

@ -38,7 +38,7 @@
app:layout_constraintEnd_toStartOf="@id/itemPublicRoomMembersCount"
app:layout_constraintStart_toEndOf="@id/itemPublicRoomAvatar"
app:layout_constraintTop_toTopOf="parent"
tools:text="@tools:sample/lorem/random" />
tools:text="@sample/matrix.json/data/roomName" />
<TextView
android:id="@+id/itemPublicRoomMembersCount"
@ -65,9 +65,9 @@
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:bsv_use_flat_button="true"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

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

@ -44,7 +44,7 @@
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toEndOf="@id/messageStartGuideline"
app:layout_constraintTop_toTopOf="parent"
tools:text="@tools:sample/full_names" />
tools:text="@sample/matrix.json/data/displayName" />
<TextView

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

@ -25,6 +25,6 @@
android:textColor="@color/slate_grey"
android:textSize="14sp"
android:textStyle="italic"
tools:text="Jhon doe changed their avatar" />
tools:text="John doe changed their avatar" />
</LinearLayout>

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

@ -6,4 +6,4 @@
android:layout_height="wrap_content"
android:textColor="@color/dark_grey"
android:textSize="14sp"
tools:text="Alright finished work, heading there in about 20 mins…
Ping me when you’re outside" />
tools:text="@sample/matrix.json/data/message" />

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

@ -22,25 +22,29 @@
<TextView
android:id="@+id/inviteNameView"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginTop="40dp"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:textAppearance="@style/TextAppearance.Vector.Title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inviteAvatarView"
tools:text="Matthew" />
tools:text="@sample/matrix.json/data/displayName" />
<TextView
android:id="@+id/inviteIdentifierView"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginTop="8dp"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:textAppearance="@style/TextAppearance.Vector.Subtitle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inviteNameView"
tools:text=" @matthew:matrix.org" />
tools:text="@sample/matrix.json/data/mxid" />
<TextView
android:id="@+id/inviteLabelView"

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

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -12,9 +11,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/join" />
<Button
@ -24,9 +20,6 @@
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