From 35fae8019f8f3a8e8b8d03edd6ea1899b03d8e22 Mon Sep 17 00:00:00 2001 From: icewithcola Date: Sun, 2 Jun 2024 12:53:54 +0800 Subject: [PATCH] Stage Last Version --- app/src/main/AndroidManifest.xml | 3 +++ .../java/uk/kagurach/android101/Page5.java | 9 ++++++-- .../uk/kagurach/android101/SettingPage.kt | 10 --------- .../android101/baoleme/BaolemaMainActivity.kt | 22 +++++++++++++++++++ .../android101/misc/AIAnswerService.kt | 11 ++++++++-- .../uk/kagurach/android101/misc/Kaculate.kt | 7 ++++++ .../main/res/layout/activity_setting_page.xml | 4 ++-- app/src/main/res/layout/baolema_main.xml | 10 +++++++++ app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 10 files changed, 62 insertions(+), 16 deletions(-) create mode 100644 app/src/main/java/uk/kagurach/android101/baoleme/BaolemaMainActivity.kt create mode 100644 app/src/main/res/layout/baolema_main.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c5955c9..f14e5c1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,9 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.Android101"> + diff --git a/app/src/main/java/uk/kagurach/android101/Page5.java b/app/src/main/java/uk/kagurach/android101/Page5.java index 0c20a9f..595528e 100644 --- a/app/src/main/java/uk/kagurach/android101/Page5.java +++ b/app/src/main/java/uk/kagurach/android101/Page5.java @@ -80,17 +80,22 @@ public class Page5 extends KaBaseActivity { TextView name = findViewById(R.id.P5AnimalNameInput); AutoCompleteTextView type = findViewById(R.id.AnimalTypeAutoCompleteInput); - if (name.getText().toString().isEmpty()||type.getText().toString().isEmpty()){ + String animal_name = name.getText().toString(); + String animal_type = type.getText().toString(); + + if (animal_name.isEmpty()||animal_type.isEmpty()){ ToastHelper.SmartToast.ShowToast("Please input all fields",v.getContext()); + return; } // Add to database - if (dbHelper.insertAnimalData(name.getText().toString(), type.getText().toString().replace(" ","_"))) { + if (dbHelper.insertAnimalData(animal_name, animal_type.replace(" ","_"))) { // Insert was successful ToastHelper.SmartToast.ShowToast( "Animal added successfully!",v.getContext()); } else { // Name already exists ToastHelper.SmartToast.ShowToast( "Animal with this name already exists!",v.getContext()); + return; } try { completeHelper.AddEntry(type.getText().toString()); diff --git a/app/src/main/java/uk/kagurach/android101/SettingPage.kt b/app/src/main/java/uk/kagurach/android101/SettingPage.kt index 2e7a6c8..7c9acee 100644 --- a/app/src/main/java/uk/kagurach/android101/SettingPage.kt +++ b/app/src/main/java/uk/kagurach/android101/SettingPage.kt @@ -3,24 +3,14 @@ package uk.kagurach.android101 import android.content.Context import android.content.Intent import android.os.Bundle -import android.util.Log import android.view.View -import android.widget.ImageButton -import androidx.activity.enableEdgeToEdge -import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat -import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.intPreferencesKey import androidx.datastore.preferences.preferencesDataStore -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.first -import kotlinx.coroutines.flow.map import kotlinx.coroutines.runBlocking import uk.kagurach.android101.databinding.ActivitySettingPageBinding -import uk.kagurach.android101.helper.ColorHelper - val Context.datastore by preferencesDataStore(name = "settings") val DefaultColor = intPreferencesKey("default_color") diff --git a/app/src/main/java/uk/kagurach/android101/baoleme/BaolemaMainActivity.kt b/app/src/main/java/uk/kagurach/android101/baoleme/BaolemaMainActivity.kt new file mode 100644 index 0000000..0fac32e --- /dev/null +++ b/app/src/main/java/uk/kagurach/android101/baoleme/BaolemaMainActivity.kt @@ -0,0 +1,22 @@ +package uk.kagurach.android101.baoleme + +import android.os.Bundle +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import uk.kagurach.android101.KaBaseActivity +import uk.kagurach.android101.R + +class BaolemaMainActivity : KaBaseActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContentView(R.layout.baolema_main) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + } +} \ No newline at end of file diff --git a/app/src/main/java/uk/kagurach/android101/misc/AIAnswerService.kt b/app/src/main/java/uk/kagurach/android101/misc/AIAnswerService.kt index c73d8a1..c5217ce 100644 --- a/app/src/main/java/uk/kagurach/android101/misc/AIAnswerService.kt +++ b/app/src/main/java/uk/kagurach/android101/misc/AIAnswerService.kt @@ -42,13 +42,20 @@ fun AIAnswerService(s: String): String { } result = result.replace( - "想", + "想","要" + ) + result = result.replace( + "要要","要" + ) + result = result.replace( + "要", if (rng.nextBoolean()) { "可以" } else { "不可以" } ) + result = result.replace("什么", "很多") result = result.replace("吗", "") result = result.replace("?", "。") @@ -58,7 +65,7 @@ fun AIAnswerService(s: String): String { } fun main() { - println(AIAnswerService("我想吃饭")) + println(AIAnswerService("我想要吃饭")) println(AIAnswerService("咱可以吃饭吗")) println(AIAnswerService("您可以做什么？")) println(AIAnswerService("您吃了吗?")) diff --git a/app/src/main/java/uk/kagurach/android101/misc/Kaculate.kt b/app/src/main/java/uk/kagurach/android101/misc/Kaculate.kt index 85cd971..1b1a0ab 100644 --- a/app/src/main/java/uk/kagurach/android101/misc/Kaculate.kt +++ b/app/src/main/java/uk/kagurach/android101/misc/Kaculate.kt @@ -68,6 +68,13 @@ fun Kaculate(src: String, ctx: Context): String { numStack[intStackCurr] = a.pow(b) numStack = dropAtIdx(numStack, intStackCurr + 1) } + var tmpStack = charArrayOf() + for(i in opStack){ + if (i!='^'){ + tmpStack += i + } + } + opStack = tmpStack } // x and / var intStackCurr = 0 diff --git a/app/src/main/res/layout/activity_setting_page.xml b/app/src/main/res/layout/activity_setting_page.xml index 7a53e0d..6cb764a 100644 --- a/app/src/main/res/layout/activity_setting_page.xml +++ b/app/src/main/res/layout/activity_setting_page.xml @@ -92,11 +92,11 @@ android:id="@+id/SettingPageSubmit" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/finish" + android:text="@string/finish_button" android:textSize="35sp" android:textAllCaps="false" android:layout_marginBottom="20dp" - android:layout_marginHorizontal="55sp" + android:layout_marginHorizontal="60sp" /> diff --git a/app/src/main/res/layout/baolema_main.xml b/app/src/main/res/layout/baolema_main.xml new file mode 100644 index 0000000..8aca635 --- /dev/null +++ b/app/src/main/res/layout/baolema_main.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 6d48bfd..78c9778 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -45,4 +45,5 @@ 字体\n大小 Color = #000000; TextSize = 70.sp 设置默认主题 + 完成 \ 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 c4f8215..38884a5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -45,4 +45,5 @@ Font\nSize Color = #000000; TextSize = 70.sp Set Default Theme + Finish \ No newline at end of file