v4.18-pre

AndraxDev · Aug 31, 2024 · 2ab8c42 · 2ab8c42
1 parent 77d59d1
commit 2ab8c42
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 19 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/adapters/AISetAdapter.kt b/app/src/main/java/org/teslasoft/assistant/ui/adapters/AISetAdapter.kt
@@ -84,7 +84,6 @@ class AISetAdapter(private val mContext: Context, private val dataArray: ArrayLi
 
         ui = mView?.findViewById(R.id.ui)
         window = mView?.findViewById(R.id.window)
-        window?.background = getAccentDrawable(AppCompatResources.getDrawable(mContext, R.drawable.btn_accent_tonal_selector_v8)!!)
         setIcon = mView?.findViewById(R.id.set_icon)
         setName = mView?.findViewById(R.id.set_name)
         setDescription = mView?.findViewById(R.id.set_description)
@@ -94,6 +93,14 @@ class AISetAdapter(private val mContext: Context, private val dataArray: ArrayLi
         btnCreateChat = mView?.findViewById(R.id.btn_create_chat)
         btnGetApiKey = mView?.findViewById(R.id.btn_get_api_key)
 
+        val drawable = ResourcesCompat.getDrawable(mContext.resources, R.drawable.avd_static, null)
+        drawable?.alpha = 230
+        setIcon?.background = getAccentDrawable(drawable!!)
+
+        val drawableBg = ResourcesCompat.getDrawable(mContext.resources, R.drawable.btn_accent_tonal_selector_v8, null)
+        drawableBg?.alpha = 100
+        window?.background = getAccentDrawable(drawableBg!!)
+
         setName?.text = dataArray[position]["name"]
         setDescription?.text = dataArray[position]["desc"]
         setOwner?.text = mContext.getString(R.string.label_provided_by) + " " + dataArray[position]["owner"]

diff --git a/app/src/main/res/drawable/avd_static_v3.xml b/app/src/main/res/drawable/avd_static_v3.xml
@@ -31,14 +31,14 @@
         <path
             android:name="path"
             android:pathData="M 10 0 C 7.349 0 4.804 1.054 2.929 2.929 C 1.054 4.804 0 7.349 0 10 C 0 12.651 1.054 15.196 2.929 17.071 C 4.804 18.946 7.349 20 10 20 C 12.651 20 15.196 18.946 17.071 17.071 C 18.946 15.196 20 12.651 20 10 C 20 7.349 18.946 4.804 17.071 2.929 C 15.196 1.054 12.651 0 10 0 Z M 10 30 C 7.349 30 4.804 31.054 2.929 32.929 C 1.054 34.804 0 37.349 0 40 C 0 42.651 1.054 45.196 2.929 47.071 C 4.804 48.946 7.349 50 10 50 C 12.651 50 15.196 48.946 17.071 47.071 C 18.946 45.196 20 42.651 20 40 C 20 37.349 18.946 34.804 17.071 32.929 C 15.196 31.054 12.651 30 10 30 Z M 40 30 C 37.349 30 34.804 31.054 32.929 32.929 C 31.054 34.804 30 37.349 30 40 C 30 42.651 31.054 45.196 32.929 47.071 C 34.804 48.946 37.349 50 40 50 C 42.651 50 45.196 48.946 47.071 47.071 C 48.946 45.196 50 42.651 50 40 C 50 37.349 48.946 34.804 47.071 32.929 C 45.196 31.054 42.651 30 40 30 Z M 40 0 C 37.349 0 34.804 1.054 32.929 2.929 C 31.054 4.804 30 7.349 30 10 C 30 12.651 31.054 15.196 32.929 17.071 C 34.804 18.946 37.349 20 40 20 C 42.651 20 45.196 18.946 47.071 17.071 C 48.946 15.196 50 12.651 50 10 C 50 7.349 48.946 4.804 47.071 2.929 C 45.196 1.054 42.651 0 40 0 Z"
-            android:fillColor="@color/accent_200"/>
+            android:fillColor="@color/accent_100"/>
         <path
             android:name="path_1"
             android:pathData="M 15.412 1.567 C 24.815 6.922 35.003 1.339 35.003 1.339 L 40.162 9.632 L 9.73 9.828 Z M 48.431 15.362 C 43.076 24.766 48.659 34.953 48.659 34.953 L 40.366 40.112 L 40.17 9.68 Z M 34.629 48.41 C 25.225 43.055 15.037 48.639 15.037 48.639 L 9.879 40.345 L 40.31 40.149 Z M 1.586 34.616 C 6.94 25.212 1.357 15.025 1.357 15.025 L 9.651 9.866 L 9.846 40.297 Z"
-            android:fillColor="@color/accent_200"/>
+            android:fillColor="@color/accent_100"/>
         <path
             android:name="path_2"
             android:pathData="M 6.4 6.53 L 43.557 6.53 L 43.557 41.99 L 6.4 41.99 Z"
-            android:fillColor="@color/accent_200"/>
+            android:fillColor="@color/accent_100"/>
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/btn_accent_tonal_selector_v8.xml b/app/src/main/res/drawable/btn_accent_tonal_selector_v8.xml
@@ -4,7 +4,7 @@
     <item>
         <shape>
             <corners android:radius="32dp" />
-            <solid android:color="@color/accent_100" />
+            <solid android:color="@color/accent_250" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/layout/fragment_assistant.xml b/app/src/main/res/layout/fragment_assistant.xml
@@ -235,8 +235,7 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/btn_accent_assistant_actions">
+                android:layout_height="match_parent">
 
                 <ImageButton
                     android:id="@+id/btn_assistant_settings"

diff --git a/app/src/main/res/layout/fragment_chats_list.xml b/app/src/main/res/layout/fragment_chats_list.xml
@@ -40,14 +40,15 @@
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/btn_import"
-        style="?attr/floatingActionButtonSurfaceStyle"
+        style="?attr/extendedFloatingActionButtonPrimaryStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="24dp"
-        android:layout_marginBottom="24dp"
+        android:layout_marginBottom="20dp"
         android:clickable="true"
         android:contentDescription="@string/btn_import_chat"
         android:tooltipText="@string/btn_import_chat"
+        app:backgroundTint="@color/fab"
         app:elevation="6dp"
         app:icon="@drawable/ic_download"
         app:layout_constraintBottom_toTopOf="@+id/btn_add"
@@ -150,15 +151,15 @@
         android:id="@+id/bulk_actions_container"
         android:layout_width="0dp"
         android:layout_height="56dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="24dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
         android:background="@drawable/btn_accent_tonal_unmodifiable"
         android:elevation="6dp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/activity_chats_title">
+        app:layout_constraintTop_toBottomOf="@+id/btn_settings_">
 
         <ImageButton
             android:id="@+id/btn_bulk_select_all"

diff --git a/app/src/main/res/layout/fragment_playground.xml b/app/src/main/res/layout/fragment_playground.xml
@@ -155,7 +155,7 @@
     </LinearLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-        style="?attr/floatingActionButtonSurfaceStyle"
+        style="?attr/extendedFloatingActionButtonPrimaryStyle"
         android:id="@+id/btn_tokenize"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout/view_ai_set.xml b/app/src/main/res/layout/view_ai_set.xml
@@ -43,7 +43,7 @@
             android:id="@+id/set_icon"
             android:layout_width="150dp"
             android:layout_height="150dp"
-            android:background="@drawable/avd_static_v3"
+            android:background="@drawable/avd_static"
             android:padding="48dp"
             android:src="@drawable/chatgpt_icon"
             app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/values-night-v31/colors.xml b/app/src/main/res/values-night-v31/colors.xml
@@ -17,7 +17,7 @@
     <color name="icon_500">@android:color/system_accent1_500</color>
     <color name="icon_700">@android:color/system_accent1_700</color>
     <color name="icon_900">@android:color/system_accent1_900</color>
-    <color name="fab">@android:color/system_accent2_700</color>
+    <color name="fab">@android:color/system_neutral2_800</color>
     <color name="icon_background">@android:color/system_neutral1_800</color>
     <color name="icon_foreground">@android:color/system_accent1_100</color>
     <color name="bottom_navbar">@android:color/system_neutral2_900</color>

diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
@@ -17,7 +17,7 @@
     <color name="icon_500">@android:color/system_accent1_500</color>
     <color name="icon_700">@android:color/system_accent1_700</color>
     <color name="icon_900">@android:color/system_accent1_900</color>
-    <color name="fab">@android:color/system_accent2_100</color>
+    <color name="fab">@android:color/system_neutral2_50</color>
     <color name="bottom_navbar">@color/accent_900</color>
     <color name="icon_background">@android:color/system_accent1_100</color>
     <color name="icon_foreground">@android:color/system_neutral2_700</color>