androidx対応。

diff --git a/app/build.gradle b/app/build.gradle
index 4c621cf..46d789c 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "net.osdn.gokigen.a01d"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 10203
-        versionName "1.2.3"
+        versionCode 10300
+        versionName "1.3.0"
     }
     buildTypes {
         release {
@@ -20,10 +20,12 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'com.android.support:appcompat-v7:28.0.0'
-    api 'com.android.support.constraint:constraint-layout:1.1.3'
-    api 'com.android.support:preference-v14:28.0.0'
-    api 'com.android.support:preference-v7:28.0.0'
-    api 'com.android.support:exifinterface:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.vectordrawable:vectordrawable:1.0.1'
+
     api files('libs/olycamerakit.jar')
 }

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java b/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java
index 992bd17..a412d25 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java
@@ -3,15 +3,7 @@ package net.osdn.gokigen.a01d;
 import android.Manifest;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.support.v7.preference.PreferenceFragmentCompat;
-import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 import android.view.WindowManager;
 import android.widget.Toast;
@@ -31,6 +23,15 @@ import net.osdn.gokigen.a01d.preference.olympus.PreferenceFragment;
 import net.osdn.gokigen.a01d.preference.ricohgr2.RicohGr2PreferenceFragment;
 import net.osdn.gokigen.a01d.preference.sony.SonyPreferenceFragment;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
+
 /**
  *   A01d ;
  *

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/ConfirmationDialog.java b/app/src/main/java/net/osdn/gokigen/a01d/ConfirmationDialog.java
index bc5756c..ab642dd 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/ConfirmationDialog.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/ConfirmationDialog.java
@@ -3,8 +3,9 @@ package net.osdn.gokigen.a01d;
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
 
 public class ConfirmationDialog extends DialogFragment
 {

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/CameraInterfaceProvider.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/CameraInterfaceProvider.java
index ff93168..b6158fc 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/CameraInterfaceProvider.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/CameraInterfaceProvider.java
@@ -2,8 +2,6 @@ package net.osdn.gokigen.a01d.camera;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.PreferenceManager;
 
 import net.osdn.gokigen.a01d.camera.olympus.wrapper.IOlympusLiveViewListener;
 import net.osdn.gokigen.a01d.camera.olympus.IOlympusInterfaceProvider;
@@ -15,6 +13,9 @@ import net.osdn.gokigen.a01d.camera.sony.wrapper.SonyCameraWrapper;
 import net.osdn.gokigen.a01d.liveview.ICameraStatusUpdateNotify;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
+import androidx.annotation.NonNull;
+import androidx.preference.PreferenceManager;
+
 public class CameraInterfaceProvider implements IInterfaceProvider
 {
     private final Activity context;

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/CameraStatusListener.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/CameraStatusListener.java
index 90f3a84..744a669 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/CameraStatusListener.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/CameraStatusListener.java
@@ -1,11 +1,12 @@
 package net.osdn.gokigen.a01d.camera;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.sony.wrapper.eventlistener.CameraChangeListerTemplate;
 import net.osdn.gokigen.a01d.liveview.ICameraStatusUpdateNotify;
 
+import androidx.annotation.NonNull;
+
 public class CameraStatusListener extends CameraChangeListerTemplate implements ICameraStatusUpdateNotify
 {
     private  final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/ICameraStatus.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/ICameraStatus.java
index 8f7f30c..aaf73e0 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/ICameraStatus.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/ICameraStatus.java
@@ -1,14 +1,12 @@
 package net.osdn.gokigen.a01d.camera;
 
-import android.support.annotation.NonNull;
-
 import java.util.List;
 
 public interface ICameraStatus
 {
-    @NonNull List<String> getStatusList(@NonNull final String key);
-    String getStatus(@NonNull final String key);
-    void setStatus(@NonNull final String key, @NonNull final String value);
+    List<String> getStatusList(final String key);
+    String getStatus(final String key);
+    void setStatus(final String key, final String value);
 
     String BATTERY = "battery";
     String STATE = "state";

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/ICameraStatusWatcher.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/ICameraStatusWatcher.java
index 7530eb4..c4812d8 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/ICameraStatusWatcher.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/ICameraStatusWatcher.java
@@ -1,9 +1,10 @@
 package net.osdn.gokigen.a01d.camera;
 
-import android.support.annotation.NonNull;
 
 import net.osdn.gokigen.a01d.liveview.ICameraStatusUpdateNotify;
 
+import androidx.annotation.NonNull;
+
 public interface ICameraStatusWatcher
 {
     void startStatusWatch(@NonNull ICameraStatusUpdateNotify notifier);

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/IInterfaceProvider.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/IInterfaceProvider.java
index 8c770b6..361bd28 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/IInterfaceProvider.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/IInterfaceProvider.java
@@ -1,13 +1,13 @@
 package net.osdn.gokigen.a01d.camera;
 
-import android.support.annotation.NonNull;
-
 import net.osdn.gokigen.a01d.camera.olympus.wrapper.IOlympusLiveViewListener;
 import net.osdn.gokigen.a01d.camera.olympus.IOlympusInterfaceProvider;
 import net.osdn.gokigen.a01d.camera.ricohgr2.IRicohGr2InterfaceProvider;
 import net.osdn.gokigen.a01d.camera.sony.ISonyInterfaceProvider;
 import net.osdn.gokigen.a01d.liveview.ICameraStatusUpdateNotify;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  */

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyArrayAdapter.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyArrayAdapter.java
index 762c6da..71ac426 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyArrayAdapter.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyArrayAdapter.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.a01d.camera.olympus.cameraproperty;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,6 +10,8 @@ import android.widget.TextView;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 public class CameraPropertyArrayAdapter extends ArrayAdapter<CameraPropertyArrayItem>
 {
     private LayoutInflater inflater;

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyOperator.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyOperator.java
index 1ddce5c..a66e9a6 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyOperator.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyOperator.java
@@ -1,6 +1,5 @@
 package net.osdn.gokigen.a01d.camera.olympus.cameraproperty;
 
-
 import android.content.Context;
 import android.util.Log;
 import android.view.View;

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyValueSelector.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyValueSelector.java
index 37c656f..2d2af72 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyValueSelector.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/CameraPropertyValueSelector.java
@@ -1,10 +1,7 @@
 package net.osdn.gokigen.a01d.camera.olympus.cameraproperty;
 
-
-
 import android.content.Context;
 import android.content.DialogInterface;
-import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
@@ -15,6 +12,8 @@ import net.osdn.gokigen.a01d.camera.olympus.wrapper.property.IOlyCameraPropertyP
 
 import java.util.List;
 
+import androidx.appcompat.app.AlertDialog;
+
 public class CameraPropertyValueSelector implements ListView.OnItemClickListener, ListView.OnLongClickListener, DialogInterface.OnClickListener
 {
     private final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/OlyCameraPropertyListFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/OlyCameraPropertyListFragment.java
index c275e45..a55e0e3 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/OlyCameraPropertyListFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/cameraproperty/OlyCameraPropertyListFragment.java
@@ -4,10 +4,6 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -23,6 +19,11 @@ import java.util.HashMap;
 import net.osdn.gokigen.a01d.R;
 import net.osdn.gokigen.a01d.camera.olympus.wrapper.property.IOlyCameraPropertyProvider;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+
 public class OlyCameraPropertyListFragment extends Fragment implements CameraPropertyLoader.IPropertyLoaderCallback
 {
     private final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadMyCameraPropertyFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadMyCameraPropertyFragment.java
index dec63da..fb4aec8 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadMyCameraPropertyFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadMyCameraPropertyFragment.java
@@ -3,7 +3,6 @@ package net.osdn.gokigen.a01d.camera.olympus.myolycameraprops;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.ListFragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -17,6 +16,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import androidx.fragment.app.ListFragment;
+
 public class LoadMyCameraPropertyFragment extends ListFragment implements ListView.OnItemClickListener
 {
     private final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyDialog.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyDialog.java
index 9ea9861..c688144 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyDialog.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyDialog.java
@@ -1,11 +1,6 @@
 package net.osdn.gokigen.a01d.camera.olympus.myolycameraprops;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTabHost;
-import android.support.v4.view.ViewPager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,6 +9,12 @@ import android.widget.TabHost;
 
 import net.osdn.gokigen.a01d.R;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTabHost;
+import androidx.viewpager.widget.ViewPager;
+
 
 public class LoadSaveMyCameraPropertyDialog extends DialogFragment implements TabHost.OnTabChangeListener, ViewPager.OnPageChangeListener, ILoadSaveMyCameraPropertyDialogDismiss
 {

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyPagerAdapter.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyPagerAdapter.java
index bb85eb9..5146fd2 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyPagerAdapter.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyPagerAdapter.java
@@ -1,10 +1,11 @@
 package net.osdn.gokigen.a01d.camera.olympus.myolycameraprops;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
 import android.util.Log;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+
 class LoadSaveMyCameraPropertyPagerAdapter extends FragmentPagerAdapter
 {
     private final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/MyCameraPropertyLoadArrayAdapter.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/MyCameraPropertyLoadArrayAdapter.java
index 7d87033..ac63c61 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/MyCameraPropertyLoadArrayAdapter.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/MyCameraPropertyLoadArrayAdapter.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.a01d.camera.olympus.myolycameraprops;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,6 +9,8 @@ import android.widget.TextView;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 class MyCameraPropertyLoadArrayAdapter extends ArrayAdapter<MyCameraPropertySetItems>
 {
     private LayoutInflater inflater;

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/MyCameraPropertySetArrayAdapter.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/MyCameraPropertySetArrayAdapter.java
index 1080878..78beab9 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/MyCameraPropertySetArrayAdapter.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/MyCameraPropertySetArrayAdapter.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.a01d.camera.olympus.myolycameraprops;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,6 +15,8 @@ import net.osdn.gokigen.a01d.R;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 class MyCameraPropertySetArrayAdapter  extends ArrayAdapter<MyCameraPropertySetItems>
 {
     private final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/SaveMyCameraPropertyFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/SaveMyCameraPropertyFragment.java
index 280d295..f34e86c 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/SaveMyCameraPropertyFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/myolycameraprops/SaveMyCameraPropertyFragment.java
@@ -3,7 +3,6 @@ package net.osdn.gokigen.a01d.camera.olympus.myolycameraprops;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.ListFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,6 +13,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import androidx.fragment.app.ListFragment;
+
 public class SaveMyCameraPropertyFragment extends ListFragment
 {
     private ILoadSaveMyCameraPropertyDialogDismiss dialogDismiss = null;

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/operation/CameraPowerOff.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/operation/CameraPowerOff.java
index a76188e..ff8bfbb 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/operation/CameraPowerOff.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/operation/CameraPowerOff.java
@@ -2,13 +2,14 @@ package net.osdn.gokigen.a01d.camera.olympus.operation;
 
 
 import android.content.Context;
-import android.support.v7.preference.Preference;
 
 import net.osdn.gokigen.a01d.ConfirmationDialog;
 import net.osdn.gokigen.a01d.IChangeScene;
 import net.osdn.gokigen.a01d.R;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
+import androidx.preference.Preference;
+
 /**
  *  Preferenceがクリックされた時に処理するクラス
  *

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/OlyCameraWrapper.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/OlyCameraWrapper.java
index 6e27ea7..350f794 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/OlyCameraWrapper.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/OlyCameraWrapper.java
@@ -3,7 +3,6 @@ package net.osdn.gokigen.a01d.camera.olympus.wrapper;
 import android.app.Activity;
 import android.content.SharedPreferences;
 import android.graphics.PointF;
-import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.ILiveViewControl;
@@ -12,6 +11,7 @@ import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
 import java.util.Map;
 
+import androidx.preference.PreferenceManager;
 import jp.co.olympus.camerakit.OLYCamera;
 import jp.co.olympus.camerakit.OLYCameraLiveViewListener;
 

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/OlyCameraZoomLensControl.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/OlyCameraZoomLensControl.java
index 8d9c6d1..744c93f 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/OlyCameraZoomLensControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/OlyCameraZoomLensControl.java
@@ -2,12 +2,12 @@ package net.osdn.gokigen.a01d.camera.olympus.wrapper;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.IZoomLensControl;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
+import androidx.preference.PreferenceManager;
 import jp.co.olympus.camerakit.OLYCamera;
 
 /**

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/OlyCameraConnection.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/OlyCameraConnection.java
index 34b9f08..064ce99 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/OlyCameraConnection.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/OlyCameraConnection.java
@@ -12,7 +12,6 @@ import android.net.wifi.WifiManager;
 import android.os.Handler;
 import android.os.Message;
 import android.provider.Settings;
-import android.support.v7.app.AlertDialog;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.R;
@@ -22,6 +21,7 @@ import net.osdn.gokigen.a01d.camera.ICameraStatusReceiver;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
+import androidx.appcompat.app.AlertDialog;
 import jp.co.olympus.camerakit.OLYCamera;
 import jp.co.olympus.camerakit.OLYCameraConnectionListener;
 import jp.co.olympus.camerakit.OLYCameraKitException;

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraEntryListDialog.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraEntryListDialog.java
index 7da6df8..9c91d86 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraEntryListDialog.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraEntryListDialog.java
@@ -3,10 +3,6 @@ package net.osdn.gokigen.a01d.camera.olympus.wrapper.connection.ble;
 import android.app.Dialog;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -18,6 +14,11 @@ import net.osdn.gokigen.a01d.R;
 import java.text.DateFormat;
 import java.util.Date;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 public class OlyCameraEntryListDialog extends DialogFragment implements IOlyCameraSetDialogDismiss
 {
     private final String TAG = this.toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraEntryListFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraEntryListFragment.java
index 35e4187..82c12eb 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraEntryListFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraEntryListFragment.java
@@ -2,8 +2,6 @@ package net.osdn.gokigen.a01d.camera.olympus.wrapper.connection.ble;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ListFragment;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -16,6 +14,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.ListFragment;
+
 public class OlyCameraEntryListFragment extends ListFragment
 {
     private String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraPowerOnSelector.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraPowerOnSelector.java
index 60e8a0c..c15a2e0 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraPowerOnSelector.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraPowerOnSelector.java
@@ -1,18 +1,20 @@
 package net.osdn.gokigen.a01d.camera.olympus.wrapper.connection.ble;
 
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.ConfirmationDialog;
 import net.osdn.gokigen.a01d.R;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.preference.Preference;
+
 /**
  *   Olympus AIR の Bluetooth設定を記録する
  *
  *
  */
-public class OlyCameraPowerOnSelector implements android.support.v7.preference.Preference.OnPreferenceClickListener, ConfirmationDialog.Callback
+public class OlyCameraPowerOnSelector implements Preference.OnPreferenceClickListener, ConfirmationDialog.Callback
 {
     private final String TAG = toString();
     private final AppCompatActivity context;
@@ -43,7 +45,7 @@ public class OlyCameraPowerOnSelector implements android.support.v7.preference.P
      * @return false : ハンドルしない / true : ハンドルした
      */
     @Override
-    public boolean onPreferenceClick(android.support.v7.preference.Preference preference)
+    public boolean onPreferenceClick(Preference preference)
     {
         Log.v(TAG, "onPreferenceClick() : ");
         if (!preference.hasKey())

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraSetArrayAdapter.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraSetArrayAdapter.java
index 6dd445d..a619180 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraSetArrayAdapter.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympus/wrapper/connection/ble/OlyCameraSetArrayAdapter.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.a01d.camera.olympus.wrapper.connection.ble;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,6 +15,8 @@ import net.osdn.gokigen.a01d.R;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 
 public class OlyCameraSetArrayAdapter extends ArrayAdapter<OlyCameraSetArrayItem>
 {

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/CameraPowerOffRicohGr2.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/CameraPowerOffRicohGr2.java
index 7b4f0ac..8b19928 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/CameraPowerOffRicohGr2.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/CameraPowerOffRicohGr2.java
@@ -1,13 +1,14 @@
 package net.osdn.gokigen.a01d.camera.ricohgr2.operation;
 
 import android.content.Context;
-import android.support.v7.preference.Preference;
 
 import net.osdn.gokigen.a01d.ConfirmationDialog;
 import net.osdn.gokigen.a01d.IChangeScene;
 import net.osdn.gokigen.a01d.R;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
+import androidx.preference.Preference;
+
 public class CameraPowerOffRicohGr2 implements Preference.OnPreferenceClickListener, ConfirmationDialog.Callback
 {
 

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/RicohGr2CameraCaptureControl.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/RicohGr2CameraCaptureControl.java
index 2ae026d..0faf62e 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/RicohGr2CameraCaptureControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/RicohGr2CameraCaptureControl.java
@@ -1,12 +1,12 @@
 package net.osdn.gokigen.a01d.camera.ricohgr2.operation;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-
 import net.osdn.gokigen.a01d.camera.ICaptureControl;
 import net.osdn.gokigen.a01d.camera.ricohgr2.operation.takepicture.RicohGr2SingleShotControl;
 import net.osdn.gokigen.a01d.liveview.IAutoFocusFrameDisplay;
 
+import androidx.annotation.NonNull;
+
 public class RicohGr2CameraCaptureControl implements ICaptureControl
 {
     private final RicohGr2SingleShotControl singleShotControl;

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/RicohGr2CameraFocusControl.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/RicohGr2CameraFocusControl.java
index 0258474..cf88d30 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/RicohGr2CameraFocusControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/RicohGr2CameraFocusControl.java
@@ -2,7 +2,6 @@ package net.osdn.gokigen.a01d.camera.ricohgr2.operation;
 
 import android.content.Context;
 import android.graphics.PointF;
-import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.MotionEvent;
 
@@ -11,6 +10,8 @@ import net.osdn.gokigen.a01d.camera.ricohgr2.operation.takepicture.RicohGr2AutoF
 import net.osdn.gokigen.a01d.liveview.IAutoFocusFrameDisplay;
 import net.osdn.gokigen.a01d.liveview.IIndicatorControl;
 
+import androidx.annotation.NonNull;
+
 public class RicohGr2CameraFocusControl implements IFocusingControl
 {
     private final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/takepicture/RicohGr2AutoFocusControl.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/takepicture/RicohGr2AutoFocusControl.java
index 0a500dd..55df4c1 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/takepicture/RicohGr2AutoFocusControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/takepicture/RicohGr2AutoFocusControl.java
@@ -5,7 +5,6 @@ import android.content.SharedPreferences;
 import android.graphics.PointF;
 import android.graphics.RectF;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.utils.SimpleHttpClient;
@@ -15,6 +14,8 @@ import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
 import org.json.JSONObject;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/takepicture/RicohGr2SingleShotControl.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/takepicture/RicohGr2SingleShotControl.java
index c6aed07..1d70406 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/takepicture/RicohGr2SingleShotControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/operation/takepicture/RicohGr2SingleShotControl.java
@@ -3,13 +3,14 @@ package net.osdn.gokigen.a01d.camera.ricohgr2.operation.takepicture;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.utils.SimpleHttpClient;
 import net.osdn.gokigen.a01d.liveview.IAutoFocusFrameDisplay;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/status/RicohGr2StatusChecker.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/status/RicohGr2StatusChecker.java
index 44c43a9..ff17a29 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/status/RicohGr2StatusChecker.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/status/RicohGr2StatusChecker.java
@@ -1,6 +1,5 @@
 package net.osdn.gokigen.a01d.camera.ricohgr2.status;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.ICameraStatus;
@@ -11,6 +10,8 @@ import net.osdn.gokigen.a01d.liveview.ICameraStatusUpdateNotify;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 public class RicohGr2StatusChecker implements ICameraStatusWatcher, ICameraStatus
 {
     private final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/status/RicohGr2StatusHolder.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/status/RicohGr2StatusHolder.java
index bd015cd..dd11c03 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/status/RicohGr2StatusHolder.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/status/RicohGr2StatusHolder.java
@@ -1,6 +1,5 @@
 package net.osdn.gokigen.a01d.camera.ricohgr2.status;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.liveview.ICameraStatusUpdateNotify;
@@ -11,6 +10,8 @@ import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 public class RicohGr2StatusHolder
 {
     private final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/RicohGr2InterfaceProvider.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/RicohGr2InterfaceProvider.java
index d87f215..a895ad5 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/RicohGr2InterfaceProvider.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/RicohGr2InterfaceProvider.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.a01d.camera.ricohgr2.wrapper;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.ICameraConnection;
@@ -22,6 +21,8 @@ import net.osdn.gokigen.a01d.liveview.IAutoFocusFrameDisplay;
 import net.osdn.gokigen.a01d.liveview.IIndicatorControl;
 import net.osdn.gokigen.a01d.liveview.liveviewlistener.ILiveViewListener;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/RicohGr2LiveViewControl.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/RicohGr2LiveViewControl.java
index 87fc259..70f5a30 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/RicohGr2LiveViewControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/RicohGr2LiveViewControl.java
@@ -3,7 +3,6 @@ package net.osdn.gokigen.a01d.camera.ricohgr2.wrapper;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.ILiveViewControl;
@@ -13,6 +12,8 @@ import net.osdn.gokigen.a01d.liveview.liveviewlistener.CameraLiveViewListenerImp
 import net.osdn.gokigen.a01d.liveview.liveviewlistener.ILiveViewListener;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/connection/RicohGr2CameraConnectSequence.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/connection/RicohGr2CameraConnectSequence.java
index d5e7454..71f5107 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/connection/RicohGr2CameraConnectSequence.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/connection/RicohGr2CameraConnectSequence.java
@@ -3,7 +3,6 @@ package net.osdn.gokigen.a01d.camera.ricohgr2.wrapper.connection;
 import android.app.Activity;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.R;
@@ -12,6 +11,8 @@ import net.osdn.gokigen.a01d.camera.ICameraStatusReceiver;
 import net.osdn.gokigen.a01d.camera.utils.SimpleHttpClient;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
+import androidx.annotation.NonNull;
+
 class RicohGr2CameraConnectSequence implements Runnable
 {
     private final String TAG = this.toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/connection/RicohGr2Connection.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/connection/RicohGr2Connection.java
index 72e72c0..79abac3 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/connection/RicohGr2Connection.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/ricohgr2/wrapper/connection/RicohGr2Connection.java
@@ -10,8 +10,6 @@ import android.net.ConnectivityManager;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.R;
@@ -21,6 +19,9 @@ import net.osdn.gokigen.a01d.camera.ICameraStatusReceiver;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+
 
 /**
  *

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/cameraproperty/SendRequestDialog.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/cameraproperty/SendRequestDialog.java
index 05a5b36..d13d7df 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/cameraproperty/SendRequestDialog.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/cameraproperty/SendRequestDialog.java
@@ -3,11 +3,8 @@ package net.osdn.gokigen.a01d.camera.sony.cameraproperty;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.support.v4.app.DialogFragment;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -20,6 +17,10 @@ import android.widget.TextView;
 import net.osdn.gokigen.a01d.R;
 import net.osdn.gokigen.a01d.camera.sony.wrapper.ISonyCameraApi;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
 
 /**
  *

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/cameraproperty/SonyCameraApiListFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/cameraproperty/SonyCameraApiListFragment.java
index 0bc6b2b..c51728c 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/cameraproperty/SonyCameraApiListFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/cameraproperty/SonyCameraApiListFragment.java
@@ -3,13 +3,6 @@ package net.osdn.gokigen.a01d.camera.sony.cameraproperty;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.ListFragment;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -32,6 +25,14 @@ import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.ListFragment;
+
 
 public class SonyCameraApiListFragment extends ListFragment implements SendRequestDialog.Callback
 {

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/cameraproperty/SonyCameraApiListViewer.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/cameraproperty/SonyCameraApiListViewer.java
index 75c1ac0..331c905 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/cameraproperty/SonyCameraApiListViewer.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/cameraproperty/SonyCameraApiListViewer.java
@@ -1,15 +1,16 @@
 package net.osdn.gokigen.a01d.camera.sony.cameraproperty;
 
-import android.support.v7.preference.Preference;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.IChangeScene;
 
+import androidx.preference.Preference;
+
 /**
  *
  *
  */
-public class SonyCameraApiListViewer implements android.support.v7.preference.Preference.OnPreferenceClickListener
+public class SonyCameraApiListViewer implements Preference.OnPreferenceClickListener
 {
     private final String TAG = toString();
     private final IChangeScene changeScene;

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/CameraPowerOffSony.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/CameraPowerOffSony.java
index aa0bb73..e12581e 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/CameraPowerOffSony.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/CameraPowerOffSony.java
@@ -1,13 +1,13 @@
 package net.osdn.gokigen.a01d.camera.sony.operation;
 
 import android.content.Context;
-import android.support.v7.preference.Preference;
-
 import net.osdn.gokigen.a01d.ConfirmationDialog;
 import net.osdn.gokigen.a01d.IChangeScene;
 import net.osdn.gokigen.a01d.R;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
+import androidx.preference.Preference;
+
 
 /**
  *  Preferenceがクリックされた時に処理するクラス

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/SonyCameraCaptureControl.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/SonyCameraCaptureControl.java
index 0800aad..91edf4b 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/SonyCameraCaptureControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/SonyCameraCaptureControl.java
@@ -1,6 +1,5 @@
 package net.osdn.gokigen.a01d.camera.sony.operation;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.ICaptureControl;
@@ -9,6 +8,8 @@ import net.osdn.gokigen.a01d.camera.sony.wrapper.ISonyCameraApi;
 import net.osdn.gokigen.a01d.liveview.IAutoFocusFrameDisplay;
 import net.osdn.gokigen.a01d.liveview.IIndicatorControl;
 
+import androidx.annotation.NonNull;
+
 public class SonyCameraCaptureControl implements ICaptureControl
 {
     private static final String TAG = SonyCameraCaptureControl.class.getSimpleName();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/SonyCameraFocusControl.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/SonyCameraFocusControl.java
index f4ca4e8..fd930d1 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/SonyCameraFocusControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/SonyCameraFocusControl.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.a01d.camera.sony.operation;
 
 import android.graphics.PointF;
-import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.MotionEvent;
 
@@ -11,6 +10,8 @@ import net.osdn.gokigen.a01d.camera.sony.wrapper.ISonyCameraApi;
 import net.osdn.gokigen.a01d.liveview.IAutoFocusFrameDisplay;
 import net.osdn.gokigen.a01d.liveview.IIndicatorControl;
 
+import androidx.annotation.NonNull;
+
 public class SonyCameraFocusControl  implements IFocusingControl
 {
     private final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/SonyCameraZoomLensControl.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/SonyCameraZoomLensControl.java
index 1da804d..2c0e628 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/SonyCameraZoomLensControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/SonyCameraZoomLensControl.java
@@ -1,6 +1,5 @@
 package net.osdn.gokigen.a01d.camera.sony.operation;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.IZoomLensControl;
@@ -8,6 +7,8 @@ import net.osdn.gokigen.a01d.camera.sony.wrapper.ISonyCameraApi;
 
 import org.json.JSONObject;
 
+import androidx.annotation.NonNull;
+
 public class SonyCameraZoomLensControl implements IZoomLensControl
 {
     private final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/takepicture/SingleShotControl.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/takepicture/SingleShotControl.java
index 9ed21a3..c066b7d 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/takepicture/SingleShotControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/takepicture/SingleShotControl.java
@@ -1,6 +1,5 @@
 package net.osdn.gokigen.a01d.camera.sony.operation.takepicture;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.sony.wrapper.ISonyCameraApi;
@@ -9,6 +8,8 @@ import net.osdn.gokigen.a01d.liveview.IIndicatorControl;
 
 import org.json.JSONObject;
 
+import androidx.annotation.NonNull;
+
 public class SingleShotControl
 {
     private static final String TAG = SingleShotControl.class.getSimpleName();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/takepicture/SonyAutoFocusControl.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/takepicture/SonyAutoFocusControl.java
index 3784058..441d883 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/takepicture/SonyAutoFocusControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/operation/takepicture/SonyAutoFocusControl.java
@@ -2,7 +2,6 @@ package net.osdn.gokigen.a01d.camera.sony.operation.takepicture;
 
 import android.graphics.PointF;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.sony.wrapper.ISonyCameraApi;
@@ -12,6 +11,8 @@ import net.osdn.gokigen.a01d.liveview.IIndicatorControl;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import androidx.annotation.NonNull;
+
 
 /**
  *

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/ISonyCameraApi.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/ISonyCameraApi.java
index 97ed280..cbb16ef 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/ISonyCameraApi.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/ISonyCameraApi.java
@@ -1,12 +1,13 @@
 package net.osdn.gokigen.a01d.camera.sony.wrapper;
 
-import android.support.annotation.NonNull;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 public interface ISonyCameraApi
 {
     JSONObject getAvailableApiList();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/ISonyCameraHolder.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/ISonyCameraHolder.java
index 7262555..194a04c 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/ISonyCameraHolder.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/ISonyCameraHolder.java
@@ -1,10 +1,11 @@
 package net.osdn.gokigen.a01d.camera.sony.wrapper;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import net.osdn.gokigen.a01d.camera.sony.wrapper.eventlistener.ICameraChangeListener;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 public interface ISonyCameraHolder
 {
     void detectedCamera(@NonNull ISonyCamera camera);

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyCameraApi.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyCameraApi.java
index b67b5a5..dd34b92 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyCameraApi.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyCameraApi.java
@@ -1,6 +1,5 @@
 package net.osdn.gokigen.a01d.camera.sony.wrapper;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.utils.SimpleHttpClient;
@@ -11,6 +10,8 @@ import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 class SonyCameraApi implements ISonyCameraApi
 {
     private static final String TAG = SonyCameraApi.class.getSimpleName();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyCameraDeviceProvider.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyCameraDeviceProvider.java
index 2af969b..fe49528 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyCameraDeviceProvider.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyCameraDeviceProvider.java
@@ -1,6 +1,5 @@
 package net.osdn.gokigen.a01d.camera.sony.wrapper;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.utils.SimpleHttpClient;
@@ -9,6 +8,8 @@ import net.osdn.gokigen.a01d.camera.utils.XmlElement;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 public class SonyCameraDeviceProvider implements ISonyCamera
 {
     private static final String TAG = SonyCameraDeviceProvider.class.getSimpleName();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyCameraWrapper.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyCameraWrapper.java
index cddcbba..fd83c91 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyCameraWrapper.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyCameraWrapper.java
@@ -1,8 +1,6 @@
 package net.osdn.gokigen.a01d.camera.sony.wrapper;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.ICameraConnection;
@@ -31,6 +29,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 public class SonyCameraWrapper implements ISonyCameraHolder, ISonyInterfaceProvider, IDisplayInjector
 {
     private final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyLiveViewControl.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyLiveViewControl.java
index b5076d6..8233aa6 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyLiveViewControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/SonyLiveViewControl.java
@@ -1,6 +1,6 @@
 package net.osdn.gokigen.a01d.camera.sony.wrapper;
 
-import android.support.annotation.NonNull;
+
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.ILiveViewControl;
@@ -11,6 +11,8 @@ import net.osdn.gokigen.a01d.liveview.liveviewlistener.CameraLiveViewListenerImp
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import androidx.annotation.NonNull;
+
 public class SonyLiveViewControl implements ILiveViewControl
 {
     private final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonyCameraConnectSequence.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonyCameraConnectSequence.java
index 5d77a55..91e73f2 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonyCameraConnectSequence.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonyCameraConnectSequence.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.a01d.camera.sony.wrapper.connection;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.R;
@@ -12,6 +11,8 @@ import net.osdn.gokigen.a01d.camera.sony.wrapper.ISonyCameraHolder;
 import net.osdn.gokigen.a01d.camera.sony.wrapper.eventlistener.CameraChangeListerTemplate;
 import net.osdn.gokigen.a01d.camera.sony.wrapper.eventlistener.ICameraChangeListener;
 
+import androidx.annotation.NonNull;
+
 
 /**
  *   SONYカメラとの接続処理

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonyCameraConnection.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonyCameraConnection.java
index b659bd7..4ba306e 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonyCameraConnection.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonyCameraConnection.java
@@ -10,8 +10,6 @@ import android.net.ConnectivityManager;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.R;
@@ -23,6 +21,9 @@ import net.osdn.gokigen.a01d.camera.sony.wrapper.eventlistener.ICameraChangeList
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonySsdpClient.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonySsdpClient.java
index 195672f..3c26e2e 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonySsdpClient.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/connection/SonySsdpClient.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.a01d.camera.sony.wrapper.connection;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.R;
@@ -16,6 +15,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import androidx.annotation.NonNull;
+
 /**
  *  Sony SSDP Client : SonyのCameraRemoteSampleApp にある SimpleSsdpClient を参考にインプリメントした
  *   (API Level 14を minSdkVersion に設定したので... NsdManager.DiscoveryListener を使わなかった)

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/eventlistener/CameraEventObserver.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/eventlistener/CameraEventObserver.java
index 10a5e6d..bec021f 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/eventlistener/CameraEventObserver.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/eventlistener/CameraEventObserver.java
@@ -2,7 +2,6 @@ package net.osdn.gokigen.a01d.camera.sony.wrapper.eventlistener;
 
 import android.content.Context;
 import android.os.Handler;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.camera.sony.wrapper.ISonyCameraApi;
@@ -10,6 +9,8 @@ import net.osdn.gokigen.a01d.camera.sony.wrapper.ISonyCameraApi;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/eventlistener/ICameraEventObserver.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/eventlistener/ICameraEventObserver.java
index 3d05f6f..ab09403 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/eventlistener/ICameraEventObserver.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/eventlistener/ICameraEventObserver.java
@@ -1,6 +1,6 @@
 package net.osdn.gokigen.a01d.camera.sony.wrapper.eventlistener;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public interface ICameraEventObserver
 {

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/eventlistener/ReplyJsonParser.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/eventlistener/ReplyJsonParser.java
index 917449c..04e52d9 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/eventlistener/ReplyJsonParser.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/sony/wrapper/eventlistener/ReplyJsonParser.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.a01d.camera.sony.wrapper.eventlistener;
 
 import android.os.Handler;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import org.json.JSONArray;
@@ -11,6 +10,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 public class ReplyJsonParser implements ICameraStatusHolder
 {
     private static final String TAG = ReplyJsonParser.class.getSimpleName();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/utils/SimpleHttpClient.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/utils/SimpleHttpClient.java
index cb432ac..1da1085 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/utils/SimpleHttpClient.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/utils/SimpleHttpClient.java
@@ -2,7 +2,6 @@ package net.osdn.gokigen.a01d.camera.utils;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import java.io.BufferedReader;
@@ -14,6 +13,8 @@ import java.io.OutputStreamWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/utils/XmlElement.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/utils/XmlElement.java
index 96b2879..c924bf5 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/utils/XmlElement.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/utils/XmlElement.java
@@ -1,6 +1,5 @@
 package net.osdn.gokigen.a01d.camera.utils;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 import android.util.Xml;
 
@@ -12,6 +11,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
+
 public class XmlElement
 {
     private static final String TAG = XmlElement.class.getSimpleName();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/liveview/CameraLiveImageView.java b/app/src/main/java/net/osdn/gokigen/a01d/liveview/CameraLiveImageView.java
index dd38152..8bdad11 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/liveview/CameraLiveImageView.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/liveview/CameraLiveImageView.java
@@ -10,7 +10,6 @@ import android.graphics.Paint;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.support.media.ExifInterface;
 import android.os.Looper;
 import android.preference.PreferenceManager;
 import android.util.AttributeSet;
@@ -36,6 +35,8 @@ import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import androidx.exifinterface.media.ExifInterface;
+
 /**
  *   CameraLiveImageView :
  *    (OLYMPUS の ImageCaptureSample そのまま)
@@ -957,7 +958,7 @@ public class CameraLiveImageView extends View implements IImageDataReceiver, IAu
     public void toggleShowGridFrame()
     {
         showGridFeature = !showGridFeature;
-        SharedPreferences preferences = android.support.v7.preference.PreferenceManager.getDefaultSharedPreferences(getContext());
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getContext());
         SharedPreferences.Editor editor = preferences.edit();
         editor.putBoolean(IPreferencePropertyAccessor.SHOW_GRID_STATUS, showGridFeature);
         editor.apply();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewClickTouchListener.java b/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewClickTouchListener.java
index bbe2762..1a29fa8 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewClickTouchListener.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewClickTouchListener.java
@@ -2,7 +2,6 @@ package net.osdn.gokigen.a01d.liveview;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
@@ -20,6 +19,8 @@ import net.osdn.gokigen.a01d.camera.olympus.wrapper.property.IOlyCameraProperty;
 import net.osdn.gokigen.a01d.camera.olympus.wrapper.property.IOlyCameraPropertyProvider;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
+import androidx.preference.PreferenceManager;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java
index 84f516f..e37756b 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java
@@ -6,12 +6,6 @@ import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.res.ResourcesCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -38,6 +32,13 @@ import net.osdn.gokigen.a01d.liveview.liveviewlistener.ILiveViewListener;
 import net.osdn.gokigen.a01d.liveview.liveviewlistener.OlympusCameraLiveViewListenerImpl;
 import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
+import androidx.annotation.NonNull;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.PreferenceManager;
+
 /**
  *  撮影用ライブビュー画面
  *
@@ -665,7 +666,6 @@ public class LiveViewFragment extends Fragment implements IStatusViewDrawer, IFo
         {
             Log.v(TAG, "showFavoriteSettingDialog()");
 
-
             LoadSaveMyCameraPropertyDialog dialog = new LoadSaveMyCameraPropertyDialog();
             dialog.setTargetFragment(this, COMMAND_MY_PROPERTY);
             dialog.setPropertyOperationsHolder(new LoadSaveCameraProperties(getActivity(), interfaceProvider.getOlympusInterface()));

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/liveview/ScalableImageViewPanel.java b/app/src/main/java/net/osdn/gokigen/a01d/liveview/ScalableImageViewPanel.java
index bcfcf19..be7638d 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/liveview/ScalableImageViewPanel.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/liveview/ScalableImageViewPanel.java
@@ -6,12 +6,13 @@ import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.appcompat.widget.AppCompatImageView;
+
 /**
  *  イメージを表示する ... ImageViewerSampleから持ってくる
  *

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatExporter.java b/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatExporter.java
index 87452d0..24cd39e 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatExporter.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatExporter.java
@@ -2,7 +2,6 @@ package net.osdn.gokigen.a01d.logcat;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
@@ -11,6 +10,8 @@ import android.widget.ArrayAdapter;
 import net.osdn.gokigen.a01d.ConfirmationDialog;
 import net.osdn.gokigen.a01d.R;
 
+import androidx.annotation.NonNull;
+
 class LogCatExporter implements AdapterView.OnItemLongClickListener
 {
     private final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatFragment.java
index 30a467a..9a6c555 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatFragment.java
@@ -2,9 +2,6 @@ package net.osdn.gokigen.a01d.logcat;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.ListFragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -22,6 +19,10 @@ import net.osdn.gokigen.a01d.R;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.ListFragment;
+
 /**
  *
  */

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatViewer.java b/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatViewer.java
index 91db174..b2506fc 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatViewer.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatViewer.java
@@ -1,11 +1,12 @@
 package net.osdn.gokigen.a01d.logcat;
 
-import android.support.v7.preference.Preference;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.IChangeScene;
 
-public class LogCatViewer implements android.support.v7.preference.Preference.OnPreferenceClickListener
+import androidx.preference.Preference;
+
+public class LogCatViewer implements Preference.OnPreferenceClickListener
 {
     private final String TAG = toString();
     private final IChangeScene changeScene;

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/olympus/PreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/olympus/PreferenceFragment.java
index fd6cd35..94c4e86 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/olympus/PreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/olympus/PreferenceFragment.java
@@ -1,17 +1,10 @@
 package net.osdn.gokigen.a01d.preference.olympus;
 
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AppCompatActivity;
+
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
-import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.IChangeScene;
@@ -30,6 +23,14 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
 import jp.co.olympus.camerakit.OLYCamera;
 
 

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/ricohgr2/RicohGr2PreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/ricohgr2/RicohGr2PreferenceFragment.java
index bafbc1d..cce969b 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/ricohgr2/RicohGr2PreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/ricohgr2/RicohGr2PreferenceFragment.java
@@ -4,14 +4,6 @@ package net.osdn.gokigen.a01d.preference.ricohgr2;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
-import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.IChangeScene;
@@ -22,6 +14,15 @@ import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
 import java.util.Map;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
+
 public class RicohGr2PreferenceFragment  extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener
 {
     private final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/sony/SonyPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/sony/SonyPreferenceFragment.java
index b73c939..7322cf1 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/sony/SonyPreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/sony/SonyPreferenceFragment.java
@@ -3,14 +3,6 @@ package net.osdn.gokigen.a01d.preference.sony;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
-import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 
 import net.osdn.gokigen.a01d.IChangeScene;
@@ -22,6 +14,15 @@ import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 
 import java.util.Map;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
+
 /**
  *
  *

diff --git a/app/src/main/res/layout-land/dialog_my_camera_properties.xml b/app/src/main/res/layout-land/dialog_my_camera_properties.xml
index 244a46b..79468f1 100644 (file)
--- a/app/src/main/res/layout-land/dialog_my_camera_properties.xml
+++ b/app/src/main/res/layout-land/dialog_my_camera_properties.xml
@@ -4,14 +4,14 @@ android:layout_height="match_parent"
 android:layout_width="match_parent"
 android:orientation="vertical"
     >
-<android.support.v4.app.FragmentTabHost
+<androidx.fragment.app.FragmentTabHost
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/tabHost01"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
-</android.support.v4.app.FragmentTabHost>
+</androidx.fragment.app.FragmentTabHost>
 
-<android.support.v4.view.ViewPager
+<androidx.viewpager.widget.ViewPager
     android:id="@+id/pager"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

diff --git a/app/src/main/res/layout/dialog_my_camera_properties.xml b/app/src/main/res/layout/dialog_my_camera_properties.xml
index 244a46b..79468f1 100644 (file)
--- a/app/src/main/res/layout/dialog_my_camera_properties.xml
+++ b/app/src/main/res/layout/dialog_my_camera_properties.xml
@@ -4,14 +4,14 @@ android:layout_height="match_parent"
 android:layout_width="match_parent"
 android:orientation="vertical"
     >
-<android.support.v4.app.FragmentTabHost
+<androidx.fragment.app.FragmentTabHost
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/tabHost01"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
-</android.support.v4.app.FragmentTabHost>
+</androidx.fragment.app.FragmentTabHost>
 
-<android.support.v4.view.ViewPager
+<androidx.viewpager.widget.ViewPager
     android:id="@+id/pager"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

diff --git a/build.gradle b/build.gradle
index 88ea6fd..5a023be 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.3.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files