Merge pull request #27

v1.4.0: Add cursor control support.
HoraceHuang-ui · Aug 18, 2022 · 08ce5ee · 08ce5ee
2 parents 5babfff + 882bdb0
commit 08ce5ee
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 9 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git 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
@@ -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
@@ -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