rei-forks
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename some classes

This commit is contained in:
Benoit Marty 2020-10-05 15:25:46 +02:00 committed by Benoit Marty
parent cae7510a77
commit 88dd6ae5da
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vector/src/main/java/im/vector/app/features/workers/signout/SignoutBottomSheetActionButton.kt
View File

@ -31,7 +31,7 @@ import im.vector.app.R
import im.vector.app.core.extensions.setTextOrHide import im.vector.app.core.extensions.setTextOrHide
import im.vector.app.features.themes.ThemeUtils import im.vector.app.features.themes.ThemeUtils
class SignoutBottomSheetActionButton @JvmOverloads constructor( class SignOutBottomSheetActionButton @JvmOverloads constructor(
context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
) : LinearLayout(context, attrs, defStyleAttr) { ) : LinearLayout(context, attrs, defStyleAttr) {
@ -80,11 +80,11 @@ class SignoutBottomSheetActionButton @JvmOverloads constructor(
inflate(context, R.layout.item_signout_action, this) inflate(context, R.layout.item_signout_action, this)
ButterKnife.bind(this) ButterKnife.bind(this)
val typedArray = context.obtainStyledAttributes(attrs, R.styleable.SignoutBottomSheetActionButton, 0, 0) val typedArray = context.obtainStyledAttributes(attrs, R.styleable.SignOutBottomSheetActionButton, 0, 0)
title = typedArray.getString(R.styleable.SignoutBottomSheetActionButton_actionTitle) ?: "" title = typedArray.getString(R.styleable.SignOutBottomSheetActionButton_actionTitle) ?: ""
leftIcon = typedArray.getDrawable(R.styleable.SignoutBottomSheetActionButton_leftIcon) leftIcon = typedArray.getDrawable(R.styleable.SignOutBottomSheetActionButton_leftIcon)
tint = typedArray.getColor(R.styleable.SignoutBottomSheetActionButton_iconTint, ThemeUtils.getColor(context, android.R.attr.textColor)) tint = typedArray.getColor(R.styleable.SignOutBottomSheetActionButton_iconTint, ThemeUtils.getColor(context, android.R.attr.textColor))
textColor = typedArray.getColor(R.styleable.SignoutBottomSheetActionButton_textColor, ThemeUtils.getColor(context, android.R.attr.textColor)) textColor = typedArray.getColor(R.styleable.SignOutBottomSheetActionButton_textColor, ThemeUtils.getColor(context, android.R.attr.textColor))
typedArray.recycle() typedArray.recycle()

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

@ -81,7 +81,7 @@
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
<im.vector.app.features.workers.signout.SignoutBottomSheetActionButton <im.vector.app.features.workers.signout.SignOutBottomSheetActionButton
android:id="@+id/setupRecoveryButton" android:id="@+id/setupRecoveryButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -91,7 +91,7 @@
app:textColor="?riotx_text_secondary" /> app:textColor="?riotx_text_secondary" />
<im.vector.app.features.workers.signout.SignoutBottomSheetActionButton <im.vector.app.features.workers.signout.SignOutBottomSheetActionButton
android:id="@+id/setupMegolmBackupButton" android:id="@+id/setupMegolmBackupButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -100,7 +100,7 @@
app:leftIcon="@drawable/backup_keys" app:leftIcon="@drawable/backup_keys"
app:textColor="?riotx_text_secondary" /> app:textColor="?riotx_text_secondary" />
<im.vector.app.features.workers.signout.SignoutBottomSheetActionButton <im.vector.app.features.workers.signout.SignOutBottomSheetActionButton
android:id="@+id/exportManuallyButton" android:id="@+id/exportManuallyButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -109,7 +109,7 @@
app:leftIcon="@drawable/ic_download" app:leftIcon="@drawable/ic_download"
app:textColor="?riotx_text_secondary" /> app:textColor="?riotx_text_secondary" />
<im.vector.app.features.workers.signout.SignoutBottomSheetActionButton <im.vector.app.features.workers.signout.SignOutBottomSheetActionButton
android:id="@+id/exitAnywayButton" android:id="@+id/exitAnywayButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -118,7 +118,7 @@
app:leftIcon="@drawable/ic_material_leave" app:leftIcon="@drawable/ic_material_leave"
app:textColor="@color/riotx_destructive_accent" /> app:textColor="@color/riotx_destructive_accent" />
<im.vector.app.features.workers.signout.SignoutBottomSheetActionButton <im.vector.app.features.workers.signout.SignOutBottomSheetActionButton
android:id="@+id/signOutButton" android:id="@+id/signOutButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

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

@ -60,7 +60,7 @@
<attr name="forceStartPadding" format="boolean" /> <attr name="forceStartPadding" format="boolean" />
</declare-styleable> </declare-styleable>
<declare-styleable name="SignoutBottomSheetActionButton"> <declare-styleable name="SignOutBottomSheetActionButton">
<attr name="iconTint" format="color" /> <attr name="iconTint" format="color" />
<attr name="actionTitle"/> <attr name="actionTitle"/>
<attr name="leftIcon" /> <attr name="leftIcon" />