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

Theme rework WIP

Browse Source
This commit is contained in:
Benoit Marty 2019-06-05 15:58:00 +02:00
parent 48fadd1a11
commit 94c91e0dae
22 changed files with 128 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vector/src/main/res/layout/adapter_item_action.xml
View File

@ -21,8 +21,8 @@
android:layout_gravity="center_vertical"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
tools:src="@drawable/ic_delete"
android:tint="?android:attr/textColorTertiary" />
android:tint="?riotx_text_secondary"
tools:src="@drawable/ic_delete" />

<TextView
android:id="@+id/action_title"
@ -31,6 +31,7 @@
android:layout_gravity="center_vertical"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:textColor="?riotx_text_secondary"
android:textSize="17sp"
tools:text="@string/delete" />


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

@ -52,6 +52,7 @@
android:layout_marginTop="4dp"
android:text="@string/reactions_agree"
android:textAlignment="center"
android:textColor="?riotx_text_secondary"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/center_guideline"
@ -108,6 +109,7 @@
android:layout_height="wrap_content"
android:text="@string/reactions_like"
android:textAlignment="center"
android:textColor="?riotx_text_secondary"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/quick_react_agree_text"
app:layout_constraintEnd_toEndOf="parent"

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

@ -11,7 +11,7 @@
android:id="@+id/homeDrawerHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/dark_two"
android:background="?riotx_base"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@ -72,7 +72,7 @@
android:id="@+id/homeDrawerGroupListContainer"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="#FAFAFA"
android:background="?riotx_header_panel_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

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

@ -32,7 +32,7 @@
android:layout_marginRight="16dp"
android:ellipsize="end"
android:maxLines="2"
android:textColor="#2E2F3E"
android:textColor="?riotx_text_primary"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomMembersCount"
@ -52,9 +52,10 @@
android:drawableStart="@drawable/ic_user"
android:drawableLeft="@drawable/ic_user"
android:drawablePadding="8dp"
android:drawableTint="?riotx_text_secondary"
android:gravity="center_vertical"
android:minWidth="56dp"
android:textColor="#7E899C"
android:textColor="?riotx_text_secondary"
android:textSize="15sp"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomTopic"
app:layout_constraintStart_toStartOf="@+id/itemPublicRoomName"
@ -72,7 +73,7 @@
android:maxLines="1"
android:minWidth="40dp"
android:singleLine="true"
android:textColor="#7E899C"
android:textColor="?riotx_text_secondary"
android:textSize="15sp"
app:layout_constraintBaseline_toBaselineOf="@+id/itemPublicRoomMembersCount"
app:layout_constraintEnd_toStartOf="@+id/itemPublicRoomButtonState"
@ -89,7 +90,7 @@
android:gravity="center_vertical"
android:maxLines="1"
android:singleLine="true"
android:textColor="#2E2F3E"
android:textColor="?riotx_text_primary"
android:textSize="15sp"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
@ -116,7 +117,7 @@
android:id="@+id/itemPublicRoomBottomSeparator"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="#E9EDF1"
android:background="?riotx_header_panel_border_mobile"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

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

@ -120,7 +120,7 @@
android:id="@+id/roomDividerView"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="#1e000000"
android:background="?riotx_header_panel_border_mobile"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

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

@ -28,7 +28,7 @@
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:textColor="#7E899C"
android:textColor="?riotx_text_secondary"
android:textSize="14sp"
tools:text="@string/room_participants_header_direct_chats" />


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

@ -32,7 +32,7 @@
android:ellipsize="end"
android:lines="1"
android:maxLines="2"
android:textColor="#2E2F3E"
android:textColor="?riotx_text_primary"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/itemRoomDirectoryDescription"
@ -51,7 +51,7 @@
android:ellipsize="end"
android:lines="1"
android:maxLines="2"
android:textColor="#2E2F3E"
android:textColor="?riotx_text_primary"
android:textSize="15sp"
app:layout_constraintBottom_toTopOf="@+id/itemRoomDirectoryBottomSeparator"
app:layout_constraintEnd_toEndOf="parent"
@ -63,7 +63,7 @@
android:id="@+id/itemRoomDirectoryBottomSeparator"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="#E9EDF1"
android:background="?riotx_header_panel_border_mobile"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

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

@ -36,6 +36,7 @@
android:layout_marginRight="8dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?riotx_text_primary"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constrainedWidth="true"
@ -53,7 +54,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:textColor="@color/brown_grey"
android:textColor="?riotx_text_secondary"
android:textSize="12sp"
app:layout_constraintBaseline_toBaselineOf="@id/messageMemberNameView"
app:layout_constraintEnd_toEndOf="parent"

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

@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?riotx_background"
android:padding="8dp">

<View
@ -16,7 +17,7 @@
android:layout_marginEnd="32dp"
android:layout_marginRight="32dp"
android:layout_marginBottom="8dp"
android:background="@color/pale_grey_two"
android:background="?riotx_header_panel_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/itemDayTextView"
app:layout_constraintStart_toStartOf="parent"
@ -28,7 +29,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="@color/light_grey_blue"
android:textColor="?riotx_header_panel_text_primary"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -46,7 +47,7 @@
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:background="@color/pale_grey_two"
android:background="?riotx_header_panel_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/itemDayTextView"

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

@ -4,6 +4,6 @@
android:id="@+id/messageTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?colorOnPrimary"
android:textColor="?riotx_text_primary"
android:textSize="14sp"
tools:text="@sample/matrix.json/data/message" />

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

@ -79,7 +79,6 @@
android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:minWidth="120dp"
android:background="#341DDD"
android:text="@string/accept"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="packed"

9
vector/src/main/res/layout/view_state.xml
View File

@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:textColor="@android:color/black"
android:textColor="?riotx_text_primary"
android:textSize="16sp"
tools:text="Une erreur est survenue" />

@ -39,8 +39,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="8dp"
android:text="@string/global_retry"
android:textColor="@android:color/white" />
android:text="@string/global_retry" />

</LinearLayout>

@ -60,7 +59,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginBottom="49dp"
android:gravity="center"
android:textColor="#2E2F32"
android:textColor="?riotx_text_primary"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/emptyImageView"
@ -86,7 +85,7 @@
android:layout_gravity="center"
android:layout_marginTop="49dp"
android:gravity="center"
android:textColor="#7E899C"
android:textColor="?riotx_text_secondary"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

7
vector/src/main/res/values-v21/theme_black.xml
View File

@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="AppTheme.Black" parent="AppTheme.Base.Black">
<item name="android:navigationBarColor">?colorPrimaryDark</item>
<style name="AppTheme.Black.v21" parent="AppTheme.Base.Black">
<item name="android:statusBarColor">@color/riotx_header_panel_background_black</item>
<item name="android:navigationBarColor">@color/riotx_header_panel_background_black</item>

<!-- enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
</style>

<style name="AppTheme.Black" parent="AppTheme.Black.v21" />

</resources>

7
vector/src/main/res/values-v21/theme_dark.xml
View File

@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="AppTheme.Dark" parent="AppTheme.Base.Dark">
<item name="android:navigationBarColor">?colorPrimaryDark</item>
<style name="AppTheme.Dark.v21" parent="AppTheme.Base.Dark">
<item name="android:statusBarColor">@color/riotx_header_panel_background_dark</item>
<item name="android:navigationBarColor">@color/riotx_header_panel_background_dark</item>

<!-- enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
</style>

<style name="AppTheme.Dark" parent="AppTheme.Dark.v21" />

</resources>

10
vector/src/main/res/values-v23/theme_black.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="AppTheme.Black.v23" parent="AppTheme.Black.v21">
<item name="android:windowLightStatusBar">false</item>
</style>

<style name="AppTheme.Black" parent="AppTheme.Black.v23"/>

</resources>

10
vector/src/main/res/values-v23/theme_dark.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="AppTheme.Dark.v23" parent="AppTheme.Dark.v21">
<item name="android:windowLightStatusBar">false</item>
</style>

<style name="AppTheme.Dark" parent="AppTheme.Dark.v23"/>

</resources>

5
vector/src/main/res/values-v23/theme_light.xml
View File

@ -3,11 +3,6 @@

<style name="AppTheme.Light.v23" parent="AppTheme.Light.v21">
<item name="android:windowLightStatusBar">true</item>
<item name="android:statusBarColor">@color/riotx_header_panel_background_light</item>
<item name="android:navigationBarColor">@color/riotx_header_panel_background_light</item>

<!-- enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
</style>

<style name="AppTheme.Light" parent="AppTheme.Light.v23"/>

10
vector/src/main/res/values-v27/theme_black.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="AppTheme.Black.v27" parent="AppTheme.Black.v23">
<item name="android:windowLightNavigationBar">false</item>
</style>

<style name="AppTheme.Black" parent="AppTheme.Black.v27" />

</resources>

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

@ -12,11 +12,9 @@
<color name="light_blue_grey">#4ac1c9d6</color>
<!-- Now use ?colorOnPrimary or ?vctr_toolbar_primary_text_color -->
<!--color name="dark_grey">#2e2f32</color-->
<color name="dark_two">#27303A</color>
<color name="light_grey_blue">#9fa9ba</color>
<color name="cool_grey">#a5aab2</color>
<color name="pale_grey_two">#ebedf8</color>
<color name="brown_grey">#a5a5a5</color>
<color name="grey_lynch">#61708B</color>
<color name="black_87">#de000000</color>
<color name="black_38">#61000000</color>

21
vector/src/main/res/values/theme_black.xml
View File

@ -9,6 +9,27 @@
<item name="colorPrimaryDark">@color/primary_color_dark_black</item>
<item name="colorPrimary">@color/primary_color_black</item>

<item name="android:textColorLink">@color/riotx_links</item>

<!-- Riotx attribute for palette -->
<item name="riotx_background">@color/riotx_background_black</item>
<item name="riotx_base">@color/riotx_base_black</item>
<item name="riotx_base_text_icon_primary">@color/riotx_base_text_icon_primary_black</item>
<item name="riotx_base_text_icon_secondary">@color/riotx_base_text_icon_secondary_black</item>
<item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_black</item>
<item name="riotx_header_panel_background">@color/riotx_header_panel_background_black</item>
<item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_black</item>
<item name="riotx_header_panel_text_primary">@color/riotx_header_panel_text_primary_black</item>
<item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_black</item>
<item name="riotx_text_primary">@color/riotx_text_primary_black</item>
<item name="riotx_text_secondary">@color/riotx_text_secondary_black</item>
<item name="riotx_android_secondary">@color/riotx_android_secondary_black</item>
<item name="riotx_search_placeholder">@color/riotx_search_placeholder_black</item>
<item name="riotx_room_highlight">@color/riotx_room_highlight_black</item>
<item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_black</item>
<item name="riotx_android_status_bar">@color/riotx_android_status_bar_black</item>
<item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_black</item>

<!-- list colors -->
<!--Header/Panel Background-->
<item name="vctr_list_header_background_color">#FF090A0C</item>

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

@ -15,6 +15,25 @@

<item name="android:textColorLink">@color/link_color_dark</item>

<!-- Riotx attribute for palette -->
<item name="riotx_background">@color/riotx_background_dark</item>
<item name="riotx_base">@color/riotx_base_dark</item>
<item name="riotx_base_text_icon_primary">@color/riotx_base_text_icon_primary_dark</item>
<item name="riotx_base_text_icon_secondary">@color/riotx_base_text_icon_secondary_dark</item>
<item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_dark</item>
<item name="riotx_header_panel_background">@color/riotx_header_panel_background_dark</item>
<item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_dark</item>
<item name="riotx_header_panel_text_primary">@color/riotx_header_panel_text_primary_dark</item>
<item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_dark</item>
<item name="riotx_text_primary">@color/riotx_text_primary_dark</item>
<item name="riotx_text_secondary">@color/riotx_text_secondary_dark</item>
<item name="riotx_android_secondary">@color/riotx_android_secondary_dark</item>
<item name="riotx_search_placeholder">@color/riotx_search_placeholder_dark</item>
<item name="riotx_room_highlight">@color/riotx_room_highlight_dark</item>
<item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_dark</item>
<item name="riotx_android_status_bar">@color/riotx_android_status_bar_dark</item>
<item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_dark</item>

<!-- Menu text color -->
<item name="android:actionMenuTextColor">#FFFFFFFF</item>


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

@ -28,30 +28,30 @@
<item name="alertDialogTheme">@style/VectorAlertDialogStyle</item>


<item name="android:textColorPrimary">@color/black_87</item>
<!--item name="android:textColorPrimary">@color/black_87</item>
<item name="android:textColorSecondary">@color/black_38</item>
<item name="android:textColorTertiary">@color/black_37</item>
<item name="android:textColorTertiary">@color/black_37</item-->

<item name="android:textColorLink">@color/riotx_links</item>

<!-- Riotx attribute for palette -->
<item name="riotx_background">@color/riotx_background</item>
<item name="riotx_base">@color/riotx_base</item>
<item name="riotx_base_text_icon_primary">@color/riotx_base_text_icon_primary_light</item>
<item name="riotx_base_text_icon_secondary">@color/riotx_base_text_icon_secondary_light</item>
<item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_light</item>
<item name="riotx_header_panel_background">@color/riotx_header_panel_background_light</item>
<item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_light</item>
<item name="riotx_header_panel_text_primary">@color/riotx_header_panel_text_primary_light</item>
<item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_light</item>
<item name="riotx_text_primary">@color/riotx_text_primary_light</item>
<item name="riotx_text_secondary">@color/riotx_text_secondary_light</item>
<item name="riotx_android_secondary">@color/riotx_android_secondary_light</item>
<item name="riotx_search_placeholder">@color/riotx_search_placeholder_light</item>
<item name="riotx_room_highlight">@color/riotx_room_highlight_light</item>
<item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_light</item>
<item name="riotx_android_status_bar">@color/riotx_android_status_bar_light</item>
<item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_light</item>
<item name="riotx_background">@color/riotx_background_light</item>
<item name="riotx_base">@color/riotx_base_light</item>
<item name="riotx_base_text_icon_primary">@color/riotx_base_text_icon_primary_light</item>
<item name="riotx_base_text_icon_secondary">@color/riotx_base_text_icon_secondary_light</item>
<item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_light</item>
<item name="riotx_header_panel_background">@color/riotx_header_panel_background_light</item>
<item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_light</item>
<item name="riotx_header_panel_text_primary">@color/riotx_header_panel_text_primary_light</item>
<item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_light</item>
<item name="riotx_text_primary">@color/riotx_text_primary_light</item>
<item name="riotx_text_secondary">@color/riotx_text_secondary_light</item>
<item name="riotx_android_secondary">@color/riotx_android_secondary_light</item>
<item name="riotx_search_placeholder">@color/riotx_search_placeholder_light</item>
<item name="riotx_room_highlight">@color/riotx_room_highlight_light</item>
<item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_light</item>
<item name="riotx_android_status_bar">@color/riotx_android_status_bar_light</item>
<item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_light</item>

<!-- Menu text color -->
<!--item name="android:actionMenuTextColor">#FFFFFFFF</item-->