Add RicStillCaptureMultiYuvHhHdr mode (#18)

ricohapi · Jan 15, 2024 · 5115c7f · 5115c7f
1 parent 42f6722
commit 5115c7f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # THETA X Plug-in : Camera API Sample
 
-Version: 1.4.0
+Version: 1.5.0
 
 This sample project shows how to implement a plug-in using Camera API for RICOH THETA X.
 The program language is Kotlin, please checkout [java branch](https://github.com/ricohapi/theta-plugin-camera-api-sample-x/tree/java) to see Java code.
@@ -43,7 +43,7 @@ The program language is Kotlin, please checkout [java branch](https://github.com
 
 ### Supported Device
 
-* RICOH THETA X (Version 1.00.2, 1.10.1, 1.20.0, 1.30.0, 1.40.0, 1.41.0, 2.00.0, 2.10.1, 2.20.1)
+* RICOH THETA X (Version 1.00.2, 1.10.1, 1.20.0, 1.30.0, 1.40.0, 1.41.0, 2.00.0, 2.10.1, 2.20.1, 2.21.0, 2.30.0, 2.40.0)
 * RICOH THETA V and Z1 are NOT supported.
 
 ### Development Environment

diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.theta360.sample.camera"
         minSdkVersion 26
         targetSdkVersion 29
-        versionCode 9
-        versionName "1.4.0"
+        versionCode 10
+        versionName "1.5.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/com/theta360/sample/camera/MainActivity.kt b/app/src/main/java/com/theta360/sample/camera/MainActivity.kt
@@ -165,6 +165,9 @@ class MainActivity : PluginActivity(), MediaRecorder.OnInfoListener {
         setSpinner(spinner_ric_shooting_mode_preview, getResources().getStringArray(
             if (version >= 1200) R.array.RIC_SHOOTING_MODE_PREVIEW_ARRAY
             else                 R.array.RIC_SHOOTING_MODE_PREVIEW_OLD_ARRAY))
+        setSpinner(spinner_ric_shooting_mode_image, getResources().getStringArray(
+            if (version >= 2400) R.array.RIC_SHOOTING_MODE_IMAGE_ARRAY
+            else                 R.array.RIC_SHOOTING_MODE_IMAGE_OLD_ARRAY))
         spinner_ric_shooting_mode_preview.setSelection(0)       //RicPreview1024
         spinner_ric_shooting_mode_image.setSelection(0)         //RicStillCaptureStd
         spinner_ric_shooting_mode_video.setSelection(1)         //RicMovieRecording3840
@@ -220,7 +223,7 @@ class MainActivity : PluginActivity(), MediaRecorder.OnInfoListener {
 
     private fun setSpinner(spinner: Spinner, arr: Array<String>){
         val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, arr)
-        //adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         spinner.setAdapter(adapter)
     }
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -75,7 +75,6 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="24dp"
         android:layout_marginEnd="16dp"
-        android:entries="@array/RIC_SHOOTING_MODE_IMAGE_ARRAY"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -17,10 +17,16 @@
         <item>RicPreview5760</item>
         <item>RicPreview7680</item>
     </string-array>
+    <string-array name="RIC_SHOOTING_MODE_IMAGE_OLD_ARRAY">
+        <item>RicStillCaptureStd</item>
+        <item>RicStillCaptureMultiRawNR</item>
+        <item>RicStillCaptureMultiYuvHdr</item>
+    </string-array>
     <string-array name="RIC_SHOOTING_MODE_IMAGE_ARRAY">
         <item>RicStillCaptureStd</item>
         <item>RicStillCaptureMultiRawNR</item>
         <item>RicStillCaptureMultiYuvHdr</item>
+        <item>RicStillCaptureMultiYuvHhHdr</item>
     </string-array>
     <string-array name="RIC_SHOOTING_MODE_VIDEO_ARRAY">
         <item>RicMovieRecording1920</item>

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.5.10"
+    ext.kotlin_version = "1.7.10"
     repositories {
         google()
         mavenCentral()
@@ -18,7 +18,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter() // Warning: this repository is going to shut down soon
         maven { url 'https://github.com/ricohapi/theta-plugin-library/raw/master/repository' }
     }
 }