filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1943 from vector-im/feature/design_quick_win 

Feature/design quick win
This commit is contained in:
Benoit Marty 2020-08-18 18:30:25 +02:00 committed by GitHub
parent 8581d06931 189d2b2c06
commit 08292c874b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -9,6 +9,7 @@ Improvements 🙌:
- Give user the possibility to prevent accidental call (#1869)
- Display device information (name, id and key) in Cryptography setting screen (#1784)
- Ensure users do not accidentally ignore other users (#1890)
- Increase Font size on Calling screen (#1643)
Bugfix 🐛:
- Fix incorrect date format for some Asian languages (#1928)

42
vector/src/main/res/layout/activity_call.xml
View File

@ -28,31 +28,38 @@
<TextView
android:id="@+id/participantNameText"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:gravity="center"
android:textColor="?riotx_text_primary"
android:textSize="20sp"
android:textSize="28sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/callTypeText"
tools:text="Joe" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:text="@sample/matrix.json/data/displayName" />
<TextView
android:id="@+id/callTypeText"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:layout_marginBottom="8dp"
android:gravity="center"
android:textColor="?riotx_text_secondary"
android:textSize="12sp"
android:textSize="22sp"
app:layout_constraintBottom_toTopOf="@id/otherMemberAvatar"
tools:text="Video Call" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:text="@string/action_video_call" />
<ImageView
android:id="@+id/otherMemberAvatar"
android:layout_width="128dp"
android:layout_height="128dp"
android:layout_centerVertical="true"
android:layout_width="160dp"
android:layout_height="160dp"
android:contentDescription="@string/avatar"
android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="parent"
@ -64,21 +71,25 @@
<TextView
android:id="@+id/callStatusText"
android:layout_width="match_parent"
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:layout_marginBottom="8dp"
android:gravity="center"
android:textColor="?riotx_text_secondary"
android:textSize="12sp"
android:textSize="22sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/otherMemberAvatar"
tools:text="Connecting..." />
tools:text="@string/call_connecting" />
<ProgressBar
android:id="@+id/callConnectingProgress"
style="?android:attr/progressBarStyle"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
@ -91,7 +102,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
app:constraint_referenced_ids="participantNameText, callTypeText, otherMemberAvatar, callStatusText" />
app:constraint_referenced_ids="participantNameText,callTypeText,otherMemberAvatar,callStatusText" />
<androidx.constraintlayout.widget.Group
android:id="@+id/callVideoGroup"
@ -101,7 +112,6 @@
app:constraint_referenced_ids="pip_video_view, fullscreen_video_view"
tools:visibility="invisible" />
<im.vector.app.features.call.CallControlsView
android:id="@+id/callControls"
android:layout_width="match_parent"

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

@ -5,7 +5,6 @@
android:id="@+id/item_generic_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?riotx_background"
android:minHeight="50dp">
<ImageView

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

@ -5,6 +5,7 @@
android:id="@+id/itemVerificationClickableZone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?riotx_bottom_sheet_background"
android:clickable="true"
android:focusable="true"
android:foreground="?attr/selectableItemBackground"

6
vector/src/main/res/values/colors_riotx.xml
View File

@ -60,7 +60,7 @@
<attr name="riotx_bottom_sheet_background" format="color" />
<color name="riotx_bottom_sheet_background_light">#FFFFFFFF</color>
<color name="riotx_bottom_sheet_background_dark">#FF282C35</color>
<color name="riotx_bottom_sheet_background_black">#FF000000</color>
<color name="riotx_bottom_sheet_background_black">#FF282C35</color>
<attr name="riotx_base_text_icon_primary" format="color" />
<color name="riotx_base_text_icon_primary_light">#FFFFFFFF</color>
@ -225,8 +225,8 @@
<color name="riotx_disabled_view_color_dark">#61708B</color>
<attr name="riotx_list_bottom_sheet_divider_color" format="color" />
<color name="riotx_list_bottom_sheet_divider_color_light">#EEEFEF</color>
<color name="riotx_list_bottom_sheet_divider_color_dark">#FF61708B</color>
<color name="riotx_list_bottom_sheet_divider_color_light">#E3E8F0</color>
<color name="riotx_list_bottom_sheet_divider_color_dark">#7F61708B</color>
<color name="riotx_list_bottom_sheet_divider_color_black">#FF22262E</color>
<!-- (color from RiotWeb) -->