Merge pull request #47 from ricohapi/dev/1.5.0

Dev/1.5.0

build.gradle.kts

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
         classpath("com.android.tools.build:gradle:7.2.2")
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20")
         classpath("org.jetbrains.dokka:versioning-plugin:1.8.20")

config/detekt.yml

@@ -94,9 +94,9 @@ complexity:
   #    threshold: 10
   #    includeStaticDeclarations: false
   #    includePrivateDeclarations: false
-  #  ComplexMethod:
-  #    active: true
-  #    threshold: 15
+  ComplexMethod:
+    active: true
+    threshold: 20
   #    ignoreSingleWhenExpression: false
   #    ignoreSimpleWhenEntries: false
   #    ignoreNestingFunctions: false
@@ -237,13 +237,13 @@ exceptions:
   #    active: false
   #  PrintStackTrace:
   #    active: true
-  #  RethrowCaughtException:
-  #    active: true
+  RethrowCaughtException:
+    active: false
   #  ReturnFromFinally:
   #    active: true
   #    ignoreLabeled: false
-  #  SwallowedException:
-  #    active: true
+  SwallowedException:
+    active: false
   #    ignoredExceptionTypes:
   #      - 'InterruptedException'
   #      - 'MalformedURLException'
@@ -282,8 +282,8 @@ exceptions:
     #   - 'RuntimeException'
     #   - 'Throwable'
     # allowedExceptionNameRegex: '_|(ignore|expected).*'
-#  TooGenericExceptionThrown:
-#    active: true
+  TooGenericExceptionThrown:
+    active: false
 #    exceptionNames:
 #      - 'Error'
 #      - 'Exception'
@@ -546,9 +546,9 @@ style:
   #  LibraryEntitiesShouldNotBePublic:
   #    active: true
   #    excludes: [ '**' ]
-  #  LoopWithTooManyJumpStatements:
-  #    active: true
-  #    maxJumpCount: 1
+  LoopWithTooManyJumpStatements:
+    active: true
+    maxJumpCount: 3
   MagicNumber:
     active: true
     excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ]
@@ -620,10 +620,10 @@ style:
   #    active: true
   #  SpacingBetweenPackageAndImports:
   #    active: false
-  #  ThrowsCount:
-  #    active: true
-  #    max: 2
-  #    excludeGuardClauses: false
+  ThrowsCount:
+    active: true
+    max: 8
+    excludeGuardClauses: false
   #  TrailingWhitespace:
   #    active: false
   #  UnderscoresInNumericLiterals:

demos/demo-android/app/build.gradle

@@ -72,7 +72,7 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:5.0.1'
     implementation 'io.coil-kt:coil-compose:2.2.2'
     implementation "io.ktor:ktor-client-cio:2.1.3"
-    implementation "com.ricoh360.thetaclient:theta-client:1.4.0"
+    implementation "com.ricoh360.thetaclient:theta-client:1.5.0"
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"

demos/demo-android/app/src/main/java/com/ricoh360/thetaclient/thetaClientDemo/PreviewScreen.kt

@@ -28,11 +28,19 @@ import timber.log.Timber
 fun PreviewScreen(toPhoto: (photoUrl: String) -> Unit, viewModel: ThetaViewModel = androidx.lifecycle.viewmodel.compose.viewModel()) {
 
     class TakenCallback : PhotoCapture.TakePictureCallback {
-        override fun onSuccess(fileUrl: String) {
+        override fun onSuccess(fileUrl: String?) {
             Timber.i("takePicture onSuccess: $fileUrl")
             val scope = CoroutineScope(Job() + Dispatchers.Main)
-            scope.launch {
-                toPhoto(fileUrl) // need to execute on the main thread.
+            when (fileUrl) {
+                null -> {   // Cancel shooting.
+                    viewModel.startPreview()
+                }
+
+                else -> {
+                    scope.launch {
+                        toPhoto(fileUrl) // need to execute on the main thread.
+                    }
+                }
             }
         }
 

demos/demo-flutter/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.20'
     repositories {
         google()
         mavenCentral()

demos/demo-flutter/lib/main.dart

@@ -25,6 +25,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
   final _thetaClientFlutter = ThetaClientFlutter();
   bool _isInitTheta = false;
   bool _initializing = false;
+  ThetaModel? _thetaModel;
 
   final String endpoint = 'http://192.168.1.1:80/';
 
@@ -76,20 +77,20 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
       return;
     }
     bool isInitTheta;
+    ThetaModel? thetaModel;
     try {
+      _initializing = true;
       isInitTheta = await _thetaClientFlutter.isInitialized();
-      if (!isInitTheta) {
-        _initializing = true;
-        debugPrint('start initialize');
-        await _thetaClientFlutter.initialize(endpoint);
-
-        // // Client mode authentication settings
-        // final config = ThetaConfig();
-        // config.clientMode = DigestAuth('THETAXX12345678', '12345678');
-        // await _thetaClientFlutter.initialize(endpoint, config);
-
-        isInitTheta = true;
-      }
+      debugPrint('start initialize');
+      await _thetaClientFlutter.initialize(endpoint);
+      thetaModel = await _thetaClientFlutter.getThetaModel();
+
+      // // Client mode authentication settings
+      // final config = ThetaConfig();
+      // config.clientMode = DigestAuth('THETAXX12345678', '12345678');
+      // await _thetaClientFlutter.initialize(endpoint, config);
+
+      isInitTheta = true;
     } on PlatformException {
       if (!mounted) return;
       debugPrint('Error. init');
@@ -103,6 +104,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
 
     setState(() {
       _isInitTheta = isInitTheta;
+      _thetaModel = thetaModel;
     });
   }
 
@@ -114,6 +116,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
         platformVersion: _platformVersion,
         isInitialized: _isInitTheta,
         connectTheta: initTheta,
+        thetaModel: _thetaModel,
       ),
     );
   }
@@ -123,16 +126,18 @@ class Home extends StatelessWidget {
   final String platformVersion;
   final bool isInitialized;
   final Function connectTheta;
+  final ThetaModel? thetaModel;
   const Home({Key? key,
     required this.platformVersion,
     required this.isInitialized,
     required this.connectTheta,
+    required this.thetaModel,
     }) : super(key: key);
 
 
   @override
   Widget build(BuildContext context) {
-    String camera = isInitialized ? 'connected!': 'disconnected';
+    String camera = isInitialized ? 'connected! $thetaModel': 'disconnected';
     return Scaffold(
         appBar: AppBar(
           title: const Text('Plugin example app'),

demos/demo-flutter/lib/take_picture_screen.dart

@@ -198,13 +198,20 @@ class _TakePictureScreen extends State<TakePictureScreen> with WidgetsBindingObs
       });
       debugPrint('take picture: $fileUrl');
       if (!mounted) return;
-      Navigator.of(context).push(
-        MaterialPageRoute(builder: (_) => PhotoScreen(
-          name: 'Take Picture',
-          fileUrl: fileUrl,
+      if (fileUrl != null) {
+        Navigator.of(context).push(
+          MaterialPageRoute(builder: (_) => PhotoScreen(
+            name: 'Take Picture',
+            fileUrl: fileUrl,
+            )
           )
-        )
-      ).then((value) => startLivePreview());
+        ).then((value) => startLivePreview());
+      } else {
+        setState(() {
+          shooting = true;
+        });
+        debugPrint('takePicture canceled.');
+      }
     }, (exception) {
       setState(() {
         shooting = false;

demos/demo-ios/Podfile

@@ -7,5 +7,5 @@ target 'SdkSample' do
   use_frameworks!
 
   # Pods for SdkSample
-  pod 'THETAClient', '1.4.0'
+  pod 'THETAClient', '1.5.0'
 end

demos/demo-ios/SdkSample/TakePhotoView.swift

@@ -107,12 +107,15 @@ struct TakePhotoView: View {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
             Task {
                 do {
-                    try await theta.takePicture {photoUrl in
-                        let parts = photoUrl.components(separatedBy: "/")
-                        item = FileItem(
-                            name: parts[parts.count - 1],
-                            url: photoUrl
-                        )
+                    try await theta.takePicture { photoUrl in
+                        // When nil, it is canceled.
+                        if let photoUrl {
+                            let parts = photoUrl.components(separatedBy: "/")
+                            item = FileItem(
+                                name: parts[parts.count - 1],
+                                url: photoUrl
+                            )
+                        }
                         isActive = true
                     }
                 } catch {

demos/demo-ios/SdkSample/ThetaSdk.swift

@@ -126,7 +126,7 @@ class Theta {
         completionHandler(response)
     }
 
-    func takePicture(_ callback: @escaping (_ url: String) -> Void) async throws {
+    func takePicture(_ callback: @escaping (_ url: String?) -> Void) async throws {
         try await initialize()
         let photoCapture: PhotoCapture = try await withCheckedThrowingContinuation {continuation in
             thetaRepository!.getPhotoCaptureBuilder()
@@ -144,23 +144,22 @@ class Theta {
             init(_ callback: @escaping (_ url: String?, _ error: Error?) -> Void) {
                 self.callback = callback
             }
-            func onSuccess(fileUrl: String) {
+            func onSuccess(fileUrl: String?) {
                 callback(fileUrl, nil)
             }
             func onProgress(completion: Float) {
             }
             func onError(exception: ThetaException) {
-                callback(nil, exception as? Error)
+                callback(nil, exception.asError())
             }
         }
-        let photoUrl: String = try await withCheckedThrowingContinuation {continuation in
+        let photoUrl: String? = try await withCheckedThrowingContinuation {continuation in
             photoCapture.takePicture(
               callback: Callback {fileUrl, error in
-                  if let photoUrl = fileUrl {
-                      continuation.resume(returning: photoUrl)
-                  }
                   if let thetaError = error {
                       continuation.resume(throwing: thetaError)
+                  } else {
+                      continuation.resume(returning: fileUrl)
                   }
               }
             )

demos/demo-react-native/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@react-navigation/native": "^6.1.0",
     "@react-navigation/native-stack": "^6.9.5",
-    "theta-client-react-native": "1.4.0",
+    "theta-client-react-native": "1.5.0",
     "react": "18.2.0",
     "react-native": "0.70.6",
     "react-native-safe-area-context": "^4.4.1",

flutter/android/build.gradle

@@ -2,7 +2,7 @@ group 'com.ricoh360.thetaclient.theta_client_flutter'
 version '1.0.0'
 
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.20'
     repositories {
         google()
         mavenCentral()
@@ -53,5 +53,5 @@ dependencies {
     implementation("io.ktor:ktor-serialization-kotlinx-json:2.1.2")
     implementation("com.soywiz.korlibs.krypto:krypto:3.4.0")
 
-    implementation("com.ricoh360.thetaclient:theta-client:1.4.0")
+    implementation("com.ricoh360.thetaclient:theta-client:1.5.0")
 }