Merge pull request #11 from cacaoMath/develop

update : シースルーと音声のオンオフができるように設定に処理を追加

Author: cacaoMath

.idea/deploymentTargetDropDown.xml

@@ -52,6 +52,8 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation "androidx.core:core-ktx:1.6.0"
 
+    implementation "androidx.preference:preference-ktx:1.1.1"
+
     //cameraX
     def camerax_version ="1.0.2"
     // CameraX core library using camera2 implementation

.idea/misc.xml

@@ -12,9 +12,6 @@ class MetaData : Application() {
     //firebaseに送るデータのリスト
     var dataList : MutableList<HashMap<String, Any?>> = arrayListOf()
 
-    //時間は分数で表す．
-    var measurementTime  = 10
-
 
     //グローバルに変数を保存する用
     companion object {

app/build.gradle

@@ -2,24 +2,26 @@ package com.example.place.activity
 
 import android.content.Intent
 import android.os.Bundle
+import androidx.preference.PreferenceManager
 import android.text.TextUtils
 import android.util.Log
 import android.view.View
 import android.widget.Button
 import android.widget.EditText
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import com.example.place.MetaData.Companion.getInstance
 import com.example.place.databinding.ActivityConfigBinding
+import com.google.android.material.switchmaterial.SwitchMaterial
 import com.google.firebase.auth.FirebaseAuth
 
 open class ConfigActivity : AppCompatActivity() {
     private lateinit var binding: ActivityConfigBinding
     private lateinit var configSaveBtn: Button
     private lateinit var signOutBtn: Button
     private lateinit var measurementTimeEt: EditText
-    private val metaData = getInstance()
-    
+    private lateinit var seeThrowSwitch: SwitchMaterial
+    private lateinit var voiceSwitch: SwitchMaterial
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityConfigBinding.inflate(layoutInflater)
@@ -29,7 +31,14 @@ open class ConfigActivity : AppCompatActivity() {
         configSaveBtn = binding.configSaveBtn
         signOutBtn = binding.signoutBtn
         measurementTimeEt = binding.measurementTimeEt
-        measurementTimeEt.setText(metaData.measurementTime.toString())
+        seeThrowSwitch = binding.seeThrowSwitch
+        voiceSwitch = binding.voiceSwitch
+
+        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
+        seeThrowSwitch.isChecked = sharedPreferences.getBoolean("seeThrow",false)
+        voiceSwitch.isChecked = sharedPreferences.getBoolean("voiceMode",false)
+
+        measurementTimeEt.setText(sharedPreferences.getInt("measurementTime",10).toString())
         configSaveBtn.setOnClickListener(View.OnClickListener {
             val inputTxt = measurementTimeEt.text.toString()
             when {
@@ -41,10 +50,10 @@ open class ConfigActivity : AppCompatActivity() {
                     Log.i(TAG,"計測時間は数値だけを入れてください")
                 }
                 TextUtils.isEmpty(inputTxt) -> {
-                    metaData.measurementTime = 10
+                    sharedPreferences.edit().putInt("measurementTime", 10).apply()
                 }
                 else -> {
-                    metaData.measurementTime = inputTxt.toInt()
+                    sharedPreferences.edit().putInt("measurementTime", inputTxt.toInt()).apply()
                 }
             }
             Log.d(TAG, "Saved!!")
@@ -56,9 +65,18 @@ open class ConfigActivity : AppCompatActivity() {
             startActivity(titleIntent)
             finish()
         })
+
+        seeThrowSwitch.setOnCheckedChangeListener { _, isChecked ->
+            sharedPreferences.edit().putBoolean("seeThrow", isChecked).apply()
+        }
+
+        voiceSwitch.setOnCheckedChangeListener { _, isChecked ->
+            sharedPreferences.edit().putBoolean("voiceMode", isChecked).apply()
+        }
+
     }
 
     companion object {
-        protected val TAG = ConfigActivity::class.java.simpleName
+        private var TAG = ConfigActivity::class.java.simpleName
     }
 }

app/src/main/java/com/example/place/MetaData.kt

@@ -10,6 +10,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.AlarmManagerCompat
+import androidx.preference.PreferenceManager
 import com.example.place.MetaData.Companion.getInstance
 import com.example.place.R
 import com.example.place.databinding.ActivityMainBinding
@@ -24,6 +25,7 @@ class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
     private var alertDialog: AlertDialog? = null
     var metaData = getInstance()
+    private var measurementTime:Int = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -41,6 +43,8 @@ class MainActivity : AppCompatActivity() {
         val startBtn = binding.startBtn
         val metaBtn = binding.metaBtn
 
+        measurementTime = PreferenceManager.getDefaultSharedPreferences(this).getInt("measurementTime",10)
+
 
         startBtn.setOnClickListener { //問題画面へ遷移
             //メタデータを選択しないと遷移しないようにする
@@ -75,7 +79,7 @@ class MainActivity : AppCompatActivity() {
         // Calendarを使って現在の時間をミリ秒で取得
         calendar.timeInMillis = System.currentTimeMillis()
         // metadataに保存されている分数後に設定
-        calendar.add(Calendar.SECOND, metaData.measurementTime * 60)
+        calendar.add(Calendar.SECOND, measurementTime * 60)
 
         //時間精度デバック用
         val df: DateFormat = SimpleDateFormat("yyyy/MM/dd HH:mm:ss.SSS")
@@ -94,7 +98,7 @@ class MainActivity : AppCompatActivity() {
         AlarmManagerCompat.setExact(am, AlarmManager.RTC_WAKEUP, calendar.timeInMillis, pending)
         Toast.makeText(
             applicationContext,
-            "${metaData.measurementTime}分の計測を始めます.", Toast.LENGTH_SHORT
+            "${measurementTime}分の計測を始めます.", Toast.LENGTH_SHORT
         ).show()
     }
 

app/src/main/java/com/example/place/activity/ConfigActivity.kt

@@ -30,6 +30,7 @@
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceManager;
 
 import com.example.place.DataTransferKt;
 import com.example.place.MetaData;
@@ -85,6 +86,7 @@ public class QuestionActivity extends AppCompatActivity implements TextToSpeech.
     //音声再生
     private TextToSpeech ttsJp;
     private TextToSpeech ttsEn;
+    private Boolean isVoiceMode;
 
     //シースルー用
     private ExecutorService cameraExecutor;
@@ -127,9 +129,21 @@ protected void onCreate(Bundle savedInstanceState) {
         ansBtn3 = binding.ansBtn3;
         ansBtn4 = binding.ansBtn4;
 
+        cameraView = binding.viewFinder;
+
 //        showNextQuiz(); //第１問目表示用
         sensing.start(""); //計測開始
 
+        //シースルーにするかどうか
+        if(PreferenceManager.getDefaultSharedPreferences(this).getBoolean("seeThrow",false)) {
+            launchSeeThrow();
+        }else{
+            cameraView.setVisibility(View.INVISIBLE);
+        }
+        isVoiceMode = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("voiceMode",false);
+    }
+
+    private void launchSeeThrow(){
         if(allPermissionsGranted()){
             startCamera(this);
         }else{
@@ -138,7 +152,6 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         cameraExecutor = Executors.newSingleThreadExecutor();
-        cameraView = binding.viewFinder;
 
     }
 
@@ -195,7 +208,7 @@ public void onInit(int status) {
                 ttsJp.setLanguage(Locale.JAPANESE);
                 Log.i(TAG, "言語の設定完了しました．");
                 //両言語のttsの初期化完了後に問題開始する．
-                showNextQuiz();
+                showNextQuiz(PreferenceManager.getDefaultSharedPreferences(this).getBoolean("voiceMode",false));
             }else{
                 Log.i(TAG, "言語の設定するのに失敗しました．システムの音声出力言語設定（日本語，英語）を確認してください．");
             }
@@ -265,6 +278,7 @@ public void onClick(DialogInterface dialogInterface, int id) {
                 }).show();
     }
 
+    //xmlのOnClickで使用する
     public void pushButton(View view){
         //ボタン(イベント)連打防止処理
         if(eventFlag) return;
@@ -328,7 +342,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
                     finish();//追加
                 } else {
                     count++;
-                    showNextQuiz();
+                    showNextQuiz(isVoiceMode);
                 }
             }
         });
@@ -347,17 +361,20 @@ private void wordSpeak(TextToSpeech tts,String text){
     }
 
     //出題する問題
-    public void showNextQuiz(){
+    public void showNextQuiz(Boolean isVoiceMode){
         //単語の読み上げ
-        wordSpeak(ttsEn, quizSet[count][1]);
-        wordSpeak(ttsEn, "A ");
-        wordSpeak(ttsJp, quizSet[count][2]);
-        wordSpeak(ttsEn, "B ");
-        wordSpeak(ttsJp, quizSet[count][3]);
-        wordSpeak(ttsEn, "C ");
-        wordSpeak(ttsJp, quizSet[count][4]);
-        wordSpeak(ttsEn, "D ");
-        wordSpeak(ttsJp, quizSet[count][5]);
+        if(isVoiceMode){
+            wordSpeak(ttsEn, quizSet[count][1]);
+            wordSpeak(ttsEn, "A ");
+            wordSpeak(ttsJp, quizSet[count][2]);
+            wordSpeak(ttsEn, "B ");
+            wordSpeak(ttsJp, quizSet[count][3]);
+            wordSpeak(ttsEn, "C ");
+            wordSpeak(ttsJp, quizSet[count][4]);
+            wordSpeak(ttsEn, "D ");
+            wordSpeak(ttsJp, quizSet[count][5]);
+        }
+
 
         questionView.setText(quizSet[count][1]);
         if(quizSet[count][1].length() > 14){

app/src/main/java/com/example/place/activity/MainActivity.kt

@@ -40,7 +40,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/signoutBtn"
-        app:layout_constraintTop_toBottomOf="@+id/measurementTimeEt" />
+        app:layout_constraintTop_toBottomOf="@+id/measurementTimeEt"
+        app:layout_constraintVertical_bias="0.674" />
 
     <Button
         android:id="@+id/signoutBtn"
@@ -52,7 +53,8 @@
         app:layout_constraintEnd_toStartOf="@+id/config_save_btn"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/measurementTimeEt" />
+        app:layout_constraintTop_toBottomOf="@+id/measurementTimeEt"
+        app:layout_constraintVertical_bias="0.674" />
 
     <EditText
         android:id="@+id/measurementTimeEt"
@@ -67,5 +69,30 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView5" />
 
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/seeThrowSwitch"
+        android:layout_width="200dp"
+        android:layout_height="48dp"
+        android:layout_marginTop="44dp"
+        android:text="@string/see_throw_switch"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/measurementTimeEt"
+        tools:ignore="UseSwitchCompatOrMaterialXml" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/voiceSwitch"
+        android:layout_width="200dp"
+        android:layout_height="48dp"
+        android:layout_marginTop="44dp"
+        android:text="@string/voice_switch"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/seeThrowSwitch"
+        app:layout_constraintVertical_bias="0.018" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/java/com/example/place/activity/QuestionActivity.java

@@ -22,6 +22,8 @@
     <string name="measurement_time">計測時間（分）</string>
     <string name="sign_out">sign out</string>
     <string name="please_input_number">数字を入力してください．単位は[分]です．</string>
+    <string name="see_throw_switch">See Throw</string>
+    <string name="voice_switch">Voice</string>
 
     <!--InputNoteActivity-->
     <string name="tv_label">ラベルデータ</string>