Merge pull request #60 from ricohapi/dev/1.7.0

Dev/1.7.0

.github/workflows/kotlin_checker.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.7"
+          ruby-version: "3.0"
           architecture: "x64"
       - name: Setup JDK
         uses: actions/setup-java@v3

.github/workflows/test-flutter.yaml

@@ -0,0 +1,23 @@
+name: Test flutter
+
+on:
+  workflow_dispatch:
+  workflow_call:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: macos-13
+    steps:
+    - uses: actions/checkout@v3
+    - name: flutter
+      uses: subosito/[email protected]
+      with:
+        architecture: arm64
+    - name: test-flutter
+      run: |
+        cd ./flutter
+        flutter pub get
+        flutter test

.github/workflows/test-kmp.yaml

@@ -0,0 +1,29 @@
+name: Test kmp
+
+on:
+  workflow_dispatch:
+  workflow_call:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: macos-13
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+    - name: Build and Test with Gradle
+      uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
+      with:
+        arguments: testReleaseUnitTest
+    - name: Archive code coverage results
+      if: always()
+      uses: actions/upload-artifact@v1
+      with:
+        name: test-kmp-report
+        path: kotlin-multiplatform/build/reports/tests/testReleaseUnitTest

.github/workflows/test-pull-request.yaml

@@ -8,22 +8,9 @@ permissions:
   contents: read
 
 jobs:
-  build:
-    runs-on: macos-12
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-    - name: Build and Test with Gradle
-      uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
-      with:
-        arguments: testReleaseUnitTest
-    - name: Archive code coverage results
-      if: always()
-      uses: actions/upload-artifact@v1
-      with:
-        name: code-coverage-report
-        path: kotlin-multiplatform/build/reports/tests/testReleaseUnitTest
+  call-test-kmp:
+    uses: ./.github/workflows/test-kmp.yaml
+  call-test-rn:
+    uses: ./.github/workflows/test-rn.yaml
+  call-test-flutter:
+    uses: ./.github/workflows/test-flutter.yaml

.github/workflows/test-rn.yaml

@@ -0,0 +1,29 @@
+name: Test react native
+
+on:
+  workflow_dispatch:
+  workflow_call:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: macos-13
+    steps:
+    - uses: actions/checkout@v3
+    - name: Use Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: '18.x'
+    - name: test-rn
+      run: |
+        cd ./react-native
+        yarn install
+        yarn test --collectCoverage
+    - name: Archive code coverage results
+      if: always()
+      uses: actions/upload-artifact@v1
+      with:
+        name: test-react-native-report
+        path: react-native/coverage

.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+  "[dart]": {
+    "editor.formatOnSave": true
+  },
+
+  "[javascript][javascriptreact][typescript][typescriptreact]": {
+    "editor.codeActionsOnSave": {
+      "source.fixAll.eslint": "explicit"
+    }
+  }
+}

config/detekt.yml

@@ -88,7 +88,7 @@ complexity:
   active: true
   ComplexCondition:
     active: true
-    threshold: 10
+    threshold: 20
   #  ComplexInterface:
   #    active: false
   #    threshold: 10

demos/demo-android/app/build.gradle

@@ -73,7 +73,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.6.0"
+    implementation "com.ricoh360.thetaclient:theta-client:1.7.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

@@ -9,6 +9,7 @@ import androidx.compose.material.FloatingActionButton
 import androidx.compose.material.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
@@ -55,6 +56,11 @@ fun PreviewScreen(toPhoto: (photoUrl: String) -> Unit, viewModel: ThetaViewModel
         }
     }
 
+    LaunchedEffect(Unit) {
+        viewModel.startPreview()
+        //viewModel.startPreviewWithCallback()
+    }
+
     DisposableEffect(LocalLifecycleOwner.current) {
         onDispose {
             viewModel.stopPreview()
@@ -76,8 +82,6 @@ fun PreviewScreen(toPhoto: (photoUrl: String) -> Unit, viewModel: ThetaViewModel
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Center
             ) {
-                viewModel.startPreview()
-                //viewModel.startPreviewWithCallback()
                 val bitmap by viewModel.previewFlow.collectAsState()
                 bitmap?.let {
                     // Viewer360(bitmap!!)

demos/demo-flutter/android/build.gradle

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

demos/demo-flutter/ios/Podfile.lock

@@ -2,33 +2,27 @@ PODS:
   - Flutter (1.0.0)
   - theta_client_flutter (1.6.0):
     - Flutter
-    - THETAClient (= 1.6.0)
-  - THETAClient (1.6.0)
   - video_player_avfoundation (0.0.1):
     - Flutter
+    - FlutterMacOS
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
   - theta_client_flutter (from `.symlinks/plugins/theta_client_flutter/ios`)
-  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
-
-SPEC REPOS:
-  trunk:
-    - THETAClient
+  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
 
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
   theta_client_flutter:
     :path: ".symlinks/plugins/theta_client_flutter/ios"
   video_player_avfoundation:
-    :path: ".symlinks/plugins/video_player_avfoundation/ios"
+    :path: ".symlinks/plugins/video_player_avfoundation/darwin"
 
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  theta_client_flutter: b5ee80b54aa65b2242977fc6a16434658e09aeec
-  THETAClient: ec3017833a6a4295be859b024e4991270fcf600b
-  video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126
+  theta_client_flutter: c907d880746a822002ee370cce37587ed496bd3e
+  video_player_avfoundation: e9e6f9cae7d7a6d9b43519b0aab382bca60fcfd1
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 

demos/demo-flutter/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -68,7 +68,6 @@
 				4C0661A8B4EA6BD98CA30345 /* Pods-Runner.release.xcconfig */,
 				519524CB33792C83879372DF /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -156,7 +155,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -200,10 +199,12 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -253,6 +254,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);

demos/demo-flutter/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

demos/demo-flutter/lib/capture_video_screen.dart

@@ -6,7 +6,7 @@ import 'package:theta_client_flutter/theta_client_flutter.dart';
 import 'message_box.dart';
 
 class CaptureVideoScreen extends StatefulWidget {
-  const CaptureVideoScreen({Key? key}) : super(key: key);
+  const CaptureVideoScreen({super.key});
 
   @override
   State<StatefulWidget> createState() {
@@ -70,7 +70,8 @@ class _CaptureVideoScreen extends State<CaptureVideoScreen>
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
+    return PopScope(
+      canPop: true,
       child: Scaffold(
         appBar: AppBar(title: const Text('Capture Video')),
         body: Stack(
@@ -114,7 +115,9 @@ class _CaptureVideoScreen extends State<CaptureVideoScreen>
           ],
         ),
       ),
-      onWillPop: () => backButtonPress(context),
+      onPopInvoked: (didPop) async {
+        backButtonPress(context);
+      },
     );
   }
 

demos/demo-flutter/lib/file_list_screen.dart

@@ -7,7 +7,7 @@ import 'package:theta_client_flutter/theta_client_flutter.dart';
 import 'message_box.dart';
 
 class FileListScreen extends StatefulWidget {
-  const FileListScreen({Key? key}) : super(key: key);
+  const FileListScreen({super.key});
 
   @override
   State<StatefulWidget> createState() {
@@ -32,6 +32,7 @@ class _FileListScreen extends State<FileListScreen> {
       var result = await _thetaClientFlutter.listFiles(FileTypeEnum.all, 10000);
       fileInfoList = result.fileList;
     } on PlatformException {
+      if (!mounted) return;
       Navigator.pop(context);
       MessageBox.show(context, 'Error listFiles', () {
         Navigator.pop(context);

demos/demo-flutter/lib/main.dart

@@ -128,12 +128,12 @@ class Home extends StatelessWidget {
   final ThetaModel? thetaModel;
 
   const Home({
-    Key? key,
+    super.key,
     required this.platformVersion,
     required this.isInitialized,
     required this.connectTheta,
     required this.thetaModel,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {

demos/demo-flutter/lib/message_box.dart

@@ -4,8 +4,7 @@ class MessageBox extends StatelessWidget {
   final String title;
   final Function? onClose;
 
-  const MessageBox({Key? key, required this.title, this.onClose})
-      : super(key: key);
+  const MessageBox({super.key, required this.title, this.onClose});
 
   @override
   Widget build(BuildContext context) {

demos/demo-flutter/lib/photo_screen.dart

@@ -5,10 +5,10 @@ class PhotoScreen extends StatelessWidget {
   final String fileUrl;
 
   const PhotoScreen({
-    Key? key,
+    super.key,
     required this.name,
     required this.fileUrl,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {

demos/demo-flutter/lib/take_picture_screen.dart

@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:theta_client_flutter/theta_client_flutter.dart';
 
 class TakePictureScreen extends StatefulWidget {
-  const TakePictureScreen({Key? key}) : super(key: key);
+  const TakePictureScreen({super.key});
 
   @override
   State<StatefulWidget> createState() {
@@ -68,7 +68,8 @@ class _TakePictureScreen extends State<TakePictureScreen>
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
+    return PopScope(
+      canPop: true,
       child: Scaffold(
         appBar: AppBar(title: const Text('Take Picture')),
         body: Stack(
@@ -112,7 +113,9 @@ class _TakePictureScreen extends State<TakePictureScreen>
           ],
         ),
       ),
-      onWillPop: () => backButtonPress(context),
+      onPopInvoked: (didPop) async {
+        backButtonPress(context);
+      },
     );
   }