From 65b930e6939e93005271ae013c883fcb948fb9c9 Mon Sep 17 00:00:00 2001 From: A117870935 Date: Sun, 14 May 2023 14:45:37 +0530 Subject: [PATCH] Customized theme of toolbar and action mode. --- app/src/main/AndroidManifest.xml | 5 +- .../nmc/android/utils/DrawableThemeUtils.kt | 18 +++++++ .../nmc/android/utils/ToolbarThemeUtils.kt | 28 +++++++++++ .../android/ui/activity/DrawerActivity.java | 8 +++- .../ui/activity/ManageSpaceActivity.kt | 7 ++- .../ui/activity/NotificationsActivity.java | 1 + .../android/ui/activity/SettingsActivity.java | 12 ++--- .../android/ui/activity/ToolbarActivity.java | 43 +++++++++-------- .../ui/preview/PreviewImageActivity.java | 48 ++----------------- .../owncloud/android/utils/StringUtils.java | 13 +++++ .../theme/FilesSpecificViewThemeUtils.kt | 23 ++++----- .../res/layout/action_mode_close_layout.xml | 14 ++++++ .../res/layout/preview_image_activity.xml | 21 ++++++-- app/src/main/res/layout/toolbar_standard.xml | 26 +++++++++- app/src/main/res/values-night/colors.xml | 2 + app/src/main/res/values/colors.xml | 4 ++ app/src/main/res/values/styles.xml | 18 ++++++- 17 files changed, 193 insertions(+), 98 deletions(-) create mode 100644 app/src/main/java/com/nmc/android/utils/DrawableThemeUtils.kt create mode 100644 app/src/main/java/com/nmc/android/utils/ToolbarThemeUtils.kt create mode 100644 app/src/main/res/layout/action_mode_close_layout.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 70b85191b406..3507f2797ca5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -217,11 +217,10 @@ + android:theme="@style/Theme.ownCloud" /> + android:exported="false" /> diff --git a/app/src/main/java/com/nmc/android/utils/DrawableThemeUtils.kt b/app/src/main/java/com/nmc/android/utils/DrawableThemeUtils.kt new file mode 100644 index 000000000000..90d87bc6dcd6 --- /dev/null +++ b/app/src/main/java/com/nmc/android/utils/DrawableThemeUtils.kt @@ -0,0 +1,18 @@ +package com.nmc.android.utils + +import android.graphics.drawable.Drawable +import androidx.annotation.ColorInt +import androidx.core.graphics.BlendModeColorFilterCompat +import androidx.core.graphics.BlendModeCompat +import androidx.core.graphics.drawable.DrawableCompat + +object DrawableThemeUtils { + @JvmStatic + fun tintDrawable(drawable: Drawable, @ColorInt color: Int): Drawable { + val wrap: Drawable = DrawableCompat.wrap(drawable) + wrap.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat( + color, BlendModeCompat.SRC_ATOP + ) + return wrap + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nmc/android/utils/ToolbarThemeUtils.kt b/app/src/main/java/com/nmc/android/utils/ToolbarThemeUtils.kt new file mode 100644 index 000000000000..ff9bc380f240 --- /dev/null +++ b/app/src/main/java/com/nmc/android/utils/ToolbarThemeUtils.kt @@ -0,0 +1,28 @@ +package com.nmc.android.utils + +import android.content.Context +import android.graphics.Typeface +import android.text.Spannable +import android.text.style.StyleSpan +import androidx.appcompat.app.ActionBar +import com.owncloud.android.R +import com.owncloud.android.utils.StringUtils + +object ToolbarThemeUtils { + @JvmStatic + fun setColoredTitle(context: Context, actionBar: ActionBar?, title: String) { + if (actionBar != null) { + val text: Spannable = StringUtils.getColorSpan(title, context.resources.getColor(R.color.fontAppbar, null)) + + //bold the magenta from MagentaCLOUD title + if (title.contains(context.resources.getString(R.string.app_name))) { + // TODO: 05/10/23 Update it once Splash PR is merged + val textToBold = "Next" //context.getResources().getString(R.string.project_name); + val indexStart = title.indexOf(textToBold) + val indexEnd = indexStart + textToBold.length + text.setSpan(StyleSpan(Typeface.BOLD), indexStart, indexEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) + } + actionBar.title = text + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java index 9a3d87ac5854..f710b052865b 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java @@ -73,6 +73,7 @@ import com.nextcloud.common.NextcloudClient; import com.nextcloud.java.util.Optional; import com.nextcloud.ui.ChooseAccountDialogFragment; +import com.nmc.android.utils.DrawableThemeUtils; import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.authentication.PassCodeManager; @@ -281,8 +282,11 @@ public void onDrawerOpened(View drawerView) { Drawable backArrow = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_arrow_back, null); - - viewThemeUtils.platform.tintToolbarArrowDrawable(this, mDrawerToggle, backArrow); + // custom color for back arrow required for NMC + if (backArrow != null) { + mDrawerToggle.setHomeAsUpIndicator(DrawableThemeUtils.tintDrawable(backArrow, getResources().getColor(R.color.fontAppbar, null))); + mDrawerToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.fontAppbar, null)); + } } /** diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt index dc2c56bd58a5..289cb875e55d 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.kt @@ -31,6 +31,7 @@ import com.nextcloud.client.di.Injectable import com.nextcloud.client.preferences.AppPreferences import com.owncloud.android.R import com.owncloud.android.lib.common.utils.Log_OC +import com.owncloud.android.utils.theme.ViewThemeUtils import java.io.File import javax.inject.Inject import kotlin.system.exitProcess @@ -43,13 +44,17 @@ class ManageSpaceActivity : AppCompatActivity(), Injectable { @Inject lateinit var userAccountManager: UserAccountManager + @Inject + lateinit var viewThemeUtils: ViewThemeUtils + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_manage_space) val actionBar = supportActionBar if (actionBar != null) { actionBar.setDisplayHomeAsUpEnabled(true) - actionBar.setTitle(R.string.manage_space_title) + //NMC Customisation + viewThemeUtils.files.themeActionBar(this, actionBar, R.string.manage_space_title) } val descriptionTextView = findViewById(R.id.general_description) descriptionTextView.text = getString(R.string.manage_space_description, getString(R.string.app_name)) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java index 4308de3b8b3a..767303c678c6 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java @@ -98,6 +98,7 @@ protected void onCreate(Bundle savedInstanceState) { // setup toolbar setupToolbar(); + showHideDefaultToolbarDivider(true); updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_item_notifications)); diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java index b6801be56011..eefb45787134 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java @@ -33,6 +33,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; +import android.graphics.drawable.ColorDrawable; import android.net.Uri; import android.os.Bundle; import android.preference.ListPreference; @@ -96,7 +97,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatDelegate; import androidx.core.content.ContextCompat; -import androidx.core.content.res.ResourcesCompat; /** * An Activity that allows the user to change the application's settings. @@ -857,12 +857,10 @@ private void setupActionBar() { actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setDisplayShowTitleEnabled(true); if (this.getResources() != null) { - viewThemeUtils.androidx.themeActionBar(this, - actionBar, - getString(R.string.actionbar_settings), - ResourcesCompat.getDrawable(this.getResources(), - R.drawable.ic_arrow_back, - null)); + //custom color for back arrow for NMC + viewThemeUtils.files.themeActionBar(this, actionBar, getResources().getString(R.string.actionbar_settings)); + //required for NMC + actionBar.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.bg_default, null))); } } } diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java index a6512ca79cb8..c26204ce73b1 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java @@ -28,6 +28,7 @@ import android.annotation.SuppressLint; import android.graphics.Bitmap; import android.graphics.Color; +import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.view.View; import android.widget.FrameLayout; @@ -42,9 +43,11 @@ import com.google.android.material.card.MaterialCardView; import com.google.android.material.textview.MaterialTextView; import com.nextcloud.client.di.Injectable; +import com.nmc.android.utils.ToolbarThemeUtils; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.utils.StringUtils; import com.owncloud.android.utils.theme.ThemeColorUtils; import com.owncloud.android.utils.theme.ThemeUtils; import com.owncloud.android.utils.theme.ViewThemeUtils; @@ -74,6 +77,7 @@ public abstract class ToolbarActivity extends BaseActivity implements Injectable private LinearLayout mInfoBox; private TextView mInfoBoxMessage; protected AppCompatSpinner mToolbarSpinner; + private View mDefaultToolbarDivider; private boolean isHomeSearchToolbarShow = false; @Inject public ThemeColorUtils themeColorUtils; @@ -94,6 +98,7 @@ private void setupToolbar(boolean isHomeSearchToolbarShow, boolean showSortListB mMenuButton = findViewById(R.id.menu_button); mSearchText = findViewById(R.id.search_text); mSwitchAccountButton = findViewById(R.id.switch_account_button); + mDefaultToolbarDivider = findViewById(R.id.default_toolbar_divider); if (showSortListButtonGroup) { findViewById(R.id.sort_list_button_group).setVisibility(View.VISIBLE); @@ -110,8 +115,10 @@ private void setupToolbar(boolean isHomeSearchToolbarShow, boolean showSortListB mToolbarSpinner = findViewById(R.id.toolbar_spinner); - viewThemeUtils.material.themeToolbar(mToolbar); - viewThemeUtils.material.colorToolbarOverflowIcon(mToolbar); + // custom color for overflow icon required for NMC + if (mToolbar.getOverflowIcon() != null) { + mToolbar.getOverflowIcon().setColorFilter(getResources().getColor(R.color.fontAppbar, null), PorterDuff.Mode.SRC_ATOP); + } viewThemeUtils.platform.themeStatusBar(this); viewThemeUtils.material.colorMaterialTextButton(mSwitchAccountButton); } @@ -158,22 +165,15 @@ private void showHomeSearchToolbar(String title, boolean isRoot) { @SuppressLint("PrivateResource") private void showHomeSearchToolbar(boolean isShow) { - viewThemeUtils.material.themeToolbar(mToolbar); - if (isShow) { - viewThemeUtils.platform.resetStatusBar(this); - mAppBar.setStateListAnimator(AnimatorInflater.loadStateListAnimator(mAppBar.getContext(), - R.animator.appbar_elevation_off)); - mDefaultToolbar.setVisibility(View.GONE); - mHomeSearchToolbar.setVisibility(View.VISIBLE); - viewThemeUtils.material.themeCardView(mHomeSearchToolbar); - viewThemeUtils.material.themeSearchBarText(mSearchText); - } else { - mAppBar.setStateListAnimator(AnimatorInflater.loadStateListAnimator(mAppBar.getContext(), - R.animator.appbar_elevation_on)); - viewThemeUtils.platform.themeStatusBar(this); - mDefaultToolbar.setVisibility(View.VISIBLE); - mHomeSearchToolbar.setVisibility(View.GONE); - } + mAppBar.setStateListAnimator(AnimatorInflater.loadStateListAnimator(mAppBar.getContext(), + R.animator.appbar_elevation_on)); + viewThemeUtils.platform.themeStatusBar(this); + mDefaultToolbar.setVisibility(View.VISIBLE); + mHomeSearchToolbar.setVisibility(View.GONE); + } + + public void showHideDefaultToolbarDivider(boolean isShow) { + mDefaultToolbarDivider.setVisibility(isShow ? View.VISIBLE : View.GONE); } /** @@ -191,7 +191,8 @@ public void updateActionBarTitleAndHomeButtonByString(String title) { // set home button properties if (actionBar != null) { - actionBar.setTitle(titleToSet); + //custom styling for action bar title required for NMC + ToolbarThemeUtils.setColoredTitle(this, actionBar, titleToSet); actionBar.setDisplayShowTitleEnabled(true); } } @@ -284,8 +285,8 @@ public FrameLayout getPreviewImageContainer() { public void updateToolbarSubtitle(@NonNull String subtitle) { ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { - actionBar.setSubtitle(subtitle); - viewThemeUtils.androidx.themeActionBarSubtitle(this, actionBar); + //required for NMC + actionBar.setSubtitle(StringUtils.getColorSpan(subtitle, getResources().getColor(R.color.fontAppbar, null))); } } diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java index df1ac4616bc3..d83af23c767b 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -92,7 +92,6 @@ public class PreviewImageActivity extends FileActivity implements private boolean mHasSavedPosition; private boolean mRequestWaitingForBinder; private DownloadFinishReceiver mDownloadFinishReceiver; - private View mFullScreenAnchorView; @Inject AppPreferences preferences; @Inject LocalBroadcastManager localBroadcastManager; @@ -115,6 +114,7 @@ protected void onCreate(Bundle savedInstanceState) { } setContentView(R.layout.preview_image_activity); + setupToolbar(); // Navigation Drawer setupDrawer(); @@ -127,7 +127,6 @@ protected void onCreate(Bundle savedInstanceState) { actionBar.setDisplayHomeAsUpEnabled(true); } - mFullScreenAnchorView = getWindow().getDecorView(); // to keep our UI controls visibility in line with system bars visibility setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED); @@ -206,7 +205,7 @@ public void onStart() { if (file != null) { /// Refresh the activity according to the Account and OCFile set setFile(file); // reset after getting it fresh from storageManager - getSupportActionBar().setTitle(getFile().getFileName()); + updateActionBarTitleAndHomeButton(getFile()); //if (!stateWasRecovered) { initViewPager(optionalUser.get()); //} @@ -395,9 +394,7 @@ public void onPageSelected(int position) { OCFile currentFile = mPreviewImagePagerAdapter.getFileAt(position); if (currentFile != null) { - if (getSupportActionBar() != null) { - getSupportActionBar().setTitle(currentFile.getFileName()); - } + updateActionBarTitleAndHomeButton(currentFile); setDrawerIndicatorEnabled(false); if (currentFile.isEncrypted() && !currentFile.isDown() && @@ -479,22 +476,7 @@ public boolean isSystemUIVisible() { } public void toggleFullScreen() { - boolean visible = (mFullScreenAnchorView.getSystemUiVisibility() - & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0; - - if (visible) { - hideSystemUI(mFullScreenAnchorView); - // actionBar.hide(); // propagated through - // OnSystemUiVisibilityChangeListener() - } else { - showSystemUI(mFullScreenAnchorView); - // actionBar.show(); // propagated through - // OnSystemUiVisibilityChangeListener() - } - } - - public void switchToFullScreen() { - hideSystemUI(mFullScreenAnchorView); + //do nothing for NMC } @Override @@ -508,26 +490,4 @@ public void onTransferStateChanged(OCFile file, boolean downloading, boolean upl // TODO Auto-generated method stub } - - - @SuppressLint("InlinedApi") - private void hideSystemUI(View anchorView) { - anchorView.setSystemUiVisibility( - View.SYSTEM_UI_FLAG_HIDE_NAVIGATION // hides NAVIGATION BAR; Android >= 4.0 - | View.SYSTEM_UI_FLAG_FULLSCREEN // hides STATUS BAR; Android >= 4.1 - | View.SYSTEM_UI_FLAG_IMMERSIVE // stays interactive; Android >= 4.4 - | View.SYSTEM_UI_FLAG_LAYOUT_STABLE // draw full window; Android >= 4.1 - | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN // draw full window; Android >= 4.1 - | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION // draw full window; Android >= 4.1 - ); - } - - @SuppressLint("InlinedApi") - private void showSystemUI(View anchorView) { - anchorView.setSystemUiVisibility( - View.SYSTEM_UI_FLAG_LAYOUT_STABLE // draw full window; Android >= 4.1 - | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN // draw full window; Android >= 4.1 - | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION // draw full window; Android >= 4. - ); - } } diff --git a/app/src/main/java/com/owncloud/android/utils/StringUtils.java b/app/src/main/java/com/owncloud/android/utils/StringUtils.java index 5c6871dcab73..cab320ee9901 100644 --- a/app/src/main/java/com/owncloud/android/utils/StringUtils.java +++ b/app/src/main/java/com/owncloud/android/utils/StringUtils.java @@ -21,6 +21,10 @@ package com.owncloud.android.utils; +import android.text.Spannable; +import android.text.SpannableString; +import android.text.style.ForegroundColorSpan; + import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -69,6 +73,15 @@ String searchAndColor(@Nullable String text, @Nullable String searchText, } } + public static Spannable getColorSpan(@NonNull String title, @ColorInt int color) { + Spannable text = new SpannableString(title); + text.setSpan(new ForegroundColorSpan(color), + 0, + text.length(), + Spannable.SPAN_INCLUSIVE_INCLUSIVE); + return text; + } + public static @NonNull String removePrefix(@NonNull String s, @NonNull String prefix) { diff --git a/app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt b/app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt index 2d728aca05f3..287d34882509 100644 --- a/app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt +++ b/app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt @@ -44,6 +44,8 @@ import com.nextcloud.android.common.ui.theme.ViewThemeUtilsBase import com.nextcloud.android.common.ui.theme.utils.AndroidViewThemeUtils import com.nextcloud.android.common.ui.theme.utils.AndroidXViewThemeUtils import com.nextcloud.utils.view.FastScrollPopupBackground +import com.nmc.android.utils.DrawableThemeUtils +import com.nmc.android.utils.ToolbarThemeUtils import com.owncloud.android.R import com.owncloud.android.lib.common.utils.Log_OC import com.owncloud.android.lib.resources.shares.ShareType @@ -150,18 +152,11 @@ class FilesSpecificViewThemeUtils @Inject constructor( // TODO move back arrow resource to lib and use lib method directly? @JvmOverloads fun themeActionBar(context: Context, actionBar: ActionBar, title: String, isMenu: Boolean = false) { - val icon = getHomeAsUpIcon(isMenu) - val backArrow = ResourcesCompat.getDrawable( - context.resources, - icon, - null - )!! - androidXViewThemeUtils.themeActionBar( - context, - actionBar, - title, - backArrow - ) + //custom styling for action bar title required for NMC + ToolbarThemeUtils.setColoredTitle(context, actionBar, title) + + //custom color for back arrow for NMC + themeActionBar(context, actionBar, isMenu) } /** @@ -188,7 +183,9 @@ class FilesSpecificViewThemeUtils @Inject constructor( getHomeAsUpIcon(isMenu), null )!! - androidXViewThemeUtils.themeActionBar(context, actionBar, backArrow) + + //custom color for back arrow for NMC + actionBar.setHomeAsUpIndicator(DrawableThemeUtils.tintDrawable(backArrow, context.resources.getColor(R.color.fontAppbar, null))) } fun themeTemplateCardView(cardView: MaterialCardView) { diff --git a/app/src/main/res/layout/action_mode_close_layout.xml b/app/src/main/res/layout/action_mode_close_layout.xml new file mode 100644 index 000000000000..36e355cb18c3 --- /dev/null +++ b/app/src/main/res/layout/action_mode_close_layout.xml @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/app/src/main/res/layout/preview_image_activity.xml b/app/src/main/res/layout/preview_image_activity.xml index 8f7106ae9d3e..b93592ad0042 100644 --- a/app/src/main/res/layout/preview_image_activity.xml +++ b/app/src/main/res/layout/preview_image_activity.xml @@ -18,15 +18,26 @@ --> - + + + + + + + + + + @@ -110,7 +126,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="@color/appbar" + android:background="@color/bg_default" android:theme="@style/Theme.ToolbarTheme" tools:visibility="gone"> @@ -123,6 +139,14 @@ app:popupTheme="@style/Theme.AppCompat.DayNight.NoActionBar" /> + + diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 08bf64d552ad..e6ab5f84f2bd 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -24,6 +24,7 @@ #000000 #ff6F6F6F #A5A5A5 + @color/grey_70 #222222 @@ -48,4 +49,5 @@ #1E1E1E @android:color/white + @color/grey_70 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f844b3156f33..cf643f915386 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -32,12 +32,15 @@ #EEEEEE #00000000 #666666 + @color/grey_30 #e53935 #757575 #222222 #EEEEEE + #B2B2B2 + #4C4C4C #BDBDBD #666666 @@ -80,5 +83,6 @@ @android:color/white #666666 + #CCCCCC #A5A5A5 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c95797f2b65a..a20cf78f68e1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -39,6 +39,11 @@ @color/bg_default @style/Widget.App.TextInputLayout @dimen/dialogBorderRadius + + @color/primary + + @drawable/ic_arrow_back + @drawable/ic_arrow_back