Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demos/demo-android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,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:$ktor_version"
implementation "com.ricoh360.thetaclient:theta-client:1.13.1"
implementation "com.ricoh360.thetaclient:theta-client:1.13.2"

testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
Expand Down
2 changes: 1 addition & 1 deletion demos/demo-ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ target 'SdkSample' do
use_frameworks!

# Pods for SdkSample
pod 'THETAClient', '1.13.1'
pod 'THETAClient', '1.13.2'
end
2 changes: 1 addition & 1 deletion demos/demo-react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@react-navigation/native": "^6.1.0",
"@react-navigation/native-stack": "^6.9.5",
"theta-client-react-native": "1.13.1",
"theta-client-react-native": "1.13.2",
"react": "18.2.0",
"react-native": "0.71.14",
"react-native-safe-area-context": "^4.4.1",
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorial-android.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

- モジュールの`build.gradle`の`dependencies`に次を追加します。
```
implementation "com.ricoh360.thetaclient:theta-client:1.13.1"
implementation "com.ricoh360.thetaclient:theta-client:1.13.2"
```
- 本 SDK を使用したアプリケーションが動作するスマートフォンと THETA を無線 LAN 接続しておきます。

Expand Down
2 changes: 1 addition & 1 deletion docs/tutorial-android.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
- Add following descriptions to the `dependencies` of your module's `build.gradle`.

```
implementation "com.ricoh360.thetaclient:theta-client:1.13.1"
implementation "com.ricoh360.thetaclient:theta-client:1.13.2"
```

- Connect the wireless LAN between THETA and the smartphone that runs on the application using this SDK.
Expand Down
2 changes: 1 addition & 1 deletion flutter/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ android {
testImplementation("org.mockito:mockito-core:5.0.0")

implementation("com.soywiz.korlibs.krypto:krypto:4.0.10")
implementation("com.ricoh360.thetaclient:theta-client:1.13.1")
implementation("com.ricoh360.thetaclient:theta-client:1.13.2")
}

testOptions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1040,6 +1040,7 @@ fun getOptionValueEnum(name: OptionNameEnum, valueName: String): Any? {
OptionNameEnum.LatestEnabledExposureDelayTime -> ExposureDelayEnum.values().find { it.name == valueName }
OptionNameEnum.MaxRecordableTime -> MaxRecordableTimeEnum.values().find { it.name == valueName }
OptionNameEnum.MicrophoneNoiseReduction -> MicrophoneNoiseReductionEnum.values().find { it.name == valueName }
OptionNameEnum.ModeMemory -> ModeMemoryEnum.values().find { it.name == valueName }
OptionNameEnum.NetworkType -> NetworkTypeEnum.values().find { it.name == valueName }
OptionNameEnum.OffDelay -> OffDelayEnum.values().find { it.name == valueName }
OptionNameEnum.OffDelayUsb -> OffDelayUsbEnum.values().find { it.name == valueName }
Expand Down
2 changes: 2 additions & 0 deletions flutter/ios/Classes/ConvertUtil.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1197,6 +1197,8 @@ func setOptionsValue(options: ThetaRepository.Options, name: String, value: Any)
options.maxRecordableTime = getEnumValue(values: ThetaRepository.MaxRecordableTimeEnum.values(), name: value as! String)!
case ThetaRepository.OptionNameEnum.microphonenoisereduction.name:
options.microphoneNoiseReduction = getEnumValue(values: ThetaRepository.MicrophoneNoiseReductionEnum.values(), name: value as! String)!
case ThetaRepository.OptionNameEnum.modememory.name:
options.modeMemory = getEnumValue(values: ThetaRepository.ModeMemoryEnum.values(), name: value as! String)!
case ThetaRepository.OptionNameEnum.mobilenetworksetting.name:
if let params = value as? [String: Any] {
options.mobileNetworkSetting = toMobileNetworkSetting(params: params)
Expand Down
4 changes: 2 additions & 2 deletions flutter/ios/theta_client_flutter.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
Pod::Spec.new do |s|
s.name = 'theta_client_flutter'
s.version = '1.13.1'
s.version = '1.13.2'
s.summary = 'theta-client plugin project.'
s.description = <<-DESC
theta-client Flutter plugin project.
Expand All @@ -17,7 +17,7 @@ Pod::Spec.new do |s|
s.dependency 'Flutter'
s.platform = :ios, '15.0'

s.dependency 'THETAClient', '1.13.1'
s.dependency 'THETAClient', '1.13.2'

# Flutter.framework does not contain a i386 slice.
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
Expand Down
1 change: 1 addition & 0 deletions flutter/lib/options/importer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export 'file_format.dart';
export 'gps_tag_recording.dart';
export 'max_recordable_time.dart';
export 'microphone_noise_reduction.dart';
export 'mode_memory.dart';
export 'mobile_network_setting.dart';
export 'network_type.dart';
export 'off_delay.dart';
Expand Down
39 changes: 39 additions & 0 deletions flutter/lib/options/mode_memory.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/// Mode Memory
///
/// The default setting is "off", preserving the previous behavior.
/// When set to "on", the following shooting parameters will be retained even after power-off or sleep:
/// - Still image stitching process
/// - Exposure program / Aperture / Shutter speed / ISO sensitivity / Exposure compensation
/// - White balance mode / Color temperature setting
/// - Filters
/// - Interval shooting: number of shots / interval
/// - Multi-bracket shooting: number of shots / parameters
/// - Interval composite shooting: duration / intermediate saving
/// - Time-shift shooting settings (excluding shooting order)
/// - Burst shooting options
/// - Geotag data
enum ModeMemoryEnum {
/// Undefined value
unknown('UNKNOWN'),

/// ON
on('ON'),

/// OFF
off('OFF');

final String rawValue;

const ModeMemoryEnum(this.rawValue);

@override
String toString() {
return rawValue;
}

static ModeMemoryEnum? getValue(String rawValue) {
return ModeMemoryEnum.values.cast<ModeMemoryEnum?>().firstWhere(
(element) => element?.rawValue == rawValue,
orElse: () => null);
}
}
11 changes: 11 additions & 0 deletions flutter/lib/theta_client_flutter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1434,6 +1434,9 @@ enum OptionNameEnum {
microphoneNoiseReduction(
'MicrophoneNoiseReduction', MicrophoneNoiseReductionEnum),

/// Option name _modeMemory
modeMemory('ModeMemory', ModeMemoryEnum),

/// Option name _mobileNetworkSetting
mobileNetworkSetting('MobileNetworkSetting', MobileNetworkSetting),

Expand Down Expand Up @@ -3198,6 +3201,9 @@ class Options {
/// see [MicrophoneNoiseReductionEnum]
MicrophoneNoiseReductionEnum? microphoneNoiseReduction;

/// see [ModeMemoryEnum]
ModeMemoryEnum? modeMemory;

/// see [MobileNetworkSetting]
MobileNetworkSetting? mobileNetworkSetting;

Expand Down Expand Up @@ -3422,6 +3428,8 @@ class Options {
return microphoneNoiseReduction as T;
case OptionNameEnum.mobileNetworkSetting:
return mobileNetworkSetting as T;
case OptionNameEnum.modeMemory:
return modeMemory as T;
case OptionNameEnum.networkType:
return networkType as T;
case OptionNameEnum.offDelay:
Expand Down Expand Up @@ -3643,6 +3651,9 @@ class Options {
case OptionNameEnum.mobileNetworkSetting:
mobileNetworkSetting = value;
break;
case OptionNameEnum.modeMemory:
modeMemory = value;
break;
case OptionNameEnum.networkType:
networkType = value;
break;
Expand Down
5 changes: 5 additions & 0 deletions flutter/lib/utils/convert_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,9 @@ class ConvertUtils {
result.microphoneNoiseReduction =
MicrophoneNoiseReductionEnum.getValue(entry.value);
break;
case OptionNameEnum.modeMemory:
result.modeMemory = ModeMemoryEnum.getValue(entry.value);
break;
case OptionNameEnum.mobileNetworkSetting:
result.mobileNetworkSetting =
convertMobileNetworkSetting(entry.value);
Expand Down Expand Up @@ -954,6 +957,8 @@ class ConvertUtils {
return value.rawValue;
} else if (value is MicrophoneNoiseReductionEnum) {
return value.rawValue;
} else if (value is ModeMemoryEnum) {
return value.rawValue;
} else if (value is MobileNetworkSetting) {
return convertMobileNetworkSettingParam(value);
} else if (value is NetworkTypeEnum) {
Expand Down
2 changes: 1 addition & 1 deletion flutter/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: theta_client_flutter
description: THETA Client Flutter plugin project.
version: 1.13.1
version: 1.13.2
homepage:

environment:
Expand Down
56 changes: 56 additions & 0 deletions flutter/test/options/option_mode_memory_test.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:theta_client_flutter/theta_client_flutter.dart';
import 'package:theta_client_flutter/theta_client_flutter_method_channel.dart';

void main() {
MethodChannelThetaClientFlutter platform = MethodChannelThetaClientFlutter();
const MethodChannel channel = MethodChannel('theta_client_flutter');

TestWidgetsFlutterBinding.ensureInitialized();

setUp(() {
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
.setMockMethodCallHandler(channel, null);
});

tearDown(() {
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
.setMockMethodCallHandler(channel, null);
});

test('ModeMemoryEnum const', () async {
List<List<dynamic>> data = [
[ModeMemoryEnum.unknown, 'UNKNOWN'],
[ModeMemoryEnum.on, 'ON'],
[ModeMemoryEnum.off, 'OFF']
];
expect(data.length, ModeMemoryEnum.values.length, reason: 'enum count');
for (int i = 0; i < data.length; i++) {
expect(data[i][0].toString(), data[i][1], reason: data[i][1]);
}
});

test('getOptions', () async {
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
.setMockMethodCallHandler(channel, (MethodCall methodCall) async {
Map<String, dynamic> optionMap = {};
optionMap['ModeMemory'] = 'ON';
return Future.value(optionMap);
});
Options options = await platform.getOptions([OptionNameEnum.modeMemory]);
expect(options.modeMemory?.rawValue, 'ON', reason: 'modeMemory');
});

test('setOptions', () async {
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
.setMockMethodCallHandler(channel, (MethodCall methodCall) async {
var arguments = methodCall.arguments as Map<dynamic, dynamic>;
expect(arguments['ModeMemory'], 'OFF', reason: 'modeMemory');
return Future.value();
});
final options = Options();
options.modeMemory = ModeMemoryEnum.off;
await platform.setOptions(options);
});
}
3 changes: 2 additions & 1 deletion kotlin-multiplatform/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ plugins {
signing
id("io.gitlab.arturbosch.detekt").version("1.23.3")
id("com.vanniktech.maven.publish") version "0.32.0"
id("com.goncalossilva.resources") version "0.4.0"
}

dependencies {
dokkaPlugin("org.jetbrains.dokka:versioning-plugin:1.9.20")
}

val thetaClientVersion = "1.13.1"
val thetaClientVersion = "1.13.2"
group = "com.ricoh360.thetaclient"
version = thetaClientVersion

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,8 @@ class AndroidGreetingTest {
fun testExample() {
assertTrue("Check Android is mentioned", Greeting().greeting().contains("Android"))
}
}
}

actual fun getEnv(name: String): String? {
return System.getenv(name)
}
Loading
Loading