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

Improve keys backup banner rendering

Browse Source
This commit is contained in:
Benoit Marty 2019-06-13 14:19:31 +02:00
parent 9dc1684179
commit ab95cbee92
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@
android:id="@+id/homeKeysBackupBanner" android:id="@+id/homeKeysBackupBanner"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?vctr_list_header_background_color" android:background="?riotx_keys_backup_banner_accent_color"
android:minHeight="67dp" android:minHeight="67dp"
app:layout_constraintBottom_toTopOf="@+id/roomListContainer" app:layout_constraintBottom_toTopOf="@+id/roomListContainer"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

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

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?vctr_list_header_background_color" android:background="?riotx_keys_backup_banner_accent_color"
android:minHeight="67dp" android:minHeight="67dp"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">


@ -26,6 +26,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="27dp" android:layout_marginStart="27dp"
android:layout_marginLeft="27dp" android:layout_marginLeft="27dp"
android:layout_marginTop="8dp"
android:text="@string/keys_backup_banner_setup_line1" android:text="@string/keys_backup_banner_setup_line1"
android:textColor="?riotx_text_primary" android:textColor="?riotx_text_primary"
android:textSize="15sp" android:textSize="15sp"
@ -41,6 +42,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="27dp" android:layout_marginStart="27dp"
android:layout_marginLeft="27dp" android:layout_marginLeft="27dp"
android:layout_marginBottom="8dp"
android:text="@string/keys_backup_banner_setup_line2" android:text="@string/keys_backup_banner_setup_line2"
android:textColor="?colorAccent" android:textColor="?colorAccent"
android:textSize="15sp" android:textSize="15sp"

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

@ -147,5 +147,10 @@
<color name="riotx_touch_guard_bg_dark">#BF000000</color> <color name="riotx_touch_guard_bg_dark">#BF000000</color>
<color name="riotx_touch_guard_bg_black">#BF000000</color> <color name="riotx_touch_guard_bg_black">#BF000000</color>


<!-- (color from RiotWeb) -->
<attr name="riotx_keys_backup_banner_accent_color" format="color" />
<color name="riotx_keys_backup_banner_accent_color_light">#FFF8E3</color>
<color name="riotx_keys_backup_banner_accent_color_dark">#22262E</color>



</resources> </resources>

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

@ -28,6 +28,7 @@
<item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_dark</item> <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_dark</item>
<item name="riotx_fab_label_color">@color/riotx_fab_label_color_dark</item> <item name="riotx_fab_label_color">@color/riotx_fab_label_color_dark</item>
<item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_dark</item> <item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_dark</item>
<item name="riotx_keys_backup_banner_accent_color">@color/riotx_keys_backup_banner_accent_color_dark</item>


<!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes --> <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
<item name="colorPrimary">@color/riotx_accent</item> <item name="colorPrimary">@color/riotx_accent</item>

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

@ -28,6 +28,7 @@
<item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_light</item> <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_light</item>
<item name="riotx_fab_label_color">@color/riotx_fab_label_color_light</item> <item name="riotx_fab_label_color">@color/riotx_fab_label_color_light</item>
<item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_light</item> <item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_light</item>
<item name="riotx_keys_backup_banner_accent_color">@color/riotx_keys_backup_banner_accent_color_light</item>


<!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes --> <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
<item name="colorPrimary">@color/riotx_accent</item> <item name="colorPrimary">@color/riotx_accent</item>