kagura/Android101
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change Version Code, Fix bugs

Browse source
This commit is contained in:
icewithcola 2024-04-14 22:52:47 +08:00
parent a348085743
commit a0db00e660
4 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.idea/misc.xml
View file

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">

4
app/build.gradle.kts
View file

@ -11,8 +11,8 @@ android {
applicationId = "uk.kagurach.android101" applicationId = "uk.kagurach.android101"
minSdk = 31 minSdk = 31
targetSdk = 34 targetSdk = 34
versionCode = 101 versionCode = 131
versionName = "1.0.1" versionName = "1.3.1"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }

5
app/src/main/java/uk/kagurach/android101/Page3.java
View file

@ -83,11 +83,8 @@ public class Page3 extends AppCompatActivity {
case "=": case "=":
calc(); calc();
s = tv.getText().toString(); s = tv.getText().toString();
if (!s.contains(".")){ dot.setEnabled(!s.contains("."));
dot.setEnabled(true);
}
setOpButton(true); setOpButton(true);
return; return;
case ".": case ".":
dot.setEnabled(false); dot.setEnabled(false);

20
app/src/main/res/layout/activity_main2.xml
View file

@ -43,7 +43,9 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:inputType="number" /> android:inputType="number"
android:text="字体大小"
/>
<Button <Button
android:id="@+id/Page2SetSize" android:id="@+id/Page2SetSize"
android:layout_width="80dp" android:layout_width="80dp"
@ -89,7 +91,9 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:inputType="number" /> android:inputType="number"
android:text="R:0-255"
/>
<EditText <EditText
android:id="@+id/G" android:id="@+id/G"
@ -97,7 +101,9 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:inputType="number" /> android:inputType="number"
android:text="G:0-255"
/>
<EditText <EditText
android:id="@+id/B" android:id="@+id/B"
@ -105,7 +111,9 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:inputType="number" /> android:inputType="number"
android:text="B:0-255"
/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -118,7 +126,9 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:ems="10" android:ems="10"
android:inputType="text" /> android:inputType="text"
android:text="测试文本"
/>
<Button <Button
android:id="@+id/Page2SetTestTextButton" android:id="@+id/Page2SetTestTextButton"