From a0db00e6608051b19ed6bbaacac3fbca2855432b Mon Sep 17 00:00:00 2001
From: icewithcola <me@kagurach.uk>
Date: Sun, 14 Apr 2024 22:52:47 +0800
Subject: [PATCH] Change Version Code, Fix bugs

---
 .idea/misc.xml                                |  1 -
 app/build.gradle.kts                          |  4 ++--
 .../java/uk/kagurach/android101/Page3.java    |  5 +----
 app/src/main/res/layout/activity_main2.xml    | 20 ++++++++++++++-----
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0ad17cb..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 28a967a..3eff7cb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
         applicationId = "uk.kagurach.android101"
         minSdk = 31
         targetSdk = 34
-        versionCode = 101
-        versionName = "1.0.1"
+        versionCode = 131
+        versionName = "1.3.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/uk/kagurach/android101/Page3.java b/app/src/main/java/uk/kagurach/android101/Page3.java
index 93c37a7..4e28fa0 100644
--- a/app/src/main/java/uk/kagurach/android101/Page3.java
+++ b/app/src/main/java/uk/kagurach/android101/Page3.java
@@ -83,11 +83,8 @@ public class Page3 extends AppCompatActivity {
                 case "=":
                     calc();
                     s = tv.getText().toString();
-                    if (!s.contains(".")){
-                        dot.setEnabled(true);
-                    }
+                    dot.setEnabled(!s.contains("."));
                     setOpButton(true);
-
                     return;
                 case ".":
                     dot.setEnabled(false);
diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml
index 794678d..8d25f3c 100644
--- a/app/src/main/res/layout/activity_main2.xml
+++ b/app/src/main/res/layout/activity_main2.xml
@@ -43,7 +43,9 @@
                     android:layout_height="0dp"
                     android:layout_weight="1"
                     android:ems="10"
-                    android:inputType="number" />
+                    android:inputType="number"
+                    android:text="字体大小"
+                    />
                 <Button
                     android:id="@+id/Page2SetSize"
                     android:layout_width="80dp"
@@ -89,7 +91,9 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:ems="10"
-                android:inputType="number" />
+                android:inputType="number"
+                android:text="R:0-255"
+                />
 
             <EditText
                 android:id="@+id/G"
@@ -97,7 +101,9 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:ems="10"
-                android:inputType="number" />
+                android:inputType="number"
+                android:text="G:0-255"
+                />
 
             <EditText
                 android:id="@+id/B"
@@ -105,7 +111,9 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:ems="10"
-                android:inputType="number" />
+                android:inputType="number"
+                android:text="B:0-255"
+                />
         </LinearLayout>
 
         <LinearLayout
@@ -118,7 +126,9 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:ems="10"
-                android:inputType="text" />
+                android:inputType="text"
+                android:text="测试文本"
+                />
 
             <Button
                 android:id="@+id/Page2SetTestTextButton"