gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-12 02:19:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

tint dialog menu items based onSurface

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-08-03 22:11:28 +02:00
parent cb44a707a9
commit 1d776ed6bd
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
View File

@ -39,7 +39,6 @@ import android.view.ViewGroup;
import com.facebook.drawee.backends.pipeline.Fresco; import com.facebook.drawee.backends.pipeline.Fresco;
import com.facebook.drawee.interfaces.DraweeController; import com.facebook.drawee.interfaces.DraweeController;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.nextcloud.talk.R;
import com.nextcloud.talk.activities.MainActivity; import com.nextcloud.talk.activities.MainActivity;
import com.nextcloud.talk.adapters.items.AdvancedUserItem; import com.nextcloud.talk.adapters.items.AdvancedUserItem;
import com.nextcloud.talk.api.NcApi; import com.nextcloud.talk.api.NcApi;
@ -118,8 +117,11 @@ public class ChooseAccountDialogFragment extends DialogFragment {
viewThemeUtils.themeDialogDivider(binding.divider); viewThemeUtils.themeDialogDivider(binding.divider);
viewThemeUtils.colorMaterialTextButton(binding.setStatus); viewThemeUtils.colorMaterialTextButton(binding.setStatus);
viewThemeUtils.colorDialogMenuText(binding.setStatus);
viewThemeUtils.colorMaterialTextButton(binding.addAccount); viewThemeUtils.colorMaterialTextButton(binding.addAccount);
viewThemeUtils.colorDialogMenuText(binding.addAccount);
viewThemeUtils.colorMaterialTextButton(binding.manageSettings); viewThemeUtils.colorMaterialTextButton(binding.manageSettings);
viewThemeUtils.colorDialogMenuText(binding.manageSettings);
// Defining user picture // Defining user picture
binding.currentAccount.userIcon.setTag(""); binding.currentAccount.userIcon.setTag("");

7
app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt
View File

@ -703,6 +703,13 @@ class ViewThemeUtils @Inject constructor(private val theme: ServerTheme, private
} }
} }
fun colorDialogMenuText(button: MaterialButton) {
withScheme(button) { scheme ->
button.setTextColor(scheme.onSurface)
button.iconTint = ColorStateList.valueOf(scheme.onSurface)
}
}
companion object { companion object {
private val THEMEABLE_PLACEHOLDER_IDS = listOf( private val THEMEABLE_PLACEHOLDER_IDS = listOf(
R.drawable.ic_mimetype_package_x_generic, R.drawable.ic_mimetype_package_x_generic,

12
app/src/main/res/layout/dialog_choose_account.xml
View File

@ -56,12 +56,12 @@
android:text="@string/set_status" android:text="@string/set_status"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/fontAppbar" android:textColor="@color/high_emphasis_text"
android:enabled="false" android:enabled="false"
app:icon="@drawable/ic_edit" app:icon="@drawable/ic_edit"
app:iconGravity="start" app:iconGravity="start"
app:iconPadding="22dp" app:iconPadding="22dp"
app:iconTint="@color/fontAppbar" /> app:iconTint="@color/high_emphasis_text" />
</LinearLayout> </LinearLayout>
<View <View
@ -99,11 +99,11 @@
android:text="@string/nc_account_chooser_add_account" android:text="@string/nc_account_chooser_add_account"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/fontAppbar" android:textColor="@color/high_emphasis_text"
app:icon="@drawable/ic_account_plus" app:icon="@drawable/ic_account_plus"
app:iconGravity="start" app:iconGravity="start"
app:iconPadding="22dp" app:iconPadding="22dp"
app:iconTint="@color/fontAppbar" app:iconTint="@color/high_emphasis_text"
app:layout_constraintBottom_toTopOf="@+id/manage_settings" app:layout_constraintBottom_toTopOf="@+id/manage_settings"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
@ -121,11 +121,11 @@
android:text="@string/nc_settings" android:text="@string/nc_settings"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/fontAppbar" android:textColor="@color/high_emphasis_text"
app:icon="@drawable/ic_settings" app:icon="@drawable/ic_settings"
app:iconGravity="start" app:iconGravity="start"
app:iconPadding="22dp" app:iconPadding="22dp"
app:iconTint="@color/fontAppbar" app:iconTint="@color/high_emphasis_text"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />