mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-22 17:35:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue in theme

Browse source
This commit is contained in:
Benoit Marty 2019-06-06 15:16:56 +02:00
parent 75b8932395
commit 2cc2844abf
19 changed files with 67 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt
View file

@ -25,6 +25,7 @@ import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotredesign.R
import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
import im.vector.riotredesign.features.themes.ThemeUtils
@EpoxyModelClass(layout = R.layout.item_room_category)
abstract class RoomCategoryItem : VectorEpoxyModel<RoomCategoryItem.Holder>() {
@ -36,8 +37,7 @@ abstract class RoomCategoryItem : VectorEpoxyModel<RoomCategoryItem.Holder>() {
@EpoxyAttribute var listener: (() -> Unit)? = null
override fun bind(holder: Holder) {
// TODO Theme get text secondary color instead
val tintColor = ContextCompat.getColor(holder.rootView.context, R.color.bluey_grey_two)
val tintColor = ThemeUtils.getColor(holder.rootView.context, R.attr.riotx_text_secondary)
val expandedArrowDrawableRes = if (expanded) R.drawable.ic_expand_more_white else R.drawable.ic_expand_less_white
val expandedArrowDrawable = ContextCompat.getDrawable(holder.rootView.context, expandedArrowDrawableRes)?.also {
DrawableCompat.setTint(it, tintColor)

3
vector/src/main/res/drawable/bg_unread_notification.xml
View file

@ -5,5 +5,6 @@
<corners android:radius="40dp" />
<solid android:color="@color/grey_lynch" />
<!-- Note: the 3 theme have the same color for now -->
<solid android:color="@color/riotx_unread_room_indent_light" />
</shape>

2
vector/src/main/res/drawable/circle.xml
View file

@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/pale_grey" />
<solid android:color="#FFF2F5F8" />
</shape>

13
vector/src/main/res/drawable/fg_group_item.xml
View file

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="oval">
<solid android:color="@android:color/transparent" />
<stroke android:width="3dp" android:color="@color/pale_teal" />
</shape>
</item>
<item android:drawable="@android:color/transparent" />
</selector>

2
vector/src/main/res/layout/activity_bug_report.xml
View file

@ -84,7 +84,7 @@
android:layout_height="wrap_content"
android:hint="@string/send_bug_report_placeholder"
android:minHeight="40dp"
android:textColor="?android:textColorPrimary" />
android:textColor="?riotx_text_primary" />
</com.google.android.material.textfield.TextInputLayout>

6
vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
View file

@ -16,6 +16,7 @@
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:layout_marginBottom="8dp"
android:text="@string/action_sign_out"
android:textColor="?riotx_text_primary"
android:textSize="18sp"
android:textStyle="bold" />
@ -26,7 +27,7 @@
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:layout_marginBottom="8dp"
android:textColor="?android:attr/textColorSecondary"
android:textColor="?riotx_text_secondary"
tools:text="@string/sign_out_bottom_sheet_warning_no_backup" />
<LinearLayout
@ -63,6 +64,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:textColor="?riotx_text_secondary"
tools:text="@string/keys_backup_info_keys_all_backup_up" />
</LinearLayout>
@ -95,6 +97,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/keys_backup_setup"
android:textColor="?riotx_text_secondary"
android:textSize="17sp" />
</LinearLayout>
@ -128,6 +131,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textColor="?riotx_text_secondary"
android:text="@string/keys_backup_activate"
android:textSize="17sp" />

10
vector/src/main/res/layout/bottom_sheet_message_actions.xml
View file

@ -42,6 +42,7 @@
android:ellipsize="end"
android:fontFamily="sans-serif-bold"
android:singleLine="true"
android:textColor="?riotx_text_primary"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@ -49,8 +50,7 @@
app:layout_constraintTop_toTopOf="@id/bottom_sheet_message_preview_avatar"
tools:text="@tools:sample/full_names" />
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
<TextView
android:id="@+id/bottom_sheet_message_preview_body"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -62,7 +62,7 @@
android:layout_marginBottom="4dp"
android:ellipsize="end"
android:maxLines="3"
android:textColor="?android:textColorSecondary"
android:textColor="?riotx_text_secondary"
android:textIsSelectable="false"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@id/bottom_sheet_message_preview_timestamp"
@ -77,9 +77,9 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:layout_marginRight="@dimen/layout_horizontal_margin"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
android:layout_marginBottom="8dp"
android:textColor="?riotx_text_secondary"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message_preview_body"

12
vector/src/main/res/layout/fragment_public_rooms.xml
View file

@ -20,8 +20,7 @@
app:contentInsetStartWithNavigation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_scrollFlags="noScroll">
app:layout_constraintTop_toTopOf="parent">
<!-- Note: Background is modified in the code for other themes -->
<EditText
@ -50,22 +49,23 @@
android:id="@+id/publicRoomsCreateNewRoom"
style="@style/VectorButtonStyleFlat"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:layout_marginBottom="8dp"
android:minHeight="@dimen/layout_touch_size"
android:text="@string/create_new_room"
app:icon="@drawable/ic_plus_circle"
app:iconPadding="13dp"
app:iconTint="@color/riotx_accent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/publicRoomsToolbar"
app:layout_scrollFlags="scroll|enterAlways|snap" />
app:layout_constraintTop_toBottomOf="@+id/publicRoomsToolbar" />
<com.airbnb.epoxy.EpoxyRecyclerView
android:id="@+id/publicRoomsList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/publicRoomsCreateNewRoom"

2
vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
View file

@ -49,7 +49,7 @@
android:layout_marginTop="4dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:textColor="?android:attr/textColorSecondary"
android:textColor="?riotx_text_secondary"
tools:text="@string/settings_troubleshoot_diagnostic_running_status" />
<LinearLayout

5
vector/src/main/res/layout/item_autocomplete_command.xml
View file

@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?riotx_background"
android:padding="6dp">
<TextView
@ -12,6 +13,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:maxLines="1"
android:textColor="?riotx_text_primary"
android:textSize="12sp"
android:textStyle="bold"
tools:text="/invite" />
@ -26,6 +28,7 @@
android:layout_toEndOf="@+id/commandName"
android:layout_toRightOf="@+id/commandName"
android:maxLines="1"
android:textColor="?riotx_text_secondary"
android:textSize="12sp"
android:textStyle="italic"
tools:text="&lt;user-id&gt;" />
@ -39,7 +42,7 @@
android:layout_alignParentLeft="true"
android:layout_gravity="center_vertical"
android:maxLines="1"
android:textColor="?android:attr/textColorSecondary"
android:textColor="?riotx_text_secondary"
android:textSize="12sp"
tools:text="@string/command_description_invite_user" />

1
vector/src/main/res/layout/item_loading.xml
View file

@ -3,4 +3,5 @@
android:id="@+id/progressBar"
android:layout_width="match_parent"
android:layout_height="80dp"
android:background="?riotx_background"
android:padding="16dp" />

2
vector/src/main/res/layout/item_notification_troubleshoot.xml
View file

@ -49,7 +49,7 @@
android:layout_marginRight="16dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:textColor="?android:attr/textColorSecondary"
android:textColor="?riotx_text_secondary"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/troubleshootTestButton"
app:layout_constraintEnd_toStartOf="@+id/troubleshootStatusIcon"

53
vector/src/main/res/layout/item_public_room.xml
View file

@ -35,18 +35,38 @@
android:textColor="?riotx_text_primary"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomMembersCount"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomTopic"
app:layout_constraintEnd_toStartOf="@+id/itemPublicRoomButtonState"
app:layout_constraintStart_toEndOf="@id/itemPublicRoomAvatar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
tools:text="@sample/matrix.json/data/roomName" />
<TextView
android:id="@+id/itemPublicRoomTopic"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginEnd="22dp"
android:layout_marginRight="22dp"
android:gravity="center_vertical"
android:maxLines="1"
android:singleLine="true"
android:textColor="?riotx_text_primary"
android:textSize="15sp"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomMembersCount"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/itemPublicRoomName"
app:layout_constraintTop_toBottomOf="@+id/itemPublicRoomName"
tools:text="@sample/matrix.json/data/roomTopic"
tools:visibility="visible" />
<TextView
android:id="@+id/itemPublicRoomMembersCount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:drawableStart="@drawable/ic_user"
@ -57,9 +77,9 @@
android:minWidth="56dp"
android:textColor="?riotx_text_secondary"
android:textSize="15sp"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomTopic"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
app:layout_constraintStart_toStartOf="@+id/itemPublicRoomName"
app:layout_constraintTop_toBottomOf="@+id/itemPublicRoomName"
app:layout_constraintTop_toBottomOf="@+id/itemPublicRoomTopic"
tools:text="148" />
<TextView
@ -68,7 +88,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="22dp"
android:layout_marginRight="22dp"
android:gravity="center_vertical"
android:maxLines="1"
android:minWidth="40dp"
@ -76,30 +97,10 @@
android:textColor="?riotx_text_secondary"
android:textSize="15sp"
app:layout_constraintBaseline_toBaselineOf="@+id/itemPublicRoomMembersCount"
app:layout_constraintEnd_toStartOf="@+id/itemPublicRoomButtonState"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/itemPublicRoomMembersCount"
tools:text="@sample/matrix.json/data/roomAlias" />
<TextView
android:id="@+id/itemPublicRoomTopic"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:gravity="center_vertical"
android:maxLines="1"
android:singleLine="true"
android:textColor="?riotx_text_primary"
android:textSize="15sp"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/itemPublicRoomName"
app:layout_constraintTop_toBottomOf="@+id/itemPublicRoomMembersCount"
tools:text="@sample/matrix.json/data/roomTopic"
tools:visibility="visible" />
<im.vector.riotredesign.core.platform.ButtonStateView
android:id="@+id/itemPublicRoomButtonState"
android:layout_width="wrap_content"

4
vector/src/main/res/layout/item_room_category.xml
View file

@ -4,7 +4,7 @@
android:id="@+id/roomCategoryRootView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:background="?riotx_header_panel_background"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
@ -14,7 +14,7 @@
android:paddingTop="@dimen/layout_vertical_margin"
android:paddingEnd="@dimen/layout_horizontal_margin"
android:paddingRight="@dimen/layout_horizontal_margin"
tools:background="?riotx_header_panel_background">
android:paddingBottom="8dp">
<TextView
android:id="@+id/roomCategoryTitleView"

2
vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
View file

@ -50,7 +50,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textColor="?android:textColorSecondary"
android:textColor="?riotx_text_secondary"
android:textIsSelectable="false"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"

2
vector/src/main/res/layout/reaction_button.xml
View file

@ -55,7 +55,7 @@
android:layout_marginRight="6dp"
android:gravity="center"
android:maxLines="1"
android:textColor="?android:attr/textColorSecondary"
android:textColor="?riotx_text_secondary"
android:textSize="10sp"
android:textStyle="bold"
app:autoSizeMaxTextSize="14sp"

8
vector/src/main/res/layout/view_button_state.xml
View file

@ -21,7 +21,7 @@
android:layout_gravity="center"
android:minWidth="120dp"
tools:layout_gravity="center_horizontal"
tools:layout_marginTop="100dp"
tools:layout_marginTop="40dp"
tools:text="@string/join" />
<ProgressBar
@ -31,7 +31,7 @@
android:layout_gravity="center"
android:scaleType="center"
tools:layout_gravity="center_horizontal"
tools:layout_marginTop="200dp" />
tools:layout_marginTop="80dp" />
<ImageView
android:id="@+id/buttonStateLoaded"
@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
tools:layout_gravity="center_horizontal"
tools:layout_marginTop="300dp"
tools:layout_marginTop="120dp"
tools:src="@drawable/ic_tick" />
<com.google.android.material.button.MaterialButton
@ -51,6 +51,6 @@
android:text="@string/global_retry"
android:textColor="@color/riotx_notice"
tools:layout_gravity="center_horizontal"
tools:layout_marginTop="400dp" />
tools:layout_marginTop="160dp" />
</merge>

13
vector/src/main/res/values/colors.xml
View file

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- TODO remove those colors-->
<color name="pale_grey">#f2f5f8</color>
<color name="pale_teal">#7ac9a1</color>
<color name="bluey_grey_two">#929eb4</color>
<color name="light_blue_grey">#4ac1c9d6</color>
<color name="grey_lynch">#61708B</color>
<color name="black">#000000</color>
</resources>

3
vector/src/main/res/values/colors_riotx.xml
View file

@ -23,6 +23,9 @@
<color name="riotx_username_7">#5c56f5</color>
<color name="riotx_username_8">#74d12c</color>
<!-- Other usefull color -->
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<!-- Palette: format fo naming:
'riotx_<name in the palette snake case>_<theme>'