From 89ef62e1d58ae17eb925e166ccac13ce29e548ef Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 24 Jun 2021 10:19:02 +0200 Subject: [PATCH] Fix compile after v1.1.10 merge Change-Id: I2c5395044d0a3d1cd8005c1f2f8fface38b45c22 --- .../src/main/res/values-v23/theme_sc.xml | 0 .../src/main/res/values-v27/theme_sc.xml | 0 .../src/main/res/values/colors_sc.xml | 0 .../src/main/res/values/styles_sc.xml | 10 +++++----- .../src/main/res/values/theme_dark.xml | 1 - .../src/main/res/values/theme_light.xml | 1 - .../src/main/res/values/theme_sc.xml | 16 +++------------ .../src/main/res/values/theme_sc_light.xml | 2 +- vector/src/main/AndroidManifest.xml | 2 +- .../app/features/home/HomeDetailFragment.kt | 20 ++++++++++++------- .../login/PromptSimplifiedModeActivity.kt | 4 ++-- .../fragment_login_server_selection.xml | 8 ++++---- .../fragment_prompt_simplified_mode.xml | 16 ++++++++------- vector/src/main/res/values/attrs_sc.xml | 5 ----- 14 files changed, 38 insertions(+), 47 deletions(-) rename {vector => library/ui-styles}/src/main/res/values-v23/theme_sc.xml (100%) rename {vector => library/ui-styles}/src/main/res/values-v27/theme_sc.xml (100%) rename {vector => library/ui-styles}/src/main/res/values/colors_sc.xml (100%) rename {vector => library/ui-styles}/src/main/res/values/styles_sc.xml (80%) rename {vector => library/ui-styles}/src/main/res/values/theme_sc.xml (89%) rename {vector => library/ui-styles}/src/main/res/values/theme_sc_light.xml (97%) diff --git a/vector/src/main/res/values-v23/theme_sc.xml b/library/ui-styles/src/main/res/values-v23/theme_sc.xml similarity index 100% rename from vector/src/main/res/values-v23/theme_sc.xml rename to library/ui-styles/src/main/res/values-v23/theme_sc.xml diff --git a/vector/src/main/res/values-v27/theme_sc.xml b/library/ui-styles/src/main/res/values-v27/theme_sc.xml similarity index 100% rename from vector/src/main/res/values-v27/theme_sc.xml rename to library/ui-styles/src/main/res/values-v27/theme_sc.xml diff --git a/vector/src/main/res/values/colors_sc.xml b/library/ui-styles/src/main/res/values/colors_sc.xml similarity index 100% rename from vector/src/main/res/values/colors_sc.xml rename to library/ui-styles/src/main/res/values/colors_sc.xml diff --git a/vector/src/main/res/values/styles_sc.xml b/library/ui-styles/src/main/res/values/styles_sc.xml similarity index 80% rename from vector/src/main/res/values/styles_sc.xml rename to library/ui-styles/src/main/res/values/styles_sc.xml index 71d0272a99..950cfbfd78 100644 --- a/vector/src/main/res/values/styles_sc.xml +++ b/library/ui-styles/src/main/res/values/styles_sc.xml @@ -1,7 +1,7 @@ - - - - -