From 882bdb049d5a072b05d33a282d590c8b783a62c4 Mon Sep 17 00:00:00 2001
From: HoraceHyy <horacehuang17@gmail.com>
Date: Thu, 18 Aug 2022 10:17:12 +0800
Subject: [PATCH] v1.4.0: Add cursor control support.

---
 .idea/deploymentTargetDropDown.xml            |  4 +--
 .idea/misc.xml                                |  4 +--
 app/build.gradle                              |  4 +--
 .../java/com/example/freecalc/MainActivity.kt |  2 +-
 .../main/res/layout-land/activity_main.xml    | 26 +++++++++++++++++--
 5 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index d1ed2e7..e98a50d 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\huang\.android\avd\Pixel_5_API_32.avd" />
+            <value value="C:\Users\huang\.android\avd\Pixel_3_API_32.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-08-12T13:57:32.079996700Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-08-18T02:04:17.107486100Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6348be4..72f3063 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -23,9 +23,9 @@
         <entry key="..\:/Users/huang/AndroidStudioProjects/FreeCalc_Material3Test/app/src/main/res/drawable/ic_toolbar_logo_xml.xml" value="0.2125" />
         <entry key="..\:/Users/huang/AndroidStudioProjects/FreeCalc_Material3Test/app/src/main/res/drawable/switch_thumb.xml" value="0.285" />
         <entry key="..\:/Users/huang/AndroidStudioProjects/FreeCalc_Material3Test/app/src/main/res/drawable/switch_track.xml" value="0.285" />
-        <entry key="..\:/Users/huang/AndroidStudioProjects/FreeCalc_Material3Test/app/src/main/res/layout-land/activity_main.xml" value="0.22393162393162394" />
+        <entry key="..\:/Users/huang/AndroidStudioProjects/FreeCalc_Material3Test/app/src/main/res/layout-land/activity_main.xml" value="0.4466666666666667" />
         <entry key="..\:/Users/huang/AndroidStudioProjects/FreeCalc_Material3Test/app/src/main/res/layout-land/activity_permission.xml" value="0.22" />
-        <entry key="..\:/Users/huang/AndroidStudioProjects/FreeCalc_Material3Test/app/src/main/res/layout/activity_main.xml" value="0.6" />
+        <entry key="..\:/Users/huang/AndroidStudioProjects/FreeCalc_Material3Test/app/src/main/res/layout/activity_main.xml" value="0.5224111282843895" />
         <entry key="..\:/Users/huang/AndroidStudioProjects/FreeCalc_Material3Test/app/src/main/res/layout/activity_permission.xml" value="0.4466666666666667" />
         <entry key="..\:/Users/huang/AndroidStudioProjects/FreeCalc_Material3Test/app/src/main/res/layout/activity_settings.xml" value="0.22" />
         <entry key="..\:/Users/huang/AndroidStudioProjects/FreeCalc_Material3Test/app/src/main/res/layout/content_main.xml" value="0.25925925925925924" />
diff --git a/app/build.gradle b/app/build.gradle
index 949b520..b5e1223 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId 'com.horacehyy.freecalc'
         minSdk 26
         targetSdk 32
-        versionCode 8
-        versionName "1.3.0"
+        versionCode 9
+        versionName "1.4.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/example/freecalc/MainActivity.kt b/app/src/main/java/com/example/freecalc/MainActivity.kt
index 6e0e173..64adc9d 100644
--- a/app/src/main/java/com/example/freecalc/MainActivity.kt
+++ b/app/src/main/java/com/example/freecalc/MainActivity.kt
@@ -102,7 +102,7 @@ class MainActivity : AppCompatActivity() {
                 binding.eqForm.setText(s.substring(0 until temp-1) + "_" + s[temp-1] + s.substring(temp+1))
                 binding.eqForm.setSelection(temp - 1)
             }
-        }
+        }   
         binding.cursorRight?.setOnClickListener { _ ->
             val temp = binding.eqForm.selectionStart
             if (temp != binding.eqForm.length()-1) {
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index 4da1aae..bafce99 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -72,6 +72,17 @@
                 tools:text="Result: 0"
                 app:layout_constraintBottom_toTopOf="@id/calc_button" />
 
+            <ImageButton
+                android:id="@+id/cursor_left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="@id/calc_button"
+                app:layout_constraintEnd_toStartOf="@id/calc_button"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toBottomOf="@id/calc_button"
+                android:src="@drawable/ic_cursor_left"
+                android:backgroundTint="#00000000"/>
+
             <Button
                 android:id="@+id/calc_button"
                 android:layout_width="0dp"
@@ -82,10 +93,21 @@
                 android:layout_margin="20dp"
                 android:textSize="18sp"
                 android:minHeight="@dimen/keyboard_button_minHeight"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/cursor_right"
+                app:layout_constraintStart_toEndOf="@id/cursor_left"
                 app:layout_constraintBottom_toBottomOf="parent"/>
 
+            <ImageButton
+                android:id="@+id/cursor_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="@id/calc_button"
+                app:layout_constraintStart_toEndOf="@id/calc_button"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="@id/calc_button"
+                android:src="@drawable/ic_cursor_right"
+                android:backgroundTint="#00000000"/>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout