v7.4 (#55)

* Remove unnecessary line * Adjust text size * Implement menu visibility control * Update version
aqua-ix · Apr 4, 2023 · 8289f19 · 8289f19
1 parent 09815ab
commit 8289f19
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 14 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "comviewaquahp.google.sites.youbimiku"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 23
-        versionName "7.3"
+        versionCode 24
+        versionName "7.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     packagingOptions {

diff --git a/app/src/main/java/com/aqua_ix/youbimiku/MainActivity.kt b/app/src/main/java/com/aqua_ix/youbimiku/MainActivity.kt
@@ -45,6 +45,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, DialogListener {
     private lateinit var interstitialAd: InterstitialAd
     private lateinit var openAI: OpenAI
     private lateinit var remoteConfig: FirebaseRemoteConfig
+    private lateinit var navMenu: Menu
 
     private var openAIPreviousResponse = ""
 
@@ -159,6 +160,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, DialogListener {
         binding.chatView.setDateSeparatorFontSize(0F)
         binding.chatView.setInputTextHint(getString(R.string.input_text_hint))
         binding.chatView.setOnClickSendButtonListener(this)
+        binding.chatView.setMessageMaxWidth(640)
     }
 
     private fun getMikuAccount(): User {
@@ -191,7 +193,9 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, DialogListener {
                 .build()
             binding.chatView.receive(error)
             setAIModel(this, AIModelConfig.DIALOG_FLOW)
-            mikuAccount = getMikuAccount()
+            if (::navMenu.isInitialized) {
+                navMenu.findItem(R.id.setting_language).isVisible = true
+            }
             return
         }
         val greeting = resources.getString(R.string.user_nice_to_meet_you, userName)
@@ -255,10 +259,16 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, DialogListener {
                 if (BuildConfig.FLAVOR == "ads" && ::interstitialAd.isInitialized) {
                     interstitialAd.show(this)
                 }
+                if (::navMenu.isInitialized) {
+                    navMenu.findItem(R.id.setting_language).isVisible = false
+                }
             }
             .setNegativeButton(getString(R.string.setting_ai_model_dialogflow)) { _, _ ->
                 setAIModel(this, AIModelConfig.DIALOG_FLOW)
                 mikuAccount = getMikuAccount()
+                if (::navMenu.isInitialized) {
+                    navMenu.findItem(R.id.setting_language).isVisible = true
+                }
             }
             .setCancelable(cancelable)
             .show()
@@ -375,6 +385,10 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, DialogListener {
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         val inflater = menuInflater
         inflater.inflate(R.menu.menu, menu)
+        getAIModel(this)?.let {
+            menu.findItem(R.id.setting_language).isVisible = it == AIModelConfig.DIALOG_FLOW.name
+        }
+        navMenu = menu
         return true
     }
 
@@ -444,7 +458,6 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, DialogListener {
             if (BuildConfig.FLAVOR == "ads" && ::interstitialAd.isInitialized) {
                 interstitialAd.show(this)
             }
-            interstitialAd.show(this)
             setOpenAIRequestCount(applicationContext, 0)
         }
     }

diff --git a/app/src/main/java/com/aqua_ix/youbimiku/config/FontSizeConfig.kt b/app/src/main/java/com/aqua_ix/youbimiku/config/FontSizeConfig.kt
@@ -5,10 +5,10 @@ package com.aqua_ix.youbimiku.config
 import android.content.Context
 import com.github.bassaer.chatmessageview.view.ChatView
 
-const val XSMALL = 25f
-const val SMALL = 35f
-const val MEDIUM = 45f
-const val LARGE = 55f
+const val XSMALL = 24f
+const val SMALL = 32f
+const val MEDIUM = 44f
+const val LARGE = 52f
 
 enum class FontSizeConfig(val size: Float) {
     FONT_SIZE_XSMALL(XSMALL),

diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
@@ -4,10 +4,10 @@
         android:title="@string/setting_user_name"/>
     <item android:id="@+id/setting_ai_model"
         android:title="@string/setting_ai_model"/>
-    <item android:id="@+id/setting_language"
-        android:title="@string/setting_language"/>
     <item android:id="@+id/setting_font_size"
         android:title="@string/setting_font_size"/>
+    <item android:id="@+id/setting_language"
+        android:title="@string/setting_language"/>
     <item android:id="@+id/setting_official_account"
         android:title="@string/official_account"/>
 </menu>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -3,7 +3,7 @@
     <string name="miku_name">初音ミク</string>
 
     <string name="user_nice_to_meet_you">私は%1$sです。</string>
-    <string name="openai_system_prompt">初音ミクとしてユーザーとの会話を楽しんでください。ユーザーの名前は「%1$s」です。</string>
+    <string name="openai_system_prompt">初音ミクとして会話を楽しんでください。ユーザーの名前は「%1$s」です。</string>
     <string name="miku_nice_to_meet_you">%1$sさん！よろしくお願いします。</string>
     <string name="input_text_hint">話しかける</string>
 
@@ -20,7 +20,7 @@
     <string name="setting_user_name_empty">ユーザー名を入力してください。</string>
 
     <string name="setting_ai_model">AIモデルの選択</string>
-    <string name="setting_ai_model_message">より高性能なAI（GPT-3.5）を搭載した初音ミクさんとの会話が可能になりました！\n\n※長時間待っても返答がない場合は、「AIモデルの選択」から標準モデルに切り替えてお楽しみください。</string>
+    <string name="setting_ai_model_message">高性能なAI（GPT-3.5）を搭載した初音ミクさんと会話できます！\n\n※長時間待っても返答がない場合は、「AIモデルの選択」から標準モデルに切り替えてお楽しみください。</string>
     <string name="setting_ai_model_dialogflow">標準モデルと話す</string>
     <string name="setting_ai_model_openai">GPTモデルと話してみる(ベータ版)</string>
 
@@ -30,7 +30,7 @@
     <string name="setting_font_medium">中</string>
     <string name="setting_font_large">大</string>
 
-    <string name="setting_language">標準モデルの言語</string>
+    <string name="setting_language">言語を選択</string>
     <string name="setting_language_jp">日本語</string>
     <string name="setting_language_en">英語</string>
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="miku_name">Hatsune Miku</string>
 
     <string name="user_nice_to_meet_you">My name is %1$s.</string>
-    <string name="openai_system_prompt">Enjoy conversations with users as Hatsune Miku. The user\'s name is "%1$s".</string>
+    <string name="openai_system_prompt">Please enjoy the conversation as Hatsune Miku. The user\'s name is %1$s.</string>
     <string name="miku_nice_to_meet_you">Nice to meet you, %1$s!</string>
     <string name="input_text_hint">"Message…"</string>