Merge pull request #2 from ricohapi/feature/support_x

THETA X is supported.

README.md

@@ -1,66 +1,70 @@
 # Automatic Face Blur plug-in
 
-# 1. Overview
+Version: 1.7.0
 
 This plug-in detects faces from spherical pictures and blur them.
 
-# 2. Terms of Service
+## History
 
-> You agree to comply with all applicable export and import laws and regulations applicable to the jurisdiction in which the Software was obtained and in which it is used. Without limiting the foregoing, in connection with use of the Software, you shall not export or re-export the Software into any U.S. embargoed countries (currently including, but necessarily limited to, Crimea – Region of Ukraine, Cuba, Iran, North Korea, Sudan and Syria) or to anyone on the U.S. Treasury Department’s list of Specially Designated Nationals or the U.S. Department of Commerce Denied Person’s List or Entity List.  By using the Software, you represent and warrant that you are not located in any such country or on any such list.  You also agree that you will not use the Software for any purposes prohibited by any applicable laws, including, without limitation, the development, design, manufacture or production of missiles, nuclear, chemical or biological weapons.
+* Version.1.7.0 (2022/10/25): THETA X is supported.
+* Version.1.6.0 (2019/05/08): THETA Z1 is supported.
+* Version.1.5.0 (2018/12/04): Terminate the plug-in when there is no space for Theta to take picture.
+* Version.1.4.0 (2018/11/05): Check remaining space of Theta.
+* Version.1.3.0 (2018/10/05): Bug fix.
+* Version.1.2.0 (2018/08/08): Bug fix.
+* Version.1.1.0 (2018/07/25): Initial version for GitHub.
 
-By using the Automatic Face Blur plug-in, you are agreeing to the above and the license terms, [license.txt](license.txt).
-
-Copyright © 2019 Ricoh Company, Ltd.
+## Development Environment
 
-# 3. Development Environment
+* RICOH THETA X  (Version 1.20.0)
+* RICOH THETA Z1 (Version 2.10.3)
+* RICOH THETA V  (Version 3.80.2)
 
-* RICOH THETA V and Z1
-* Firmware version 2.50.1 (V), 1.03.5 (Z1)
+Tips : How to update your RICOH THETA firmware:
+> * [THETA X](https://support.theta360.com/en/manual/x/content/update/update_01.html)
+> * [THETA Z1](https://support.theta360.com/en/manual/z1/content/update/update_01.html)
+> * [THETA V](https://support.theta360.com/en/manual/v/content/update/update_01.html)
 
-    > How to update your RICOH THETA
-    > * [THETA V](https://support.theta360.com/en/manual/v/content/update/update_01.html)
-    > * [THETA Z1](https://support.theta360.com/en/manual/z1/content/update/update_01.html)
-
-# 4. Install
+## Install
 
 Android Studio install apk after build automatically. Or use the following command after build.
 
 ```
 adb install -r app-debug.apk
 ```
 
-### Give permissions for this plug-in.
+### Give permissions for this plug-in. (THETA V/Z1 only)
 
   Using desktop viewing app as Vysor, open Settings app and turns on the permissions at "Apps" > "Automatic Face Blur" > "Permissions"
 
-# 5. How to Use
+## How to Use
 
 1. Turn on the THETA.
 2. Open RICOH THETA app on your Win/Mac.
 3. Set this plug-in as an active plugin from "File" > "Plug-in management..."
-4. Connect THETA to Wireless-LAN by client mode or access point mode.  
+4. Connect THETA to Wireless-LAN by client mode or access point mode.
    To connect THETA to Wireless-LAN by client mode,
    for example, let's assume that there is a macOS machine,
-   a THETA and an iPhone on the same wireless LAN.  
+   a THETA and an iPhone on the same wireless LAN.
    We also recommend that the THETA be close to fully charged with an AC-USB adapter.
-5. Set default plug-in  
-   Open the THETA mobile app on an iOS/Android smartphone  
-   Tap "Settings" at right bottom corner  
-   Confirm "Connection" is "Wi-Fi" or "Wi-Fi+Bluetooth".  
-   Tap "Camera settings"  
-   Tap "Plug-in"  
-   Select "Automatic Face Blur"  
-6. Check IP address of the camera  
-   Back to the Camera settings  
-   Check IP-address of THETA on smartphone app  
+5. Set default plug-in
+   Open the THETA mobile app on an iOS/Android smartphone
+   Tap "Settings" at right bottom corner
+   Confirm "Connection" is "Wi-Fi" or "Wi-Fi+Bluetooth".
+   Tap "Camera settings"
+   Tap "Plug-in"
+   Select "Automatic Face Blur"
+6. Check IP address of the camera
+   Back to the Camera settings
+   Check IP-address of THETA on smartphone app
    If you use macOS type "dns-sd -q THETAYL01234567.local" in Terminal. Here "THETAYL01234567" is an example, please change to your serial number.
-7. Launch plug-in  
+7. Launch plug-in
    Press Mode button till LED2 turns white or Open from the smartphone app (RICOH THETA)
 8. If you use WebUI of the plug-in,
     when you connect with THETA by access point mode,
-    open the URL (http://192.168.1.1/:8888) on the browser.  
+    open the URL (http://192.168.1.1/:8888) on the browser.
     When you connect with THETA by client mode,
-    open the URL (http://(ip-address):8888) on the browser.  
+    open the URL (http://(ip-address):8888) on the browser.
     Here, (ip-address) is example. Change it to your THETA's IP address.
 9. You can set options like shooting mode, shutter speed, ISO sensitivity, White balance and EV by WebUI of the plug-in.
 10. Position the camera and press the shutter button on the WebUI of the plug-in to take a picture that will be blurred.
@@ -69,16 +73,14 @@ adb install -r app-debug.apk
 12. Audio will sound when you press the shutter button. Audio will sound when Automatic face blur process starts and finishes.
 13. Press the Mode Button more than 2 seconds to finish this plugin.
 
-# 6. History
+---
+## Terms of Service
 
-* v.1.1.0 (2018/07/25): Initial version for github.
-* v.1.2.0 (2018/08/08): Bug fix.
-* v.1.3.0 (2018/10/05): Bug fix.
-* v.1.4.0 (2018/11/05): Check remaining space of Theta.
-* v.1.5.0 (2018/12/04): Terminate the plug-in when there is no space for Theta to take picture.
-* v.1.6.0 (2019/05/08): THETA Z1 is supported.
+> You agree to comply with all applicable export and import laws and regulations applicable to the jurisdiction in which the Software was obtained and in which it is used. Without limiting the foregoing, in connection with use of the Software, you shall not export or re-export the Software into any U.S. embargoed countries (currently including, but necessarily limited to, Crimea ? Region of Ukraine, Cuba, Iran, North Korea, Sudan and Syria) or to anyone on the U.S. Treasury Department�fs list of Specially Designated Nationals or the U.S. Department of Commerce Denied Person�fs List or Entity List.? By using the Software, you represent and warrant that you are not located in any such country or on any such list.? You also agree that you will not use the Software for any purposes prohibited by any applicable laws, including, without limitation, the development, design, manufacture or production of missiles, nuclear, chemical or biological weapons.
 
----
+By using the Automatic Face Blur plug-in, you are agreeing to the above and the license terms, [license.txt](license.txt).
+
+Copyright © 2019 Ricoh Company, Ltd.
 
 ## Trademark Information
 
@@ -87,6 +89,6 @@ The names of products and services described in this document are trademarks or
 * Android, Nexus, Google Chrome, Google Play, Google Play logo, Google Maps, Google+, Gmail, Google Drive, Google Cloud Print and YouTube are trademarks of Google Inc.
 * Apple, Apple logo, Macintosh, Mac, Mac OS, OS X, AppleTalk, Apple TV, App Store, AirPrint, Bonjour, iPhone, iPad, iPad mini, iPad Air, iPod, iPod mini, iPod classic, iPod touch, iWork, Safari, the App Store logo, the AirPrint logo, Retina and iPad Pro are trademarks of Apple Inc., registered in the United States and other countries. The App Store is a service mark of Apple Inc.
 * Microsoft, Windows, Windows Vista, Windows Live, Windows Media, Windows Server System, Windows Server, Excel, PowerPoint, Photosynth, SQL Server, Internet Explorer, Azure, Active Directory, OneDrive, Outlook, Wingdings, Hyper-V, Visual Basic, Visual C ++, Surface, SharePoint Server, Microsoft Edge, Active Directory, BitLocker, .NET Framework and Skype are registered trademarks or trademarks of Microsoft Corporation in the United States and other countries. The name of Skype, the trademarks and logos associated with it, and the "S" logo are trademarks of Skype or its affiliates.
-* Wi-Fi™, Wi-Fi Certified Miracast, Wi-Fi Certified logo, Wi-Fi Direct, Wi-Fi Protected Setup, WPA, WPA 2 and Miracast are trademarks of the Wi-Fi Alliance.
+* Wi-Fi?, Wi-Fi Certified Miracast, Wi-Fi Certified logo, Wi-Fi Direct, Wi-Fi Protected Setup, WPA, WPA 2 and Miracast are trademarks of the Wi-Fi Alliance.
 * The official name of Windows is Microsoft Windows Operating System.
 * All other trademarks belong to their respective owners.

app/build.gradle

@@ -17,8 +17,8 @@ android {
         applicationId "com.theta360.automaticfaceblur"
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-        versionCode 6
-        versionName "1.6.0"
+        versionCode 7
+        versionName "1.7.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -40,7 +40,7 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
     implementation "com.jakewharton.timber:timber:${project.TIMBER_VERSION}"
-    implementation project(':pluginlibrary')
+    implementation 'com.theta360:pluginlibrary:3.0.3'
     implementation "com.koushikdutta.async:androidasync:${project.ANDROIDASYNC_VERSION}"
     implementation "com.google.code.gson:gson:${project.GSON_VERSION}"
 }

app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
+    <uses-feature android:name="com.theta360.receptor.x"  android:required="true"/>
     <uses-feature android:name="com.theta360.receptor.v" android:required="true" />
     <uses-feature android:name="com.theta360.receptor.z1" android:required="true" />
 
@@ -22,6 +23,7 @@
         <activity
             android:label="@string/app_name"
             android:name=".MainActivity"
+            android:configChanges="keyboard|navigation|keyboardHidden"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>