From ce43aea9820661e251e4b2285cf782e4d2d75503 Mon Sep 17 00:00:00 2001
From: AndraxDev <dostapenko82@gmail.com>
Date: Sat, 16 Mar 2024 01:20:24 +0100
Subject: [PATCH] Interstitial commit #2

---
 .idea/deploymentTargetSelector.xml            |  9 +++++++--
 .../ui/activities/SettingsV2Activity.kt       |  2 +-
 app/src/main/res/layout/fragment_tips.xml     | 20 +++++++++++++++++--
 app/src/main/res/values-en/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index c293081..943f28d 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,15 +4,20 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DIALOG" />
-        <DropdownSelection timestamp="2024-03-12T22:57:22.195615800Z">
+        <DropdownSelection timestamp="2024-03-16T00:09:45.628371300Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="Default" identifier="serial=localhost:58526;connection=ba65c85c" />
+              <DeviceId pluginId="Default" identifier="serial=localhost:58526;connection=ac8cdab2" />
             </handle>
           </Target>
         </DropdownSelection>
         <DialogSelection>
           <targets>
+            <Target type="DEFAULT_BOOT">
+              <handle>
+                <DeviceId pluginId="Default" identifier="serial=localhost:58526;connection=ac8cdab2" />
+              </handle>
+            </Target>
             <Target type="DEFAULT_BOOT">
               <handle>
                 <DeviceId pluginId="PhysicalDevice" identifier="serial=6216ee94" />
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/activities/SettingsV2Activity.kt b/app/src/main/java/org/teslasoft/assistant/ui/activities/SettingsV2Activity.kt
index 02cb064..7214db5 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/activities/SettingsV2Activity.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/activities/SettingsV2Activity.kt
@@ -570,7 +570,7 @@ class SettingsV2Activity : FragmentActivity() {
             R.drawable.ic_lock,
             false,
             chatId,
-            "This feature allows you to lock assistant window. When assistant window is locked, it can not be closed by pressing back button or swiping window down. Nut you can use 'exit' button. This feature can prevent accidental closing of assistant window and losing unsaved conversation."
+            "This feature allows you to lock assistant window. When assistant window is locked, it can not be closed by pressing back button or swiping window down. But you can use 'exit' button. This feature can prevent accidental closing of assistant window and losing unsaved conversation."
         )
 
         supportFragmentManager.beginTransaction().replace(R.id.tile_account, tileAccountFragment!!).commit()
diff --git a/app/src/main/res/layout/fragment_tips.xml b/app/src/main/res/layout/fragment_tips.xml
index a1b5ca2..9d1dac6 100644
--- a/app/src/main/res/layout/fragment_tips.xml
+++ b/app/src/main/res/layout/fragment_tips.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -262,11 +263,9 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="16dp"
                     android:layout_marginEnd="16dp"
-                    android:layout_marginBottom="16dp"
                     android:background="@drawable/btn_tip1"
                     android:orientation="vertical"
                     android:padding="16dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tip_10">
@@ -278,6 +277,23 @@
                         android:text="@string/tip_11"
                         android:textColor="@color/tip1" />
                 </LinearLayout>
+
+                <TextView
+                    android:id="@+id/tip12_text"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginBottom="16dp"
+                    android:background="@drawable/btn_tip1"
+                    android:padding="16dp"
+                    android:text="@string/tip_12"
+                    android:textColor="@color/tip1"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tip_11" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 1c26aa5..a039207 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -165,4 +165,5 @@
     <string name="prompt_report_success">Objection sent. Thank you for feedback!</string>
     <string name="prompt_report_failed">Failed to send report</string>
     <string name="title_control_center">Control center</string>
+    <string name="tip_12">Long press on setting tile to show function description. Works only on new settings UI. You can access new settings UI (Control center) by pressing on the \'lab\' icon in the regular settings.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e56a8f9..ebdcc3c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -171,4 +171,5 @@
     <string name="global_settings_title">Global settings</string>
     <string name="chat_settings_title">Chat settings</string>
     <string name="title_control_center">Control center</string>
+    <string name="tip_12">Long press on setting tile to show function description. Works only on new settings UI. You can access new settings UI (Control center) by pressing on the \'lab\' icon in the regular settings.</string>
 </resources>