From 226be87d37da184ccbdefdf376acca0e07063d70 Mon Sep 17 00:00:00 2001 From: A117870935 Date: Sun, 14 May 2023 19:47:04 +0530 Subject: [PATCH] NMC-2039: Customized action buttons as per magenta cloud theme. NMC-2043: Customized checkbox and switch UIs. --- .../nmc/android/utils/CheckableThemeUtils.kt | 117 ++++++++++++++++++ .../ui/activity/FolderPickerActivity.kt | 5 - .../ReceiveExternalFilesActivity.java | 7 +- .../ui/activity/SyncedFoldersActivity.kt | 1 - .../ui/activity/UploadFilesActivity.java | 2 - .../SyncedFolderPreferencesDialogFragment.kt | 5 +- .../fragment/contactsbackup/BackupFragment.kt | 28 +++-- .../color/primary_button_background_color.xml | 5 + .../color/primary_button_text_color_state.xml | 5 + app/src/main/res/drawable/borderless_btn.xml | 4 +- app/src/main/res/drawable/ic_cut_paste.xml | 12 ++ app/src/main/res/layout/backup_fragment.xml | 5 +- app/src/main/res/layout/empty_list.xml | 2 +- .../main/res/layout/files_folder_picker.xml | 34 ++++- .../res/layout/receive_external_files.xml | 2 +- .../main/res/layout/send_share_fragment.xml | 12 +- .../layout/synced_folders_settings_layout.xml | 4 +- .../main/res/layout/upload_files_layout.xml | 7 +- app/src/main/res/values-night/colors.xml | 65 ++++++++++ app/src/main/res/values/colors.xml | 91 +++++++++++++- app/src/main/res/values/dims.xml | 2 +- app/src/main/res/values/styles.xml | 7 +- 22 files changed, 373 insertions(+), 49 deletions(-) create mode 100644 app/src/main/java/com/nmc/android/utils/CheckableThemeUtils.kt create mode 100644 app/src/main/res/color/primary_button_background_color.xml create mode 100644 app/src/main/res/color/primary_button_text_color_state.xml create mode 100644 app/src/main/res/drawable/ic_cut_paste.xml diff --git a/app/src/main/java/com/nmc/android/utils/CheckableThemeUtils.kt b/app/src/main/java/com/nmc/android/utils/CheckableThemeUtils.kt new file mode 100644 index 000000000000..a3b8a1149948 --- /dev/null +++ b/app/src/main/java/com/nmc/android/utils/CheckableThemeUtils.kt @@ -0,0 +1,117 @@ +package com.nmc.android.utils + +import android.content.res.ColorStateList +import androidx.appcompat.widget.AppCompatCheckBox +import androidx.appcompat.widget.SwitchCompat +import androidx.core.content.res.ResourcesCompat +import com.owncloud.android.R + +object CheckableThemeUtils { + @JvmStatic + fun tintCheckbox(vararg checkBoxes: AppCompatCheckBox) { + for (checkBox in checkBoxes) { + val checkEnabled = ResourcesCompat.getColor( + checkBox.context.resources, + R.color.checkbox_checked_enabled, + checkBox.context.theme + ) + val checkDisabled = ResourcesCompat.getColor( + checkBox.context.resources, + R.color.checkbox_checked_disabled, + checkBox.context.theme + ) + val uncheckEnabled = ResourcesCompat.getColor( + checkBox.context.resources, + R.color.checkbox_unchecked_enabled, + checkBox.context.theme + ) + val uncheckDisabled = ResourcesCompat.getColor( + checkBox.context.resources, + R.color.checkbox_unchecked_disabled, + checkBox.context.theme + ) + + val states = arrayOf( + intArrayOf(android.R.attr.state_enabled, android.R.attr.state_checked), + intArrayOf(-android.R.attr.state_enabled, android.R.attr.state_checked), + intArrayOf(android.R.attr.state_enabled, -android.R.attr.state_checked), + intArrayOf(-android.R.attr.state_enabled, -android.R.attr.state_checked) + ) + val colors = intArrayOf( + checkEnabled, + checkDisabled, + uncheckEnabled, + uncheckDisabled + ) + checkBox.buttonTintList = ColorStateList(states, colors) + } + } + + @JvmStatic + @JvmOverloads + fun tintSwitch(switchView: SwitchCompat, color: Int = 0, colorText: Boolean = false) { + if (colorText) { + switchView.setTextColor(color) + } + + val states = arrayOf( + intArrayOf(android.R.attr.state_enabled, android.R.attr.state_checked), + intArrayOf(android.R.attr.state_enabled, -android.R.attr.state_checked), + intArrayOf(-android.R.attr.state_enabled) + ) + + val thumbColorCheckedEnabled = ResourcesCompat.getColor( + switchView.context.resources, + R.color.switch_thumb_checked_enabled, + switchView.context.theme + ) + val thumbColorUncheckedEnabled = + ResourcesCompat.getColor( + switchView.context.resources, + R.color.switch_thumb_unchecked_enabled, + switchView.context.theme + ) + val thumbColorDisabled = + ResourcesCompat.getColor( + switchView.context.resources, + R.color.switch_thumb_disabled, + switchView.context.theme + ) + + val thumbColors = intArrayOf( + thumbColorCheckedEnabled, + thumbColorUncheckedEnabled, + thumbColorDisabled + ) + val thumbColorStateList = ColorStateList(states, thumbColors) + + val trackColorCheckedEnabled = ResourcesCompat.getColor( + switchView.context.resources, + R.color.switch_track_checked_enabled, + switchView.context.theme + ) + val trackColorUncheckedEnabled = + ResourcesCompat.getColor( + switchView.context.resources, + R.color.switch_track_unchecked_enabled, + switchView.context.theme + ) + val trackColorDisabled = + ResourcesCompat.getColor( + switchView.context.resources, + R.color.switch_track_disabled, + switchView.context.theme + ) + + val trackColors = intArrayOf( + trackColorCheckedEnabled, + trackColorUncheckedEnabled, + trackColorDisabled + ) + + val trackColorStateList = ColorStateList(states, trackColors) + + switchView.thumbTintList = thumbColorStateList + switchView.trackTintList = trackColorStateList + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt index 3730796b21ae..6363df23a275 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt @@ -435,23 +435,18 @@ open class FolderPickerActivity : private fun initControls() { if (this is FilePickerActivity) { - viewThemeUtils.material.colorMaterialButtonPrimaryFilled(filesPickerBinding.folderPickerBtnCancel) filesPickerBinding.folderPickerBtnCancel.setOnClickListener { finish() } } else { - viewThemeUtils.material.colorMaterialButtonText(folderPickerBinding.folderPickerBtnCancel) folderPickerBinding.folderPickerBtnCancel.setOnClickListener { finish() } - viewThemeUtils.material.colorMaterialButtonPrimaryTonal(folderPickerBinding.folderPickerBtnChoose) folderPickerBinding.folderPickerBtnChoose.setOnClickListener { processOperation(null) } - viewThemeUtils.material.colorMaterialButtonPrimaryFilled(folderPickerBinding.folderPickerBtnCopy) folderPickerBinding.folderPickerBtnCopy.setOnClickListener { processOperation( OperationsService.ACTION_COPY_FILE ) } - viewThemeUtils.material.colorMaterialButtonPrimaryTonal(folderPickerBinding.folderPickerBtnMove) folderPickerBinding.folderPickerBtnMove.setOnClickListener { processOperation( OperationsService.ACTION_MOVE_FILE diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java index 2e8a6a27cdbf..151e3e1e776f 100755 --- a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java @@ -464,7 +464,6 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { setFilename(binding.userInput, selectPos); binding.userInput.requestFocus(); - viewThemeUtils.material.colorTextInputLayout(binding.userInputContainer); setupSpinner(adapter, selectPos, binding.userInput, binding.fileType); if (adapter.getCount() == SINGLE_SPINNER_ENTRY) { @@ -786,15 +785,13 @@ private void populateDirectoryList(OCFile file) { setupReceiveExternalFilesAdapter(files); } - MaterialButton btnChooseFolder = binding.uploaderChooseFolder; - viewThemeUtils.material.colorMaterialButtonPrimaryFilled(btnChooseFolder); - btnChooseFolder.setOnClickListener(this); + MaterialButton btnChooseFolder = binding.uploaderChooseFolder; + btnChooseFolder.setOnClickListener(this); btnChooseFolder.setEnabled(mFile.canCreateFileAndFolder()); viewThemeUtils.platform.themeStatusBar(this); - viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.uploaderCancel); binding.uploaderCancel.setOnClickListener(this); sortButton = binding.toolbarLayout.sortButton; diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt index 96a853af2a40..82699636b061 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt @@ -250,7 +250,6 @@ class SyncedFoldersActivity : connectivityService ) binding.emptyList.emptyListIcon.setImageResource(R.drawable.nav_synced_folders) - viewThemeUtils.material.colorMaterialButtonPrimaryFilled(binding.emptyList.emptyListViewAction) val lm = GridLayoutManager(this, gridWidth) adapter.setLayoutManager(lm) val spacing = resources.getDimensionPixelSize(R.dimen.media_grid_spacing) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java index 01cd186d83f6..ad97a526fa40 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java @@ -192,10 +192,8 @@ public void onCreate(Bundle savedInstanceState) { mFileListFragment = (LocalFileListFragment) getSupportFragmentManager().findFragmentByTag("local_files_list"); // Set input controllers - viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.uploadFilesBtnCancel); binding.uploadFilesBtnCancel.setOnClickListener(this); - viewThemeUtils.material.colorMaterialButtonPrimaryFilled(binding.uploadFilesBtnUpload); binding.uploadFilesBtnUpload.setOnClickListener(this); binding.uploadFilesBtnUpload.setEnabled(mLocalFolderPickerMode); diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.kt index 6656d0beb144..7921b9692246 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.kt @@ -23,6 +23,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.nextcloud.client.di.Injectable import com.nextcloud.client.preferences.SubFolderRule import com.nextcloud.utils.extensions.getParcelableArgument +import com.nmc.android.utils.CheckableThemeUtils import com.owncloud.android.R import com.owncloud.android.databinding.SyncedFoldersSettingsLayoutBinding import com.owncloud.android.datamodel.MediaFolderType @@ -147,9 +148,9 @@ class SyncedFolderPreferencesDialogFragment : } private fun applyUserColor(binding: SyncedFoldersSettingsLayoutBinding) { - viewThemeUtils?.androidx?.colorSwitchCompat(binding.syncEnabled) + CheckableThemeUtils.tintSwitch(binding.syncEnabled) - viewThemeUtils?.platform?.themeCheckbox( + CheckableThemeUtils.tintCheckbox( binding.settingInstantUploadOnWifiCheckbox, binding.settingInstantUploadOnChargingCheckbox, binding.settingInstantUploadExistingCheckbox, diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.kt index 957cec7b0d0b..edd63dfab5e5 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.kt +++ b/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.kt @@ -46,6 +46,7 @@ import com.owncloud.android.utils.theme.ViewThemeUtils import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import com.nmc.android.utils.CheckableThemeUtils import third_parties.daveKoeller.AlphanumComparator import java.util.Calendar import java.util.GregorianCalendar @@ -234,15 +235,15 @@ class BackupFragment : } private fun applyUserColor() { - viewThemeUtils.androidx.colorSwitchCompat(binding.contacts) - viewThemeUtils.androidx.colorSwitchCompat(binding.calendar) - viewThemeUtils.androidx.colorSwitchCompat(binding.dailyBackup) - - viewThemeUtils.material.colorMaterialButtonPrimaryFilled(binding.backupNow) - viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.contactsDatepicker) - - viewThemeUtils.platform.colorTextView(binding.dataToBackUpTitle) - viewThemeUtils.platform.colorTextView(binding.backupSettingsTitle) + //NMC Customisation + CheckableThemeUtils.tintSwitch(binding.contacts) + CheckableThemeUtils.tintSwitch(binding.calendar) + CheckableThemeUtils.tintSwitch(binding.dailyBackup) + + //NMC Customization + val primaryAccentColor = requireContext().resources.getColor(R.color.primary, null) + binding.dataToBackUpTitle.setTextColor(primaryAccentColor) + binding.backupSettingsTitle.setTextColor(primaryAccentColor) } override fun onResume() { @@ -548,10 +549,11 @@ class BackupFragment : show() } - viewThemeUtils.platform.colorTextButtons( - datePickerDialog!!.getButton(DatePickerDialog.BUTTON_NEGATIVE), - datePickerDialog!!.getButton(DatePickerDialog.BUTTON_POSITIVE) - ) + // NMC Customisation + datePickerDialog?.getButton(DatePickerDialog.BUTTON_NEGATIVE) + ?.setTextColor(resources.getColor(R.color.text_color, null)) + datePickerDialog?.getButton(DatePickerDialog.BUTTON_POSITIVE) + ?.setTextColor(resources.getColor(R.color.primary, null)) } else { DisplayUtils.showSnackMessage( requireView().findViewById(R.id.contacts_linear_layout), diff --git a/app/src/main/res/color/primary_button_background_color.xml b/app/src/main/res/color/primary_button_background_color.xml new file mode 100644 index 000000000000..ff815aa69e7b --- /dev/null +++ b/app/src/main/res/color/primary_button_background_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/primary_button_text_color_state.xml b/app/src/main/res/color/primary_button_text_color_state.xml new file mode 100644 index 000000000000..11bbe6d80fd9 --- /dev/null +++ b/app/src/main/res/color/primary_button_text_color_state.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/borderless_btn.xml b/app/src/main/res/drawable/borderless_btn.xml index 9deebd5701b8..de4e1ae6657b 100644 --- a/app/src/main/res/drawable/borderless_btn.xml +++ b/app/src/main/res/drawable/borderless_btn.xml @@ -9,6 +9,6 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_cut_paste.xml b/app/src/main/res/drawable/ic_cut_paste.xml new file mode 100644 index 000000000000..02ea7719db9d --- /dev/null +++ b/app/src/main/res/drawable/ic_cut_paste.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/layout/backup_fragment.xml b/app/src/main/res/layout/backup_fragment.xml index 6b89cbd58f4f..2980c7dc854b 100644 --- a/app/src/main/res/layout/backup_fragment.xml +++ b/app/src/main/res/layout/backup_fragment.xml @@ -8,6 +8,7 @@ --> + style="@style/Button.Primary" + app:cornerRadius="@dimen/button_corner_radius"/> diff --git a/app/src/main/res/layout/empty_list.xml b/app/src/main/res/layout/empty_list.xml index 4bb213e71ca4..906a98771ecd 100644 --- a/app/src/main/res/layout/empty_list.xml +++ b/app/src/main/res/layout/empty_list.xml @@ -65,7 +65,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/standard_half_margin" - android:theme="@style/Button.Primary" + style="@style/Button.Primary" android:visibility="gone" app:cornerRadius="@dimen/button_corner_radius" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/files_folder_picker.xml b/app/src/main/res/layout/files_folder_picker.xml index f1d4f53ebb5d..854ed531e922 100644 --- a/app/src/main/res/layout/files_folder_picker.xml +++ b/app/src/main/res/layout/files_folder_picker.xml @@ -51,22 +51,34 @@ + android:textColor="@color/text_color" + app:cornerRadius="@dimen/button_corner_radius" + app:icon="@drawable/ic_close" + app:iconGravity="textStart" + app:iconPadding="@dimen/standard_quarter_padding" + app:iconTint="@color/text_color" + app:strokeColor="@color/text_color" /> + android:textColor="@color/primary_button_text_color_state" + app:cornerRadius="@dimen/button_corner_radius" + app:icon="@drawable/ic_cut_paste" + app:iconGravity="textStart" + app:iconPadding="@dimen/standard_quarter_padding" + app:iconTint="@color/primary_button_text_color_state"/> + android:textColor="@color/primary_button_text_color_state" + app:cornerRadius="@dimen/button_corner_radius" + app:icon="@drawable/ic_cut_paste" + app:iconGravity="textStart" + app:iconPadding="@dimen/standard_quarter_padding" + app:iconTint="@color/primary_button_text_color_state"/> diff --git a/app/src/main/res/layout/receive_external_files.xml b/app/src/main/res/layout/receive_external_files.xml index 1f85eae78a32..4183f9b000fc 100644 --- a/app/src/main/res/layout/receive_external_files.xml +++ b/app/src/main/res/layout/receive_external_files.xml @@ -71,7 +71,7 @@ android:layout_marginStart="@dimen/standard_half_margin" android:layout_weight="1" android:text="@string/uploader_btn_upload_text" - android:theme="@style/Button.Primary" + style="@style/Button.Primary" app:cornerRadius="@dimen/button_corner_radius" /> diff --git a/app/src/main/res/layout/send_share_fragment.xml b/app/src/main/res/layout/send_share_fragment.xml index 12342895bc50..82e4f98159d4 100644 --- a/app/src/main/res/layout/send_share_fragment.xml +++ b/app/src/main/res/layout/send_share_fragment.xml @@ -37,21 +37,25 @@ + app:icon="@drawable/shared_via_users" + app:iconTint="@color/primary_button_text_color_state" /> + android:textColor="@color/primary_button_text_color_state" + app:icon="@drawable/shared_via_link" + app:iconTint="@color/primary_button_text_color_state" /> diff --git a/app/src/main/res/layout/synced_folders_settings_layout.xml b/app/src/main/res/layout/synced_folders_settings_layout.xml index c8850c4e020c..8769537e772b 100644 --- a/app/src/main/res/layout/synced_folders_settings_layout.xml +++ b/app/src/main/res/layout/synced_folders_settings_layout.xml @@ -433,6 +433,7 @@ android:id="@+id/btnNeutral" style="@style/Widget.Material3.Button.TextButton" android:layout_width="wrap_content" + android:textColor="@color/fontAppbar" android:layout_height="wrap_content" android:text="@string/common_cancel" android:layout_weight="1"/> @@ -446,6 +447,7 @@ android:id="@+id/btnNegative" android:layout_width="wrap_content" style="@style/Widget.Material3.Button.TextButton" + android:textColor="@color/fontAppbar" android:layout_height="wrap_content" android:text="@string/common_delete" android:layout_weight="1"/> @@ -454,7 +456,7 @@ android:id="@+id/btnPositive" android:layout_width="wrap_content" android:text="@string/common_save" - style="@style/Widget.Material3.Button.TonalButton" + style="@style/Widget.Material3.Button.TextButton" android:layout_height="wrap_content" android:layout_weight="1"/> diff --git a/app/src/main/res/layout/upload_files_layout.xml b/app/src/main/res/layout/upload_files_layout.xml index 4012193eb6a9..e4dd800b3010 100644 --- a/app/src/main/res/layout/upload_files_layout.xml +++ b/app/src/main/res/layout/upload_files_layout.xml @@ -77,7 +77,10 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/standard_half_margin" android:layout_weight="1" + app:icon="@drawable/ic_close" + app:iconGravity="textStart" android:text="@string/common_cancel" + app:iconTint="@color/text_color" style="@style/OutlinedButton" app:cornerRadius="@dimen/button_corner_radius" /> @@ -86,8 +89,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" + app:icon="@drawable/ic_cut_paste" + app:iconGravity="textStart" android:text="@string/uploader_btn_upload_text" - android:theme="@style/Button.Primary" + style="@style/Button.Primary" app:cornerRadius="@dimen/button_corner_radius" /> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index db1e1d218038..e51fe9edd7db 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -39,4 +39,69 @@ @android:color/white #101418 + + + #FFFFFF + @color/grey_30 + @color/grey_30 + #CCCCCC + @color/grey_70 + @color/grey_80 + #2D2D2D + @color/grey_70 + @color/grey_70 + + + @color/grey_80 + @color/grey_0 + + + @color/grey_80 + @color/grey_0 + + + @color/grey_60 + @color/grey_0 + @color/grey_0 + @color/grey_30 + #FFFFFF + @color/grey_30 + @color/grey_80 + #FFFFFF + + + @color/grey_80 + @color/grey_30 + @color/grey_0 + + + @color/grey_80 + @color/grey_0 + @color/grey_80 + + + @color/grey_70 + @color/grey_60 + + + @color/grey_70 + @color/grey_70 + + + #FFFFFF + @color/grey_30 + @color/grey_0 + @color/grey_0 + @color/grey_0 + @color/grey_0 + @color/grey_60 + @color/grey_0 + #FFFFFF + #7d94f9 + + + #121212 + @color/grey_0 + @color/grey_80 + @color/grey_80 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 36d7459ecdaf..d6171a12a7f0 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -54,7 +54,6 @@ #ffffff #FFFFFF #000000 - @color/color_accent #ffffff #D6D7D7 #000000 @@ -89,4 +88,94 @@ #A5A5A5 #F7F9FF + + + #191919 + @color/primary + #191919 + #191919 + @color/grey_30 + @android:color/white + #FFFFFF + @color/grey_0 + #CCCCCC + #77c4ff + #B3FFFFFF + @color/grey_10 + + + #101010 + #F2F2F2 + #E5E5E5 + #B2B2B2 + #666666 + #4C4C4C + #333333 + + + @color/design_snackbar_background_color + @color/white + + + #FFFFFF + #191919 + + + @color/grey_0 + #191919 + @color/primary + #191919 + @color/primary + @color/grey_30 + @color/white + #191919 + + + #FFFFFF + #191919 + #191919 + + + #FFFFFF + #191919 + #FFFFFF + + + @color/primary + #F399C7 + #FFFFFF + @color/grey_30 + @color/grey_10 + @color/grey_0 + + + @color/primary + @color/grey_30 + @color/grey_30 + #CCCCCC + + + #191919 + @color/grey_30 + #191919 + #191919 + #191919 + #191919 + @color/grey_30 + #191919 + #000000 + #191919 + #F6E5EB + #C16F81 + #0D39DF + #0099ff + #2238df + + + @color/grey_0 + #191919 + @color/grey_0 + @color/grey_30 + #77b6bb + #5077b6bb diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml index b4f8d33b8ebb..607263a4bc49 100644 --- a/app/src/main/res/values/dims.xml +++ b/app/src/main/res/values/dims.xml @@ -133,7 +133,7 @@ 80dp 16sp 18sp - 24dp + 8dp 12dp 160dp 24dp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 17cdbaabca4a..f762eccffcc0 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -178,10 +178,11 @@ +