From 1151585acd000296b29bcf5b45430fd81df7809f Mon Sep 17 00:00:00 2001
From: Konstantin Ivanov <54908981+konstantiniiv@users.noreply.github.com>
Date: Thu, 15 Jun 2023 10:51:38 +0200
Subject: [PATCH] DROID-1385 App | Fix | Sync status, colors (#59)

---
 .../core_ui/widgets/StatusBadgeWidget.kt      | 32 +++++++++++--------
 .../layout/layout_object_set_top_toolbar.xml  | 19 ++++++++---
 .../res/layout/widget_object_top_toolbar.xml  | 13 ++++++--
 core-ui/src/main/res/values/colors.xml        |  6 ----
 sample/src/main/res/values/styles.xml         |  2 +-
 5 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/StatusBadgeWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/StatusBadgeWidget.kt
index 5992ad8085..1acde7de4a 100644
--- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/StatusBadgeWidget.kt
+++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/StatusBadgeWidget.kt
@@ -1,13 +1,14 @@
 package com.anytypeio.anytype.core_ui.widgets
 
 import android.content.Context
-import android.graphics.Color
 import android.util.AttributeSet
 import android.view.View
 import com.anytypeio.anytype.core_models.SyncStatus
 import com.anytypeio.anytype.core_ui.R
 import com.anytypeio.anytype.core_ui.extensions.color
 import com.anytypeio.anytype.core_ui.extensions.tint
+import com.anytypeio.anytype.core_utils.ext.gone
+import com.anytypeio.anytype.core_utils.ext.visible
 
 class StatusBadgeWidget @JvmOverloads constructor(
     context: Context,
@@ -16,24 +17,29 @@ class StatusBadgeWidget @JvmOverloads constructor(
 
     init {
         setBackgroundResource(R.drawable.circle_solid_default)
-        tint(Color.WHITE)
+        tint(color = context.color(R.color.palette_dark_grey))
     }
 
     fun bind(status: SyncStatus?) {
         when (status) {
-            SyncStatus.UNKNOWN,
             SyncStatus.FAILED,
+            SyncStatus.INCOMPATIBLE_VERSION -> {
+                visible()
+                tint(color = context.color(R.color.palette_system_red))
+            }
+            SyncStatus.SYNCING -> {
+                visible()
+                tint(color = context.color(R.color.palette_system_amber_100))
+            }
+            SyncStatus.SYNCED -> {
+                visible()
+                tint(color = context.color(R.color.palette_system_green))
+            }
+            SyncStatus.UNKNOWN,
             SyncStatus.OFFLINE,
-            SyncStatus.INCOMPATIBLE_VERSION -> tint(
-                color = context.color(R.color.sync_status_red)
-            )
-            SyncStatus.SYNCING -> tint(
-                color = context.color(R.color.sync_status_orange)
-            )
-            SyncStatus.SYNCED -> tint(
-                color = context.color(R.color.sync_status_green)
-            )
-            else -> tint(Color.TRANSPARENT)
+            null -> {
+                gone()
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/layout_object_set_top_toolbar.xml b/core-ui/src/main/res/layout/layout_object_set_top_toolbar.xml
index ec44c9e1a8..864c7e0e05 100644
--- a/core-ui/src/main/res/layout/layout_object_set_top_toolbar.xml
+++ b/core-ui/src/main/res/layout/layout_object_set_top_toolbar.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--typography, buttons 05.04-->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/topToolbar"
     android:layout_width="match_parent"
     android:layout_height="48dp">
 
-    <FrameLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/statusContainer"
         android:layout_gravity="center_vertical"
         android:paddingStart="10dp"
@@ -20,19 +21,27 @@
             android:layout_width="10dp"
             android:layout_height="10dp"
             android:layout_gravity="center_vertical"
-            android:backgroundTint="@color/orange" />
+            android:backgroundTint="@color/orange"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
 
         <TextView
             android:id="@+id/tvStatus"
             style="@style/TextView.UXStyle.Captions.1.Regular"
-            android:textColor="@color/text_secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="6dp"
+            android:textColor="@color/text_secondary"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/statusBadge"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_goneMarginStart="0dp"
             tools:text="Syncing" />
 
-    </FrameLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/core-ui/src/main/res/layout/widget_object_top_toolbar.xml b/core-ui/src/main/res/layout/widget_object_top_toolbar.xml
index a41da7b94b..cb8801e674 100644
--- a/core-ui/src/main/res/layout/widget_object_top_toolbar.xml
+++ b/core-ui/src/main/res/layout/widget_object_top_toolbar.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <FrameLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/statusContainer"
         android:layout_width="wrap_content"
         android:layout_height="28dp"
@@ -17,6 +17,9 @@
             android:layout_width="10dp"
             android:layout_height="10dp"
             android:layout_gravity="center_vertical"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             android:backgroundTint="@color/orange" />
 
         <TextView
@@ -25,11 +28,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="6dp"
             android:textColor="@color/text_secondary"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/statusBadge"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_goneMarginStart="0dp"
             tools:text="Syncing" />
 
-    </FrameLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/core-ui/src/main/res/values/colors.xml b/core-ui/src/main/res/values/colors.xml
index a789660d8b..6307821b1a 100644
--- a/core-ui/src/main/res/values/colors.xml
+++ b/core-ui/src/main/res/values/colors.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <color name="sync_status_red">#F55522</color>
-    <color name="sync_status_green">#57C600</color>
-    <color name="sync_status_orange">#FFB522</color>
-
-    <color name="anytype_shadow_main">#8C000000</color>
-
     <color name="debug">#F44336</color>
     <color name="orange">#FFBB2C</color>
     <color name="white">#FFFFFF</color>
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
index 5a589ff531..54f6475054 100644
--- a/sample/src/main/res/values/styles.xml
+++ b/sample/src/main/res/values/styles.xml
@@ -5,7 +5,7 @@
         <!-- Customize your theme here. -->
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
-        <item name="colorPrimary">@color/sync_status_red</item>
+        <item name="colorPrimary">@color/palette_system_red</item>
         <item name="colorPrimaryDark">@color/palette_dark_teal</item>
         <item name="colorAccent">@color/orange</item>
         <item name="alertDialogTheme">@style/DialogTheme</item>