From a8e05bbc078ddee92b329d2b370894e44e73b8fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bojan=20Komljenovic=CC=81?= Date: Sat, 15 Aug 2020 14:02:37 +0200 Subject: [PATCH 01/13] Cleanup resources --- build.gradle | 28 +++++++++---------- dependencies.gradle | 14 +++++----- sample/build.gradle | 2 +- ui-no-op/build.gradle | 2 +- ui/build.gradle | 2 +- .../collar/ui/presentation/CollarActivity.kt | 7 ++--- .../inapp/InAppNotificationProvider.kt | 17 +++++------ .../inapp/snackbar/CollarSnackbar.kt | 5 ++-- .../inapp/snackbar/CollarSnackbarView.kt | 7 +++-- .../res/drawable-night/collar_ic_clear.xml | 9 ------ .../drawable-night/collar_ic_event_detail.xml | 9 ------ .../drawable-night/collar_ic_event_menu.xml | 9 ------ .../res/drawable-night/collar_ic_filter.xml | 9 ------ .../res/drawable-night/collar_ic_logo.xml | 10 ------- .../collar_ic_notifications_inapp.xml | 12 -------- .../collar_ic_notifications_system.xml | 9 ------ .../collar_ic_property_detail.xml | 9 ------ .../collar_ic_screen_detail.xml | 9 ------ .../drawable-night/collar_ic_screen_menu.xml | 9 ------ .../res/drawable-night/collar_ic_search.xml | 9 ------ .../res/drawable-night/collar_ic_settings.xml | 9 ------ .../res/drawable/collar_decoration_dot.xml | 5 ++-- ui/src/main/res/drawable/collar_ic_clear.xml | 2 +- ui/src/main/res/drawable/collar_ic_event.xml | 2 +- .../res/drawable/collar_ic_event_menu.xml | 9 ------ ...t_detail.xml => collar_ic_event_white.xml} | 2 +- ui/src/main/res/drawable/collar_ic_filter.xml | 2 +- ui/src/main/res/drawable/collar_ic_logo.xml | 2 +- .../res/drawable/collar_ic_notification.xml | 5 +--- .../collar_ic_notifications_inapp.xml | 18 ++++-------- .../collar_ic_notifications_system.xml | 2 +- .../main/res/drawable/collar_ic_property.xml | 2 +- .../drawable/collar_ic_property_detail.xml | 9 ------ .../res/drawable/collar_ic_property_menu.xml | 9 ------ .../collar_ic_property_white.xml} | 2 +- ui/src/main/res/drawable/collar_ic_screen.xml | 2 +- .../res/drawable/collar_ic_screen_menu.xml | 9 ------ ..._detail.xml => collar_ic_screen_white.xml} | 2 +- ui/src/main/res/drawable/collar_ic_search.xml | 2 +- .../main/res/drawable/collar_ic_settings.xml | 2 +- ... => collar_shape_background_item_line.xml} | 2 +- ... => collar_shape_background_item_type.xml} | 2 +- .../collar_shape_background_property.xml | 10 ------- .../collar_shape_background_screen.xml | 10 ------- .../collar_shape_background_unknown.xml | 10 ------- .../res/layout/collar_activity_collar.xml | 4 ++- ui/src/main/res/layout/collar_item_event.xml | 11 ++++---- .../main/res/layout/collar_item_property.xml | 12 ++++---- ui/src/main/res/layout/collar_item_screen.xml | 15 +++++----- .../main/res/layout/collar_view_snackbar.xml | 6 ++-- ui/src/main/res/menu/collar_menu.xml | 6 ++-- ui/src/main/res/values-night/colors.xml | 16 ++--------- ui/src/main/res/values-night/themes.xml | 20 ------------- ui/src/main/res/values/colors.xml | 14 ++++------ ui/src/main/res/values/themes.xml | 9 ------ 55 files changed, 101 insertions(+), 330 deletions(-) delete mode 100644 ui/src/main/res/drawable-night/collar_ic_clear.xml delete mode 100644 ui/src/main/res/drawable-night/collar_ic_event_detail.xml delete mode 100644 ui/src/main/res/drawable-night/collar_ic_event_menu.xml delete mode 100644 ui/src/main/res/drawable-night/collar_ic_filter.xml delete mode 100644 ui/src/main/res/drawable-night/collar_ic_logo.xml delete mode 100644 ui/src/main/res/drawable-night/collar_ic_notifications_inapp.xml delete mode 100644 ui/src/main/res/drawable-night/collar_ic_notifications_system.xml delete mode 100644 ui/src/main/res/drawable-night/collar_ic_property_detail.xml delete mode 100644 ui/src/main/res/drawable-night/collar_ic_screen_detail.xml delete mode 100644 ui/src/main/res/drawable-night/collar_ic_screen_menu.xml delete mode 100644 ui/src/main/res/drawable-night/collar_ic_search.xml delete mode 100644 ui/src/main/res/drawable-night/collar_ic_settings.xml delete mode 100644 ui/src/main/res/drawable/collar_ic_event_menu.xml rename ui/src/main/res/drawable/{collar_ic_event_detail.xml => collar_ic_event_white.xml} (92%) delete mode 100644 ui/src/main/res/drawable/collar_ic_property_detail.xml delete mode 100644 ui/src/main/res/drawable/collar_ic_property_menu.xml rename ui/src/main/res/{drawable-night/collar_ic_property_menu.xml => drawable/collar_ic_property_white.xml} (91%) delete mode 100644 ui/src/main/res/drawable/collar_ic_screen_menu.xml rename ui/src/main/res/drawable/{collar_ic_screen_detail.xml => collar_ic_screen_white.xml} (86%) rename ui/src/main/res/drawable/{collar_shape_background_icon.xml => collar_shape_background_item_line.xml} (78%) rename ui/src/main/res/drawable/{collar_shape_background_event.xml => collar_shape_background_item_type.xml} (80%) delete mode 100644 ui/src/main/res/drawable/collar_shape_background_property.xml delete mode 100644 ui/src/main/res/drawable/collar_shape_background_screen.xml delete mode 100644 ui/src/main/res/drawable/collar_shape_background_unknown.xml delete mode 100644 ui/src/main/res/values-night/themes.xml diff --git a/build.gradle b/build.gradle index ec2ccdcf..16113deb 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { "compileSdk": 29, "targetSdk" : 29, - "buildTools": "29.0.3" + "buildTools": "30.0.1" ] apply from: "dependencies.gradle" @@ -36,19 +36,19 @@ allprojects { maven { url "https://dl.bintray.com/infinum/android" } } -// configurations.all { -// resolutionStrategy { -// dependencySubstitution { -// substitute module(packages.collar.annotations) with project(':annotations') -// substitute module(packages.collar.core) with project(':core') -// substitute module(packages.collar.ui) with project(':ui') -// substitute module(packages.collar.ui_no_op) with project(':ui-no-op') -// substitute module(packages.collar.processor) with project(':processor') -// substitute module(packages.collar.generator) with project(':generator') -// substitute module(packages.collar.plugin) with project(':plugin') -// } -// } -// } + configurations.all { + resolutionStrategy { + dependencySubstitution { + substitute module(packages.collar.annotations) with project(':annotations') + substitute module(packages.collar.core) with project(':core') + substitute module(packages.collar.ui) with project(':ui') + substitute module(packages.collar.ui_no_op) with project(':ui-no-op') + substitute module(packages.collar.processor) with project(':processor') + substitute module(packages.collar.generator) with project(':generator') + substitute module(packages.collar.plugin) with project(':plugin') + } + } + } } subprojects { diff --git a/dependencies.gradle b/dependencies.gradle index 72d1bc10..fd45b857 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -6,23 +6,23 @@ ext.collar = [ ext.versions = [ "collar" : "1.1.5", - "gradle" : '3.6.3', - "kotlin" : "1.3.72", + "gradle" : "4.0.1", + "kotlin" : "1.4.0", "poet" : "1.5.0", "poet_metadata": "1.5.0", "annotations" : "19.0.0", "incap" : "0.2", "bintray" : "1.8.5", - "core" : "1.2.0", - "appcompat" : "1.1.0", - "fragment" : "1.2.4", + "core" : "1.3.1", + "appcompat" : "1.2.0", + "fragment" : "1.2.5", "lifecycle" : "2.2.0", "viewmodel" : "2.2.0", "livedata" : "2.2.0", "recyclerview" : "1.1.0", "room" : "2.2.5", - "design" : "1.1.0", - "moshi" : "1.9.2", + "design" : "1.2.0", + "moshi" : "1.9.3", "maven" : "2.0", "detekt" : "1.7.4", "dokka" : "0.10.1" diff --git a/sample/build.gradle b/sample/build.gradle index d7af1b9a..71db29d3 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -55,7 +55,7 @@ android { test.java.srcDirs += 'src/test/kotlin' } - viewBinding.enabled = true + buildFeatures.viewBinding = true } dependencies { diff --git a/ui-no-op/build.gradle b/ui-no-op/build.gradle index 6ee72066..22b36dfc 100644 --- a/ui-no-op/build.gradle +++ b/ui-no-op/build.gradle @@ -28,7 +28,7 @@ android { test.java.srcDirs += 'src/test/kotlin' } - viewBinding.enabled = true + buildFeatures.viewBinding = true } dependencies { diff --git a/ui/build.gradle b/ui/build.gradle index 1f4e6db7..018620f5 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -46,7 +46,7 @@ android { it.java.srcDirs += "src/$it.name/kotlin" } - viewBinding.enabled = true + buildFeatures.viewBinding = true } dependencies { diff --git a/ui/src/main/kotlin/co/infinum/collar/ui/presentation/CollarActivity.kt b/ui/src/main/kotlin/co/infinum/collar/ui/presentation/CollarActivity.kt index 2f054659..a85d0bb7 100644 --- a/ui/src/main/kotlin/co/infinum/collar/ui/presentation/CollarActivity.kt +++ b/ui/src/main/kotlin/co/infinum/collar/ui/presentation/CollarActivity.kt @@ -12,7 +12,6 @@ import androidx.core.app.ShareCompat import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider -import androidx.lifecycle.observe import androidx.recyclerview.widget.LinearLayoutManager import co.infinum.collar.ui.R import co.infinum.collar.ui.data.models.local.CollarEntity @@ -167,9 +166,9 @@ internal class CollarActivity : AppCompatActivity() { detailDialog = MaterialAlertDialogBuilder(this) .setIcon( when (entity.type) { - EntityType.SCREEN -> R.drawable.collar_ic_screen_detail - EntityType.EVENT -> R.drawable.collar_ic_event_detail - EntityType.PROPERTY -> R.drawable.collar_ic_property_detail + EntityType.SCREEN -> R.drawable.collar_ic_screen + EntityType.EVENT -> R.drawable.collar_ic_event + EntityType.PROPERTY -> R.drawable.collar_ic_property else -> 0 } ) diff --git a/ui/src/main/kotlin/co/infinum/collar/ui/presentation/notifications/inapp/InAppNotificationProvider.kt b/ui/src/main/kotlin/co/infinum/collar/ui/presentation/notifications/inapp/InAppNotificationProvider.kt index 0cd6a7fe..d3e63c68 100644 --- a/ui/src/main/kotlin/co/infinum/collar/ui/presentation/notifications/inapp/InAppNotificationProvider.kt +++ b/ui/src/main/kotlin/co/infinum/collar/ui/presentation/notifications/inapp/InAppNotificationProvider.kt @@ -4,6 +4,7 @@ import android.app.Activity import android.app.Application import android.content.Context import android.view.View +import androidx.annotation.ColorRes import androidx.annotation.DrawableRes import androidx.core.app.ShareCompat import co.infinum.collar.ui.R @@ -33,8 +34,8 @@ internal class InAppNotificationProvider( override fun showScreen(entity: CollarEntity) { buildNotification( callbacks.currentActivity, - R.drawable.collar_shape_background_screen, - R.drawable.collar_ic_screen, + R.color.collar_color_screen, + R.drawable.collar_ic_screen_white, entity ) } @@ -42,8 +43,8 @@ internal class InAppNotificationProvider( override fun showEvent(entity: CollarEntity) { buildNotification( callbacks.currentActivity, - R.drawable.collar_shape_background_event, - R.drawable.collar_ic_event, + R.color.collar_color_event, + R.drawable.collar_ic_event_white, entity ) } @@ -51,21 +52,21 @@ internal class InAppNotificationProvider( override fun showProperty(entity: CollarEntity) { buildNotification( callbacks.currentActivity, - R.drawable.collar_shape_background_property, - R.drawable.collar_ic_property, + R.color.collar_color_property, + R.drawable.collar_ic_property_white, entity ) } private fun buildNotification( activity: Activity?, - @DrawableRes background: Int, + @ColorRes backgroundTint: Int, @DrawableRes icon: Int, entity: CollarEntity ) { CollarSnackbar.make( activity?.findViewById(android.R.id.content), - background, + backgroundTint, icon, entity.name, entity.parameters, diff --git a/ui/src/main/kotlin/co/infinum/collar/ui/presentation/notifications/inapp/snackbar/CollarSnackbar.kt b/ui/src/main/kotlin/co/infinum/collar/ui/presentation/notifications/inapp/snackbar/CollarSnackbar.kt index da654501..c1ad9359 100644 --- a/ui/src/main/kotlin/co/infinum/collar/ui/presentation/notifications/inapp/snackbar/CollarSnackbar.kt +++ b/ui/src/main/kotlin/co/infinum/collar/ui/presentation/notifications/inapp/snackbar/CollarSnackbar.kt @@ -3,6 +3,7 @@ package co.infinum.collar.ui.presentation.notifications.inapp.snackbar import android.view.View import android.view.ViewGroup import android.widget.FrameLayout +import androidx.annotation.ColorRes import androidx.annotation.DrawableRes import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.ContextCompat @@ -25,7 +26,7 @@ internal class CollarSnackbar( @Suppress("LongParameterList") fun make( parentLayout: FrameLayout?, - @DrawableRes background: Int, + @ColorRes backgroundTint: Int, @DrawableRes icon: Int, title: String?, message: String?, @@ -35,7 +36,7 @@ internal class CollarSnackbar( parentLayout?.let { CollarSnackbarView(it.context) .apply { - setIconBackgroundResource(background) + setIconBackgroundTint(backgroundTint) setIconResource(icon) setTitle(title) setValue(message) diff --git a/ui/src/main/kotlin/co/infinum/collar/ui/presentation/notifications/inapp/snackbar/CollarSnackbarView.kt b/ui/src/main/kotlin/co/infinum/collar/ui/presentation/notifications/inapp/snackbar/CollarSnackbarView.kt index 16c7a671..8ca40e67 100644 --- a/ui/src/main/kotlin/co/infinum/collar/ui/presentation/notifications/inapp/snackbar/CollarSnackbarView.kt +++ b/ui/src/main/kotlin/co/infinum/collar/ui/presentation/notifications/inapp/snackbar/CollarSnackbarView.kt @@ -1,10 +1,13 @@ package co.infinum.collar.ui.presentation.notifications.inapp.snackbar import android.content.Context +import android.content.res.ColorStateList import android.util.AttributeSet import android.view.LayoutInflater import android.widget.FrameLayout +import androidx.annotation.ColorRes import androidx.annotation.DrawableRes +import androidx.core.content.ContextCompat import co.infinum.collar.ui.CollarUi import co.infinum.collar.ui.databinding.CollarViewSnackbarBinding import com.google.android.material.snackbar.ContentViewCallback @@ -45,8 +48,8 @@ internal class CollarSnackbarView @JvmOverloads constructor( } } - fun setIconBackgroundResource(@DrawableRes drawableResId: Int) { - viewBinding.iconView.setBackgroundResource(drawableResId) + fun setIconBackgroundTint(@ColorRes colorResId: Int) { + viewBinding.iconView.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(context, colorResId)) } fun setIconResource(@DrawableRes drawableResId: Int) { diff --git a/ui/src/main/res/drawable-night/collar_ic_clear.xml b/ui/src/main/res/drawable-night/collar_ic_clear.xml deleted file mode 100644 index a6187c8f..00000000 --- a/ui/src/main/res/drawable-night/collar_ic_clear.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/ui/src/main/res/drawable-night/collar_ic_event_detail.xml b/ui/src/main/res/drawable-night/collar_ic_event_detail.xml deleted file mode 100644 index fda59c6b..00000000 --- a/ui/src/main/res/drawable-night/collar_ic_event_detail.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ui/src/main/res/drawable-night/collar_ic_event_menu.xml b/ui/src/main/res/drawable-night/collar_ic_event_menu.xml deleted file mode 100644 index fda59c6b..00000000 --- a/ui/src/main/res/drawable-night/collar_ic_event_menu.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ui/src/main/res/drawable-night/collar_ic_filter.xml b/ui/src/main/res/drawable-night/collar_ic_filter.xml deleted file mode 100644 index e4fc8b68..00000000 --- a/ui/src/main/res/drawable-night/collar_ic_filter.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ui/src/main/res/drawable-night/collar_ic_logo.xml b/ui/src/main/res/drawable-night/collar_ic_logo.xml deleted file mode 100644 index a4871dd3..00000000 --- a/ui/src/main/res/drawable-night/collar_ic_logo.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/ui/src/main/res/drawable-night/collar_ic_notifications_inapp.xml b/ui/src/main/res/drawable-night/collar_ic_notifications_inapp.xml deleted file mode 100644 index 8e67d434..00000000 --- a/ui/src/main/res/drawable-night/collar_ic_notifications_inapp.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/ui/src/main/res/drawable-night/collar_ic_notifications_system.xml b/ui/src/main/res/drawable-night/collar_ic_notifications_system.xml deleted file mode 100644 index 02f99be9..00000000 --- a/ui/src/main/res/drawable-night/collar_ic_notifications_system.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/ui/src/main/res/drawable-night/collar_ic_property_detail.xml b/ui/src/main/res/drawable-night/collar_ic_property_detail.xml deleted file mode 100644 index 0d1e755c..00000000 --- a/ui/src/main/res/drawable-night/collar_ic_property_detail.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ui/src/main/res/drawable-night/collar_ic_screen_detail.xml b/ui/src/main/res/drawable-night/collar_ic_screen_detail.xml deleted file mode 100644 index 3b85cd49..00000000 --- a/ui/src/main/res/drawable-night/collar_ic_screen_detail.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ui/src/main/res/drawable-night/collar_ic_screen_menu.xml b/ui/src/main/res/drawable-night/collar_ic_screen_menu.xml deleted file mode 100644 index 3b85cd49..00000000 --- a/ui/src/main/res/drawable-night/collar_ic_screen_menu.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ui/src/main/res/drawable-night/collar_ic_search.xml b/ui/src/main/res/drawable-night/collar_ic_search.xml deleted file mode 100644 index eb90d030..00000000 --- a/ui/src/main/res/drawable-night/collar_ic_search.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ui/src/main/res/drawable-night/collar_ic_settings.xml b/ui/src/main/res/drawable-night/collar_ic_settings.xml deleted file mode 100644 index 9e65421f..00000000 --- a/ui/src/main/res/drawable-night/collar_ic_settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ui/src/main/res/drawable/collar_decoration_dot.xml b/ui/src/main/res/drawable/collar_decoration_dot.xml index a944c14a..06403dfb 100644 --- a/ui/src/main/res/drawable/collar_decoration_dot.xml +++ b/ui/src/main/res/drawable/collar_decoration_dot.xml @@ -2,10 +2,9 @@ - + - + \ No newline at end of file diff --git a/ui/src/main/res/drawable/collar_ic_event.xml b/ui/src/main/res/drawable/collar_ic_event.xml index c1940817..97550394 100644 --- a/ui/src/main/res/drawable/collar_ic_event.xml +++ b/ui/src/main/res/drawable/collar_ic_event.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/ui/src/main/res/drawable/collar_ic_event_menu.xml b/ui/src/main/res/drawable/collar_ic_event_menu.xml deleted file mode 100644 index 1589aa3b..00000000 --- a/ui/src/main/res/drawable/collar_ic_event_menu.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ui/src/main/res/drawable/collar_ic_event_detail.xml b/ui/src/main/res/drawable/collar_ic_event_white.xml similarity index 92% rename from ui/src/main/res/drawable/collar_ic_event_detail.xml rename to ui/src/main/res/drawable/collar_ic_event_white.xml index 1589aa3b..e70924ef 100644 --- a/ui/src/main/res/drawable/collar_ic_event_detail.xml +++ b/ui/src/main/res/drawable/collar_ic_event_white.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/ui/src/main/res/drawable/collar_ic_filter.xml b/ui/src/main/res/drawable/collar_ic_filter.xml index 129f4a87..c70623cd 100644 --- a/ui/src/main/res/drawable/collar_ic_filter.xml +++ b/ui/src/main/res/drawable/collar_ic_filter.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/ui/src/main/res/drawable/collar_ic_logo.xml b/ui/src/main/res/drawable/collar_ic_logo.xml index 9eac82c0..193416e2 100644 --- a/ui/src/main/res/drawable/collar_ic_logo.xml +++ b/ui/src/main/res/drawable/collar_ic_logo.xml @@ -4,7 +4,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/ui/src/main/res/drawable/collar_ic_notification.xml b/ui/src/main/res/drawable/collar_ic_notification.xml index f52f4def..4792268d 100644 --- a/ui/src/main/res/drawable/collar_ic_notification.xml +++ b/ui/src/main/res/drawable/collar_ic_notification.xml @@ -5,8 +5,5 @@ android:viewportHeight="24"> + android:fillColor="@android:color/white"/> diff --git a/ui/src/main/res/drawable/collar_ic_notifications_inapp.xml b/ui/src/main/res/drawable/collar_ic_notifications_inapp.xml index 08ddaa40..61e63bc4 100644 --- a/ui/src/main/res/drawable/collar_ic_notifications_inapp.xml +++ b/ui/src/main/res/drawable/collar_ic_notifications_inapp.xml @@ -3,16 +3,10 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - - + + diff --git a/ui/src/main/res/drawable/collar_ic_notifications_system.xml b/ui/src/main/res/drawable/collar_ic_notifications_system.xml index 76d029b6..905eac6b 100644 --- a/ui/src/main/res/drawable/collar_ic_notifications_system.xml +++ b/ui/src/main/res/drawable/collar_ic_notifications_system.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/ui/src/main/res/drawable/collar_ic_property.xml b/ui/src/main/res/drawable/collar_ic_property.xml index 654160fb..8e2d92a4 100644 --- a/ui/src/main/res/drawable/collar_ic_property.xml +++ b/ui/src/main/res/drawable/collar_ic_property.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/ui/src/main/res/drawable/collar_ic_property_detail.xml b/ui/src/main/res/drawable/collar_ic_property_detail.xml deleted file mode 100644 index 07185e65..00000000 --- a/ui/src/main/res/drawable/collar_ic_property_detail.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ui/src/main/res/drawable/collar_ic_property_menu.xml b/ui/src/main/res/drawable/collar_ic_property_menu.xml deleted file mode 100644 index 07185e65..00000000 --- a/ui/src/main/res/drawable/collar_ic_property_menu.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ui/src/main/res/drawable-night/collar_ic_property_menu.xml b/ui/src/main/res/drawable/collar_ic_property_white.xml similarity index 91% rename from ui/src/main/res/drawable-night/collar_ic_property_menu.xml rename to ui/src/main/res/drawable/collar_ic_property_white.xml index 0d1e755c..d58e56fc 100644 --- a/ui/src/main/res/drawable-night/collar_ic_property_menu.xml +++ b/ui/src/main/res/drawable/collar_ic_property_white.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/ui/src/main/res/drawable/collar_ic_screen.xml b/ui/src/main/res/drawable/collar_ic_screen.xml index 125538b1..c3895b0a 100644 --- a/ui/src/main/res/drawable/collar_ic_screen.xml +++ b/ui/src/main/res/drawable/collar_ic_screen.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/ui/src/main/res/drawable/collar_ic_screen_menu.xml b/ui/src/main/res/drawable/collar_ic_screen_menu.xml deleted file mode 100644 index 15e9e55b..00000000 --- a/ui/src/main/res/drawable/collar_ic_screen_menu.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ui/src/main/res/drawable/collar_ic_screen_detail.xml b/ui/src/main/res/drawable/collar_ic_screen_white.xml similarity index 86% rename from ui/src/main/res/drawable/collar_ic_screen_detail.xml rename to ui/src/main/res/drawable/collar_ic_screen_white.xml index 15e9e55b..d32a6551 100644 --- a/ui/src/main/res/drawable/collar_ic_screen_detail.xml +++ b/ui/src/main/res/drawable/collar_ic_screen_white.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/ui/src/main/res/drawable/collar_ic_search.xml b/ui/src/main/res/drawable/collar_ic_search.xml index 2145a68a..d22246e2 100644 --- a/ui/src/main/res/drawable/collar_ic_search.xml +++ b/ui/src/main/res/drawable/collar_ic_search.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/ui/src/main/res/drawable/collar_ic_settings.xml b/ui/src/main/res/drawable/collar_ic_settings.xml index 597cbed7..fac13892 100644 --- a/ui/src/main/res/drawable/collar_ic_settings.xml +++ b/ui/src/main/res/drawable/collar_ic_settings.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/ui/src/main/res/drawable/collar_shape_background_icon.xml b/ui/src/main/res/drawable/collar_shape_background_item_line.xml similarity index 78% rename from ui/src/main/res/drawable/collar_shape_background_icon.xml rename to ui/src/main/res/drawable/collar_shape_background_item_line.xml index ff78e77b..6995bfd3 100644 --- a/ui/src/main/res/drawable/collar_shape_background_icon.xml +++ b/ui/src/main/res/drawable/collar_shape_background_item_line.xml @@ -2,7 +2,7 @@ - + - + - - - - - - \ No newline at end of file diff --git a/ui/src/main/res/drawable/collar_shape_background_screen.xml b/ui/src/main/res/drawable/collar_shape_background_screen.xml deleted file mode 100644 index e078e315..00000000 --- a/ui/src/main/res/drawable/collar_shape_background_screen.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ui/src/main/res/drawable/collar_shape_background_unknown.xml b/ui/src/main/res/drawable/collar_shape_background_unknown.xml deleted file mode 100644 index fdfe11e3..00000000 --- a/ui/src/main/res/drawable/collar_shape_background_unknown.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ui/src/main/res/layout/collar_activity_collar.xml b/ui/src/main/res/layout/collar_activity_collar.xml index 50635181..4b51fcf8 100644 --- a/ui/src/main/res/layout/collar_activity_collar.xml +++ b/ui/src/main/res/layout/collar_activity_collar.xml @@ -28,6 +28,8 @@ android:scrollbars="vertical" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" /> - + \ No newline at end of file diff --git a/ui/src/main/res/layout/collar_item_event.xml b/ui/src/main/res/layout/collar_item_event.xml index 00d5b8b8..d3b707e8 100644 --- a/ui/src/main/res/layout/collar_item_event.xml +++ b/ui/src/main/res/layout/collar_item_event.xml @@ -15,7 +15,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginLeft="16dp" android:layout_marginTop="8dp" android:gravity="center_horizontal" android:maxWidth="56dp" @@ -30,14 +29,13 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center_vertical" - android:layout_marginStart="16dp" - android:layout_marginLeft="16dp"> + android:layout_marginStart="16dp"> + android:background="@drawable/collar_shape_background_item_line" /> + android:src="@drawable/collar_ic_event_white" /> diff --git a/ui/src/main/res/layout/collar_item_property.xml b/ui/src/main/res/layout/collar_item_property.xml index ae533974..bcd042bc 100644 --- a/ui/src/main/res/layout/collar_item_property.xml +++ b/ui/src/main/res/layout/collar_item_property.xml @@ -15,14 +15,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginLeft="16dp" android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" android:gravity="center_horizontal" android:maxWidth="56dp" - android:layout_marginBottom="8dp" - android:minHeight="48dp" android:maxLength="8" android:maxLines="1" + android:minHeight="48dp" android:visibility="invisible" tools:text="20:00:00" /> @@ -37,7 +36,7 @@ android:layout_width="1dp" android:layout_height="match_parent" android:layout_gravity="center" - android:background="@drawable/collar_shape_background_icon" /> + android:background="@drawable/collar_shape_background_item_line" /> + android:src="@drawable/collar_ic_property_white" /> diff --git a/ui/src/main/res/layout/collar_item_screen.xml b/ui/src/main/res/layout/collar_item_screen.xml index 9b197ac8..86a55830 100644 --- a/ui/src/main/res/layout/collar_item_screen.xml +++ b/ui/src/main/res/layout/collar_item_screen.xml @@ -15,14 +15,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginLeft="16dp" android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" android:gravity="center_horizontal" android:maxWidth="56dp" - android:layout_marginBottom="8dp" - android:minHeight="48dp" android:maxLength="8" android:maxLines="1" + android:minHeight="48dp" android:visibility="invisible" tools:text="20:00:00" /> @@ -30,14 +29,13 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center_vertical" - android:layout_marginStart="16dp" - android:layout_marginLeft="16dp"> + android:layout_marginStart="16dp"> + android:background="@drawable/collar_shape_background_item_line" /> + android:src="@drawable/collar_ic_screen_white" /> diff --git a/ui/src/main/res/layout/collar_view_snackbar.xml b/ui/src/main/res/layout/collar_view_snackbar.xml index 0a2d420d..cc44af63 100644 --- a/ui/src/main/res/layout/collar_view_snackbar.xml +++ b/ui/src/main/res/layout/collar_view_snackbar.xml @@ -18,16 +18,15 @@ android:layout_gravity="top" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" - android:background="@drawable/collar_shape_background_screen" + android:background="@drawable/collar_shape_background_item_type" android:scaleType="centerInside" - android:src="@drawable/collar_ic_screen" /> + android:src="@drawable/collar_ic_screen_white" /> @@ -68,7 +67,6 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical|end" android:layout_marginStart="16dp" - android:layout_marginLeft="16dp" android:minWidth="48dp" android:text="@string/collar_share" android:textColor="@color/collar_color_primary" diff --git a/ui/src/main/res/menu/collar_menu.xml b/ui/src/main/res/menu/collar_menu.xml index 429f3de8..987e11fb 100644 --- a/ui/src/main/res/menu/collar_menu.xml +++ b/ui/src/main/res/menu/collar_menu.xml @@ -21,17 +21,17 @@ diff --git a/ui/src/main/res/values-night/colors.xml b/ui/src/main/res/values-night/colors.xml index dc35c02b..efbbbdd2 100644 --- a/ui/src/main/res/values-night/colors.xml +++ b/ui/src/main/res/values-night/colors.xml @@ -1,20 +1,8 @@ - #ffa000 #121212 - #121212 - #121212 - #005fff - #F44336 - #000000 - #000000 - #ffffff - #ffffff - #000000 - #00ffa0 - #005fff - #ffa000 - #F44336 #353535 + + @color/collar_color_primary \ No newline at end of file diff --git a/ui/src/main/res/values-night/themes.xml b/ui/src/main/res/values-night/themes.xml deleted file mode 100644 index 439810f3..00000000 --- a/ui/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - -