filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some colors (and fix compile)

Browse Source 
Change-Id: I2cb3d144afbb9af306774bf3d763d1f299133517
This commit is contained in:
SpiritCroc 2020-11-05 13:58:15 +01:00
parent 2590f8f690
commit eecbdde2fb
16 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
View File

@ -85,7 +85,7 @@ abstract class BottomSheetRoomPreviewItem : VectorEpoxyModel<BottomSheetRoomPrev
val tintColor: Int
if (isLowPriority) {
holder.roomLowPriority.contentDescription = stringProvider.getString(R.string.room_list_quick_actions_low_priority_remove)
tintColor = ContextCompat.getColor(holder.view.context, R.color.riotx_accent)
tintColor = ColorProvider(holder.view.context).getColor(R.color.riotx_accent)
} else {
holder.roomLowPriority.contentDescription = stringProvider.getString(R.string.room_list_quick_actions_low_priority_add)
tintColor = ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_secondary)

4
vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
View File

@ -24,7 +24,6 @@ import android.view.View
import android.widget.FrameLayout
import android.widget.ImageView
import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.core.content.withStyledAttributes
import androidx.core.view.isGone
import androidx.core.view.isInvisible
@ -33,6 +32,7 @@ import butterknife.BindView
import butterknife.ButterKnife
import im.vector.app.R
import im.vector.app.core.extensions.setTextOrHide
import im.vector.app.core.resources.ColorProvider
import im.vector.app.features.themes.ThemeUtils
class BottomSheetActionButton @JvmOverloads constructor(
@ -127,7 +127,7 @@ class BottomSheetActionButton @JvmOverloads constructor(
rightIcon = getDrawable(R.styleable.BottomSheetActionButton_rightIcon)
tint = getColor(R.styleable.BottomSheetActionButton_tint, ThemeUtils.getColor(context, android.R.attr.textColor))
titleTextColor = getColor(R.styleable.BottomSheetActionButton_titleTextColor, ContextCompat.getColor(context, R.color.riotx_accent))
titleTextColor = getColor(R.styleable.BottomSheetActionButton_titleTextColor, ColorProvider(context).getColor(R.color.riotx_accent))
}
}
}

2
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
View File

@ -638,7 +638,7 @@ class RoomDetailFragment @Inject constructor(
val actionView = matrixAppsMenuItem.actionView
actionView
.findViewById<ImageView>(R.id.action_view_icon_image)
.setColorFilter(ContextCompat.getColor(requireContext(), R.color.riotx_accent))
.setColorFilter(ColorProvider(requireContext()).getColor(R.color.riotx_accent))
actionView.findViewById<TextView>(R.id.cart_badge).setTextOrHide("$widgetsCount")
matrixAppsMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
} else {

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

@ -81,7 +81,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/exportDialogSubmit"
style="@style/VectorButtonStyle"
style="?materialButtonStyle"
android:layout_width="wrap_content"
android:layout_gravity="end"
android:enabled="false"

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

@ -60,7 +60,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/dialog_e2e_keys_import_button"
style="@style/VectorButtonStyle"
style="?materialButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"

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

@ -89,7 +89,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_restore_button"
style="@style/VectorButtonStyle"
style="?materialButtonStyle"
android:layout_marginTop="@dimen/layout_vertical_margin_big"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:minWidth="200dp"

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

@ -89,7 +89,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_restore_with_passphrase_submit"
style="@style/VectorButtonStyle"
style="?materialButtonStyle"
android:layout_marginTop="@dimen/layout_vertical_margin_big"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:layout_marginBottom="@dimen/layout_vertical_margin_big"

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

@ -47,7 +47,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_setup_done_button"
style="@style/VectorButtonStyle"
style="?materialButtonStyle"
android:layout_margin="20dp"
android:minWidth="200dp"
android:text="@string/done"

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

@ -50,7 +50,7 @@
<!-- Centered button -->
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_setup_step1_button"
style="@style/VectorButtonStyle"
style="?materialButtonStyle"
android:layout_width="wrap_content"
android:layout_margin="16dp"
android:maxWidth="@dimen/button_max_width"

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

@ -116,7 +116,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_setup_step2_button"
style="@style/VectorButtonStyle"
style="?materialButtonStyle"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="@string/keys_backup_setup_step2_button_title"

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

@ -88,7 +88,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_setup_step3_button"
style="@style/VectorButtonStyle"
style="?materialButtonStyle"
android:layout_gravity="center"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:layout_marginBottom="@dimen/layout_vertical_margin"

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

@ -37,7 +37,7 @@
<Button
android:id="@+id/reviewTermsAccept"
style="@style/VectorButtonStyle"
style="?materialButtonStyle"
android:layout_width="wrap_content"
android:text="@string/accept" />

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

@ -8,11 +8,11 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/form_submit_button"
style="@style/VectorButtonStyle"
style="?materialButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="@dimen/alerter_activity_vertical_margin"
tools:text="@string/auth_submit" />
</FrameLayout>
</FrameLayout>

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

@ -94,7 +94,7 @@
<!-- Set a max width because the text can be long -->
<com.google.android.material.button.MaterialButton
android:id="@+id/item_generic_action_button"
style="@style/VectorButtonStyle"
style="?materialButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"

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

@ -10,7 +10,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_settings_footer_button1"
style="@style/VectorButtonStyle"
style="?materialButtonStyle"
android:layout_width="@dimen/button_max_width"
android:visibility="gone"
tools:text="@string/keys_backup_settings_restore_backup_button"
@ -18,7 +18,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_settings_footer_button2"
style="@style/VectorButtonStyle"
style="?materialButtonStyle"
android:layout_width="@dimen/button_max_width"
android:layout_marginTop="16dp"
android:visibility="gone"

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

@ -58,7 +58,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/troubleshootTestButton"
style="@style/VectorButtonStyle"
style="?materialButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"