From b7b0f07ba8465f1779b22bee9bdf87f51996e3fe Mon Sep 17 00:00:00 2001
From: lynxnb <niccolo.betto@gmail.com>
Date: Mon, 11 Oct 2021 17:33:48 +0200
Subject: [PATCH] Update application branding

- Logo is now displayed next to the app name
- Remove search bar animation
- New color accent
- Improve visibility of controller binding setting's glyphs
---
 app/src/main/java/emu/skyline/MainActivity.kt |  4 -
 .../main/java/emu/skyline/MainViewModel.kt    |  2 -
 .../java/emu/skyline/views/SearchBarView.kt   | 14 ---
 app/src/main/res/layout/button_dialog.xml     |  6 +-
 app/src/main/res/layout/main_activity.xml     | 30 ++++--
 app/src/main/res/layout/stick_dialog.xml      |  8 +-
 app/src/main/res/layout/view_search_bar.xml   | 22 ++---
 app/src/main/res/values-night/colors.xml      |  1 +
 app/src/main/res/values/colors.xml            |  2 +-
 ..._search_bar_xml_constraintlayout_scene.xml | 92 -------------------
 10 files changed, 37 insertions(+), 144 deletions(-)
 delete mode 100644 app/src/main/res/xml/view_search_bar_xml_constraintlayout_scene.xml

diff --git a/app/src/main/java/emu/skyline/MainActivity.kt b/app/src/main/java/emu/skyline/MainActivity.kt
index f0f48cfb..18f83ee7 100644
--- a/app/src/main/java/emu/skyline/MainActivity.kt
+++ b/app/src/main/java/emu/skyline/MainActivity.kt
@@ -145,10 +145,6 @@ class MainActivity : AppCompatActivity() {
             addTextChangedListener(afterTextChanged = { editable ->
                 editable?.let { text -> adapter.filter.filter(text.toString()) }
             })
-            if (!viewModel.searchBarAnimated) {
-                viewModel.searchBarAnimated = true
-                post { startTitleAnimation() }
-            }
         }
 
         window.decorView.findViewById<View>(android.R.id.content).viewTreeObserver.addOnTouchModeChangeListener { isInTouchMode ->
diff --git a/app/src/main/java/emu/skyline/MainViewModel.kt b/app/src/main/java/emu/skyline/MainViewModel.kt
index 985dc7d8..691c0598 100644
--- a/app/src/main/java/emu/skyline/MainViewModel.kt
+++ b/app/src/main/java/emu/skyline/MainViewModel.kt
@@ -36,8 +36,6 @@ class MainViewModel @Inject constructor(@ApplicationContext context : Context, p
     private val _stateData = MutableLiveData<MainState>()
     val stateData : LiveData<MainState> = _stateData
 
-    var searchBarAnimated = false
-
     /**
      * This refreshes the contents of the adapter by either trying to load cached adapter data or searches for them to recreate a list
      *
diff --git a/app/src/main/java/emu/skyline/views/SearchBarView.kt b/app/src/main/java/emu/skyline/views/SearchBarView.kt
index 588c8cc5..788e88ae 100644
--- a/app/src/main/java/emu/skyline/views/SearchBarView.kt
+++ b/app/src/main/java/emu/skyline/views/SearchBarView.kt
@@ -20,20 +20,6 @@ class SearchBarView @JvmOverloads constructor(context : Context, attrs : Attribu
         get() = binding.searchField.text
         set(value) = binding.searchField.setText(value)
 
-    fun startTitleAnimation() {
-        binding.motionLayout.progress = 0f
-        binding.motionLayout.transitionToEnd()
-        binding.searchField.apply {
-            setOnFocusChangeListener { v, hasFocus ->
-                if (hasFocus) {
-                    binding.motionLayout.progress = 1f
-                    context.getSystemService(InputMethodManager::class.java).showSoftInput(v, InputMethodManager.SHOW_IMPLICIT)
-                    onFocusChangeListener = null
-                }
-            }
-        }
-    }
-
     fun addTextChangedListener(
             beforeTextChanged : (
                     text : CharSequence?,
diff --git a/app/src/main/res/layout/button_dialog.xml b/app/src/main/res/layout/button_dialog.xml
index 984bc26a..f7a387b8 100644
--- a/app/src/main/res/layout/button_dialog.xml
+++ b/app/src/main/res/layout/button_dialog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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/button_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,11 +51,12 @@
             android:layout_alignTop="@id/button_icon"
             android:layout_alignEnd="@id/button_icon"
             android:layout_alignBottom="@id/button_icon"
-            android:alpha="0.25"
+            android:alpha="0.35"
             android:fontFamily="monospace"
             android:gravity="center"
             android:includeFontPadding="false"
-            android:textSize="27sp" />
+            android:textSize="26sp"
+            tools:text="A" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index b8834c37..119d9f27 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -77,31 +77,43 @@
                     app:tint="?android:attr/textColorSecondary" />
 
                 <ImageView
-                    android:id="@+id/title_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
+                    android:id="@+id/logo"
+                    android:layout_width="36dp"
+                    android:layout_height="38dp"
                     android:layout_marginStart="16dp"
+                    android:paddingBottom="2dp"
+                    android:contentDescription="@string/app_name"
+                    app:layout_constraintBottom_toBottomOf="@+id/sub_text"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/title_text"
+                    app:srcCompat="@drawable/logo_skyline" />
+
+                <ImageView
+                    android:id="@+id/title_text"
+                    android:layout_width="0dp"
+                    android:layout_height="24dp"
                     android:layout_marginTop="16dp"
+                    android:layout_marginStart="12dp"
                     android:layout_marginEnd="16dp"
+                    android:contentDescription="@string/app_name"
                     android:scaleType="fitStart"
-                    app:srcCompat="@drawable/skyline_text"
                     app:layout_constraintEnd_toStartOf="@id/refresh_icon"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toEndOf="@id/logo"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:tint="?android:attr/textColorPrimary"
-                    android:contentDescription="@string/app_name" />
+                    app:srcCompat="@drawable/skyline_text"
+                    app:tint="?android:attr/textColorPrimary" />
 
                 <TextView
                     android:id="@+id/sub_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
                     android:fontFamily="sans-serif-medium"
                     android:letterSpacing="0.1"
                     android:text="@string/emulator"
                     android:textAllCaps="true"
                     android:textSize="12sp"
-                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintStart_toStartOf="@+id/title_text"
                     app:layout_constraintTop_toBottomOf="@id/title_text" />
 
                 <emu.skyline.views.SearchBarView
diff --git a/app/src/main/res/layout/stick_dialog.xml b/app/src/main/res/layout/stick_dialog.xml
index 87f04674..99ce956f 100644
--- a/app/src/main/res/layout/stick_dialog.xml
+++ b/app/src/main/res/layout/stick_dialog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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/stick_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -48,7 +49,6 @@
             android:id="@+id/stick_circle_icon"
             android:layout_width="80dp"
             android:layout_height="80dp"
-            android:alpha="0.4"
             android:contentDescription="@string/buttons"
             android:outlineProvider="bounds"
             android:src="@drawable/ic_button"
@@ -69,7 +69,6 @@
                 android:layout_width="50dp"
                 android:layout_height="50dp"
                 android:layout_margin="15dp"
-                android:alpha="0.4"
                 android:contentDescription="@string/buttons"
                 android:outlineProvider="bounds"
                 android:src="@drawable/ic_stick"
@@ -83,12 +82,13 @@
                 android:layout_alignTop="@id/stick_icon"
                 android:layout_alignEnd="@id/stick_icon"
                 android:layout_alignBottom="@id/stick_icon"
-                android:alpha="0.55"
+                android:alpha="0.6"
                 android:fontFamily="monospace"
                 android:gravity="center"
                 android:includeFontPadding="false"
                 android:textColor="@android:color/white"
-                android:textSize="27sp" />
+                android:textSize="26sp"
+                tools:text="R" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/view_search_bar.xml b/app/src/main/res/layout/view_search_bar.xml
index a365b995..f24e2d20 100644
--- a/app/src/main/res/layout/view_search_bar.xml
+++ b/app/src/main/res/layout/view_search_bar.xml
@@ -6,11 +6,10 @@
     android:layout_height="wrap_content"
     tools:parentTag="com.google.android.material.card.MaterialCardView">
 
-    <androidx.constraintlayout.motion.widget.MotionLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/motion_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layoutDescription="@xml/view_search_bar_xml_constraintlayout_scene"
         app:motionProgress="1"
         tools:motionDebug="SHOW_ALL">
 
@@ -19,13 +18,13 @@
             android:layout_width="22dp"
             android:layout_height="22dp"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="16dp"
             android:contentDescription="@string/search"
+            app:srcCompat="@drawable/ic_search"
+            app:tint="?android:attr/textColorSecondary"
+            android:layout_marginStart="16dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_search"
-            app:tint="?android:attr/textColorSecondary" />
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <EditText
             android:id="@+id/search_field"
@@ -47,14 +46,5 @@
             app:layout_constraintStart_toEndOf="@id/search_icon"
             app:layout_constraintTop_toTopOf="parent"
             tools:ignore="LabelFor" />
-
-        <TextView
-            android:id="@+id/skyline_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="sans-serif-medium"
-            android:text="@string/app_name"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="18sp" />
-    </androidx.constraintlayout.motion.widget.MotionLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 65d12df3..5d4e8f62 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="colorPrimary">#FF4285F4</color>
     <color name="backgroundColor">#FF121212</color>
     <color name="backgroundColorVariant">#323232</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0d5d55b4..3e238d9d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="logoBackground">#121212</color>
-    <color name="colorPrimary">#FFFF0000</color>
+    <color name="colorPrimary">#FF1E58F0</color>
     <color name="backgroundColor">@android:color/white</color>
     <color name="backgroundColorVariant">#F8F8F8</color>
 </resources>
diff --git a/app/src/main/res/xml/view_search_bar_xml_constraintlayout_scene.xml b/app/src/main/res/xml/view_search_bar_xml_constraintlayout_scene.xml
deleted file mode 100644
index 9045703b..00000000
--- a/app/src/main/res/xml/view_search_bar_xml_constraintlayout_scene.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:motion="http://schemas.android.com/apk/res-auto">
-
-    <Transition
-            motion:autoTransition="none"
-            motion:constraintSetEnd="@+id/end"
-            motion:constraintSetStart="@id/start"
-            motion:duration="2000">
-        <KeyFrameSet>
-            <KeyPosition
-                    motion:motionTarget="@+id/skyline_text"
-                    motion:framePosition="50"
-                    motion:keyPositionType="deltaRelative"
-                    motion:percentX="0" />
-            <KeyPosition
-                    motion:motionTarget="@+id/skyline_text"
-                    motion:framePosition="90"
-                    motion:keyPositionType="deltaRelative"
-                    motion:percentX="1" />
-            <KeyAttribute
-                    motion:motionTarget="@+id/search_field"
-                    motion:framePosition="90"
-                    android:alpha="0" />
-            <KeyAttribute
-                    motion:motionTarget="@+id/skyline_text"
-                    motion:framePosition="55"
-                    android:scaleY="1"
-                    android:scaleX="1" />
-            <KeyPosition
-                    motion:motionTarget="@+id/skyline_text"
-                    motion:framePosition="70"
-                    motion:keyPositionType="deltaRelative"
-                    motion:percentX="-0.5" />
-        </KeyFrameSet>
-    </Transition>
-
-    <ConstraintSet android:id="@+id/start">
-        <Constraint
-                android:id="@+id/skyline_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                motion:layout_constraintBottom_toBottomOf="parent"
-                motion:layout_constraintEnd_toEndOf="parent"
-                motion:layout_constraintStart_toStartOf="parent"
-                motion:layout_constraintTop_toTopOf="parent" />
-        <Constraint
-                android:id="@+id/search_field"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:visibility="invisible"
-                motion:layout_constrainedWidth="true"
-                motion:layout_constraintBottom_toBottomOf="parent"
-                motion:layout_constraintHorizontal_bias="0"
-                motion:layout_constraintStart_toEndOf="@id/search_icon"
-                motion:layout_constraintTop_toTopOf="parent"
-                motion:transitionEasing="linear"
-                android:alpha="0"
-            motion:layout_constraintEnd_toEndOf="parent" />
-    </ConstraintSet>
-
-    <ConstraintSet android:id="@+id/end">
-        <Constraint
-                android:id="@+id/skyline_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="invisible"
-                motion:layout_constraintBottom_toBottomOf="parent"
-                motion:layout_constraintEnd_toEndOf="parent"
-                motion:layout_constraintHorizontal_bias="0.0"
-                motion:layout_constraintStart_toStartOf="@id/search_field"
-                motion:layout_constraintTop_toTopOf="parent"
-                android:scaleX="0.5"
-                android:scaleY="0.5" />
-        <Constraint
-                android:id="@+id/search_field"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:visibility="visible"
-                motion:layout_constrainedWidth="true"
-                motion:layout_constraintBottom_toBottomOf="parent"
-                motion:layout_constraintHorizontal_bias="0"
-                motion:layout_constraintStart_toEndOf="@id/search_icon"
-                motion:layout_constraintTop_toTopOf="parent"
-                android:alpha="1"
-            motion:layout_constraintEnd_toEndOf="parent" />
-    </ConstraintSet>
-</MotionScene>