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

Theme rework WIP

This commit is contained in:
Benoit Marty 2019-06-05 15:27:35 +02:00
parent 51f5594ea0
commit 48fadd1a11
6 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
View File

@ -155,14 +155,14 @@
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/ic_material_leave" android:src="@drawable/ic_material_leave"
android:tint="@color/vector_error_color" /> android:tint="@color/riotx_notice" />


<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/sign_out_bottom_sheet_dont_want_secure_messages" android:text="@string/sign_out_bottom_sheet_dont_want_secure_messages"
android:textColor="@color/vector_error_color" android:textColor="@color/riotx_notice"
android:textSize="17sp" /> android:textSize="17sp" />
</LinearLayout> </LinearLayout>


@ -188,14 +188,14 @@
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:src="@drawable/ic_material_exit_to_app" android:src="@drawable/ic_material_exit_to_app"
android:tint="@color/vector_error_color" /> android:tint="@color/riotx_notice" />


<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/action_sign_out" android:text="@string/action_sign_out"
android:textColor="@color/vector_error_color" android:textColor="@color/riotx_notice"
android:textSize="17sp" /> android:textSize="17sp" />
</LinearLayout> </LinearLayout>



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

@ -48,7 +48,7 @@
android:id="@+id/roomListContainer" android:id="@+id/roomListContainer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:background="#F3F8FD" android:background="?riotx_header_panel_background"
app:layout_constraintBottom_toTopOf="@+id/bottomNavigationView" app:layout_constraintBottom_toTopOf="@+id/bottomNavigationView"
app:layout_constraintTop_toBottomOf="@+id/groupToolbar" /> app:layout_constraintTop_toBottomOf="@+id/groupToolbar" />


@ -56,7 +56,7 @@
android:id="@+id/bottomNavigationView" android:id="@+id/bottomNavigationView"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="48dp" android:layout_height="48dp"
android:background="#FFFFFF" android:background="?riotx_background"
app:itemIconSize="20dp" app:itemIconSize="20dp"
app:itemIconTint="@color/home_bottom_nav_view_tint" app:itemIconTint="@color/home_bottom_nav_view_tint"
app:itemTextColor="@color/home_bottom_nav_view_tint" app:itemTextColor="@color/home_bottom_nav_view_tint"

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

@ -112,7 +112,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="center" android:gravity="center"
android:textColor="@color/vector_error_color" android:textColor="@color/riotx_notice"
android:textSize="15sp" android:textSize="15sp"
android:visibility="gone" android:visibility="gone"
tools:text="Error" tools:text="Error"

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

@ -7,8 +7,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true">
tools:background="@color/pale_grey">


<ImageView <ImageView
android:id="@+id/roomAvatarImageView" android:id="@+id/roomAvatarImageView"

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

@ -28,70 +28,87 @@
'riotx_<name in the palette snake case>_<theme>' 'riotx_<name in the palette snake case>_<theme>'
--> -->


<attr name="riotx_background" format="color" />
<color name="riotx_background_light">#FFFFFFFF</color> <color name="riotx_background_light">#FFFFFFFF</color>
<color name="riotx_background_dark">#FF181B21</color> <color name="riotx_background_dark">#FF181B21</color>
<color name="riotx_background_black">#FF000000</color> <color name="riotx_background_black">#FF000000</color>


<attr name="riotx_base" format="color" />
<color name="riotx_base_light">#FF27303A</color> <color name="riotx_base_light">#FF27303A</color>
<color name="riotx_base_dark">#FF15171B</color> <color name="riotx_base_dark">#FF15171B</color>
<color name="riotx_base_black">#FF060708</color> <color name="riotx_base_black">#FF060708</color>


<attr name="riotx_base_text_icon_primary" format="color" />
<color name="riotx_base_text_icon_primary_light">#FFFFFFFF</color> <color name="riotx_base_text_icon_primary_light">#FFFFFFFF</color>
<color name="riotx_base_text_icon_primary_dark">#FFEDF3FF</color> <color name="riotx_base_text_icon_primary_dark">#FFEDF3FF</color>
<color name="riotx_base_text_icon_primary_black">#FFEDF3FF</color> <color name="riotx_base_text_icon_primary_black">#FFEDF3FF</color>


<attr name="riotx_base_text_icon_secondary" format="color" />
<color name="riotx_base_text_icon_secondary_light">#FFFFFFFF</color> <color name="riotx_base_text_icon_secondary_light">#FFFFFFFF</color>
<color name="riotx_base_text_icon_secondary_dark">#FFEDF3FF</color> <color name="riotx_base_text_icon_secondary_dark">#FFEDF3FF</color>
<color name="riotx_base_text_icon_secondary_black">#FFEDF3FF</color> <color name="riotx_base_text_icon_secondary_black">#FFEDF3FF</color>


<attr name="riotx_search_background_mobile" format="color" />
<color name="riotx_search_background_mobile_light">#FFFFFFFF</color> <color name="riotx_search_background_mobile_light">#FFFFFFFF</color>
<color name="riotx_search_background_mobile_dark">#FF181B21</color> <color name="riotx_search_background_mobile_dark">#FF181B21</color>
<color name="riotx_search_background_mobile_black">#FF181B21</color> <color name="riotx_search_background_mobile_black">#FF181B21</color>


<attr name="riotx_header_panel_background" format="color" />
<color name="riotx_header_panel_background_light">#FFF3F8FD</color> <color name="riotx_header_panel_background_light">#FFF3F8FD</color>
<color name="riotx_header_panel_background_dark">#FF22262E</color> <color name="riotx_header_panel_background_dark">#FF22262E</color>
<color name="riotx_header_panel_background_black">#FF090A0C</color> <color name="riotx_header_panel_background_black">#FF090A0C</color>


<attr name="riotx_header_panel_border_mobile" format="color" />
<color name="riotx_header_panel_border_mobile_light">#FFE9EDF1</color> <color name="riotx_header_panel_border_mobile_light">#FFE9EDF1</color>
<color name="riotx_header_panel_border_mobile_dark">#FF181B21</color> <color name="riotx_header_panel_border_mobile_dark">#FF181B21</color>
<color name="riotx_header_panel_border_mobile_black">#FF0D0F12</color> <color name="riotx_header_panel_border_mobile_black">#FF0D0F12</color>


<attr name="riotx_header_panel_text_primary" format="color" />
<color name="riotx_header_panel_text_primary_light">#FF61708B</color> <color name="riotx_header_panel_text_primary_light">#FF61708B</color>
<color name="riotx_header_panel_text_primary_dark">#FFA1B2D1</color> <color name="riotx_header_panel_text_primary_dark">#FFA1B2D1</color>
<color name="riotx_header_panel_text_primary_black">#FFA1B2D1</color> <color name="riotx_header_panel_text_primary_black">#FFA1B2D1</color>


<attr name="riotx_header_panel_text_secondary" format="color" />
<color name="riotx_header_panel_text_secondary_light">#FFC8C8CD</color> <color name="riotx_header_panel_text_secondary_light">#FFC8C8CD</color>
<color name="riotx_header_panel_text_secondary_dark">#FFC8C8CD</color> <color name="riotx_header_panel_text_secondary_dark">#FFC8C8CD</color>
<color name="riotx_header_panel_text_secondary_black">#FFC8C8CD</color> <color name="riotx_header_panel_text_secondary_black">#FFC8C8CD</color>


<attr name="riotx_text_primary" format="color" />
<color name="riotx_text_primary_light">#FF2E2F32</color> <color name="riotx_text_primary_light">#FF2E2F32</color>
<color name="riotx_text_primary_dark">#FFEDF3FF</color> <color name="riotx_text_primary_dark">#FFEDF3FF</color>
<color name="riotx_text_primary_black">#FFEDF3FF</color> <color name="riotx_text_primary_black">#FFEDF3FF</color>


<attr name="riotx_text_secondary" format="color" />
<color name="riotx_text_secondary_light">#FF9E9E9E</color> <color name="riotx_text_secondary_light">#FF9E9E9E</color>
<color name="riotx_text_secondary_dark">#FFA1B2D1</color> <color name="riotx_text_secondary_dark">#FFA1B2D1</color>
<color name="riotx_text_secondary_black">#FFA1B2D1</color> <color name="riotx_text_secondary_black">#FFA1B2D1</color>


<attr name="riotx_android_secondary" format="color" />
<color name="riotx_android_secondary_light">#FF7E899C</color> <color name="riotx_android_secondary_light">#FF7E899C</color>
<color name="riotx_android_secondary_dark">#FF7E899C</color> <color name="riotx_android_secondary_dark">#FF7E899C</color>
<color name="riotx_android_secondary_black">#FF7E899C</color> <color name="riotx_android_secondary_black">#FF7E899C</color>


<attr name="riotx_search_placeholder" format="color" />
<color name="riotx_search_placeholder_light">#FF61708B</color> <color name="riotx_search_placeholder_light">#FF61708B</color>
<color name="riotx_search_placeholder_dark">#FF61708B</color> <color name="riotx_search_placeholder_dark">#FF61708B</color>
<color name="riotx_search_placeholder_black">#FF61708B</color> <color name="riotx_search_placeholder_black">#FF61708B</color>


<attr name="riotx_room_highlight" format="color" />
<color name="riotx_room_highlight_light">#FFFFFFFF</color> <color name="riotx_room_highlight_light">#FFFFFFFF</color>
<color name="riotx_room_highlight_dark">#FF343446</color> <color name="riotx_room_highlight_dark">#FF343446</color>
<color name="riotx_room_highlight_black">#FF22262E</color> <color name="riotx_room_highlight_black">#FF22262E</color>


<attr name="riotx_unread_room_indent" format="color" />
<color name="riotx_unread_room_indent_light">#FF2E3648</color> <color name="riotx_unread_room_indent_light">#FF2E3648</color>
<color name="riotx_unread_room_indent_dark">#FF2E3648</color> <color name="riotx_unread_room_indent_dark">#FF2E3648</color>
<color name="riotx_unread_room_indent_black">#FF2E3648</color> <color name="riotx_unread_room_indent_black">#FF2E3648</color>


<attr name="riotx_android_status_bar" format="color" />
<color name="riotx_android_status_bar_light">#FF2E3648</color> <color name="riotx_android_status_bar_light">#FF2E3648</color>
<color name="riotx_android_status_bar_dark">#FF0D0E10</color> <color name="riotx_android_status_bar_dark">#FF0D0E10</color>
<color name="riotx_android_status_bar_black">#FF000000</color> <color name="riotx_android_status_bar_black">#FF000000</color>


<attr name="riotx_line_break_mobile" format="color" />
<color name="riotx_line_break_mobile_light">#FFEEEFEF</color> <color name="riotx_line_break_mobile_light">#FFEEEFEF</color>
<color name="riotx_line_break_mobile_dark">#FF61708B</color> <color name="riotx_line_break_mobile_dark">#FF61708B</color>
<color name="riotx_line_break_mobile_black">#FF22262E</color> <color name="riotx_line_break_mobile_black">#FF22262E</color>

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

@ -14,7 +14,7 @@
<item name="colorSecondary">@color/accent_color_light</item> <item name="colorSecondary">@color/accent_color_light</item>
<item name="colorSecondaryVariant">#0039CB</item> <item name="colorSecondaryVariant">#0039CB</item>
<item name="colorOnSecondary">@android:color/white</item> <item name="colorOnSecondary">@android:color/white</item>
<item name="colorError">@color/vector_error_color</item> <item name="colorError">@color/riotx_notice</item>
<item name="colorOnError">#FFFFFF</item> <item name="colorOnError">#FFFFFF</item>
<item name="colorSurface">#FFFFFF</item> <item name="colorSurface">#FFFFFF</item>
<item name="colorOnSurface">#212121</item> <item name="colorOnSurface">#212121</item>
@ -32,7 +32,26 @@
<item name="android:textColorSecondary">@color/black_38</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/link_color_light</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>


<!-- Menu text color --> <!-- Menu text color -->
<!--item name="android:actionMenuTextColor">#FFFFFFFF</item--> <!--item name="android:actionMenuTextColor">#FFFFFFFF</item-->
@ -49,7 +68,7 @@
<item name="vctr_toolbar_primary_text_color">@color/riotx_text_primary_light</item> <item name="vctr_toolbar_primary_text_color">@color/riotx_text_primary_light</item>
<!-- Base Text Secondary--> <!-- Base Text Secondary-->
<item name="vctr_toolbar_secondary_text_color">@color/riotx_text_primary_light</item> <item name="vctr_toolbar_secondary_text_color">@color/riotx_text_primary_light</item>
<item name="vctr_toolbar_link_text_color">@color/link_color_light</item> <item name="vctr_toolbar_link_text_color">@color/riotx_links</item>


<!-- application bar text hint color --> <!-- application bar text hint color -->
<item name="vctr_primary_hint_text_color">@color/primary_hint_text_color_light</item> <item name="vctr_primary_hint_text_color">@color/primary_hint_text_color_light</item>