androidx に置き換えた。

diff --git a/app/build.gradle b/app/build.gradle
index c988801..9b37e5d 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "net.osdn.gokigen.gr2control"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 1001002
-        versionName "1.1.2"
+        versionCode 1001003
+        versionName "1.1.3"
     }
     buildTypes {
         release {
@@ -19,10 +19,11 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:preference-v7:28.0.0'
-    implementation 'com.android.support:exifinterface:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.google.android.material:material:1.0.0'
 
     api files('libs/olycamerakit.jar')
 }

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/Gr2ControlMain.java b/app/src/main/java/net/osdn/gokigen/gr2control/Gr2ControlMain.java
index edc0a5d..fc407a9 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/Gr2ControlMain.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/Gr2ControlMain.java
@@ -3,14 +3,16 @@ package net.osdn.gokigen.gr2control;
 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 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.PreferenceManager;
+
 import android.os.Bundle;
-import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 import android.view.WindowManager;
 

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/CameraInterfaceProvider.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/CameraInterfaceProvider.java
index 1c639c9..67a1a7d 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/CameraInterfaceProvider.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/CameraInterfaceProvider.java
@@ -2,8 +2,6 @@ package net.osdn.gokigen.gr2control.camera;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.PreferenceManager;
 
 import net.osdn.gokigen.gr2control.camera.olympus.IOlympusInterfaceProvider;
 import net.osdn.gokigen.gr2control.camera.olympus.wrapper.OlympusInterfaceProvider;
@@ -12,6 +10,9 @@ import net.osdn.gokigen.gr2control.camera.ricohgr2.wrapper.RicohGr2InterfaceProv
 import net.osdn.gokigen.gr2control.liveview.liveviewlistener.ILiveViewListener;
 import net.osdn.gokigen.gr2control.preference.IPreferencePropertyAccessor;
 
+import androidx.annotation.NonNull;
+import androidx.preference.PreferenceManager;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ICameraStatus.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ICameraStatus.java
index 29b40fe..76b121b 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ICameraStatus.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ICameraStatus.java
@@ -1,9 +1,9 @@
 package net.osdn.gokigen.gr2control.camera;
 
-import android.support.annotation.NonNull;
-
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  */

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

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/CameraPropertyArrayAdapter.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/CameraPropertyArrayAdapter.java
index 0bfe2a7..89f0a86 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/CameraPropertyArrayAdapter.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/CameraPropertyArrayAdapter.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.gr2control.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/gr2control/camera/olympus/cameraproperty/CameraPropertyArrayItem.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/CameraPropertyArrayItem.java
index fd58111..9fcaeaa 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/CameraPropertyArrayItem.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/CameraPropertyArrayItem.java
@@ -1,7 +1,7 @@
 package net.osdn.gokigen.gr2control.camera.olympus.cameraproperty;
 
 
-public class CameraPropertyArrayItem
+class CameraPropertyArrayItem
 {
     private int iconResource;
     private final String propertyName;
@@ -24,53 +24,53 @@ public class CameraPropertyArrayItem
         initialIconResource = iconId1;
     }
 
-    public boolean isChanged()
+    boolean isChanged()
     {
         return (!propertyValue.equals(initialValue));
     }
 
-    public String getPropertyName()
+    String getPropertyName()
     {
         return (propertyName);
     }
 
-    public String getPropertyTitle()
+    String getPropertyTitle()
     {
         return (propertyTitle);
     }
 
-    public String getInitialValue()
+    String getInitialValue()
     {
         return (initialValue);
     }
 
-    public int getIconResource()
+    int getIconResource()
     {
         return (iconResource);
     }
 
-    public void setIconResource(int iconId)
+    void setIconResource(int iconId)
     {
         iconResource = iconId;
     }
 
-    public String getPropertyValueTitle()
+    String getPropertyValueTitle()
     {
         return (propertyValueTitle);
     }
 
-    public String getPropertyValue()
+    String getPropertyValue()
     {
         return (propertyValue);
     }
 
-    public void setPropertyValue(String valueTitle, String value)
+    void setPropertyValue(String valueTitle, String value)
     {
         propertyValueTitle = valueTitle;
         propertyValue = value;
     }
 
-    public void resetValue()
+    void resetValue()
     {
         propertyValue = initialValue;
         propertyValueTitle = initialValueTitle;

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/CameraPropertyLoader.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/CameraPropertyLoader.java
index 558b82a..b8778fe 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/CameraPropertyLoader.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/CameraPropertyLoader.java
@@ -58,7 +58,7 @@ public class CameraPropertyLoader implements Runnable
         Log.v(TAG, "CameraPropertyLoader::run() END");
     }
 
-    public void resetProperty()
+    void resetProperty()
     {
         Log.v(TAG, "CameraPropertyLoader::resetProperty() START");
 
@@ -75,7 +75,7 @@ public class CameraPropertyLoader implements Runnable
      *   プロパティ一覧を応答
      *
      */
-    public ArrayList<CameraPropertyArrayItem> getItemList()
+    ArrayList<CameraPropertyArrayItem> getItemList()
     {
         return (propertyItems);
     }

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/CameraPropertyValueSelector.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/CameraPropertyValueSelector.java
index 53cf00b..f8832ab 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/CameraPropertyValueSelector.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/CameraPropertyValueSelector.java
@@ -2,7 +2,6 @@ package net.osdn.gokigen.gr2control.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;
@@ -13,6 +12,8 @@ import net.osdn.gokigen.gr2control.camera.olympus.wrapper.property.IOlyCameraPro
 
 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/gr2control/camera/olympus/cameraproperty/OlyCameraPropertyListFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/OlyCameraPropertyListFragment.java
index ccacf0d..2b489af 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/cameraproperty/OlyCameraPropertyListFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/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 net.osdn.gokigen.gr2control.camera.olympus.wrapper.property.IOlyCameraPro
 
 import java.util.HashMap;
 
+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/gr2control/camera/olympus/myolycameraprops/LoadMyCameraPropertyFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/LoadMyCameraPropertyFragment.java
index 8fcf1a9..c0626d5 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/LoadMyCameraPropertyFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/LoadMyCameraPropertyFragment.java
@@ -3,7 +3,6 @@ package net.osdn.gokigen.gr2control.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();
@@ -28,7 +29,7 @@ public class LoadMyCameraPropertyFragment extends ListFragment implements ListVi
         return (inflater.inflate(R.layout.list_camera_properties, container, false));
     }
 
-    public void setDismissInterface(ILoadSaveMyCameraPropertyDialogDismiss dismiss)
+    void setDismissInterface(ILoadSaveMyCameraPropertyDialogDismiss dismiss)
     {
         this.dialogDismiss = dismiss;
     }

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyDialog.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyDialog.java
index 3688d80..8766547 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyDialog.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyDialog.java
@@ -1,11 +1,6 @@
 package net.osdn.gokigen.gr2control.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.gr2control.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/gr2control/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyPagerAdapter.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyPagerAdapter.java
index 65ada84..c4270d4 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyPagerAdapter.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/LoadSaveMyCameraPropertyPagerAdapter.java
@@ -1,10 +1,12 @@
 package net.osdn.gokigen.gr2control.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/gr2control/camera/olympus/myolycameraprops/MyCameraPropertyLoadArrayAdapter.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/MyCameraPropertyLoadArrayAdapter.java
index 211f004..cc9d481 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/MyCameraPropertyLoadArrayAdapter.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/MyCameraPropertyLoadArrayAdapter.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.gr2control.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/gr2control/camera/olympus/myolycameraprops/MyCameraPropertySetArrayAdapter.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/MyCameraPropertySetArrayAdapter.java
index e6bb92f..e0729ee 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/MyCameraPropertySetArrayAdapter.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/MyCameraPropertySetArrayAdapter.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.gr2control.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.gr2control.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/gr2control/camera/olympus/myolycameraprops/SaveMyCameraPropertyFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/SaveMyCameraPropertyFragment.java
index 2cf7ead..438bf24 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/SaveMyCameraPropertyFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/myolycameraprops/SaveMyCameraPropertyFragment.java
@@ -3,7 +3,6 @@ package net.osdn.gokigen.gr2control.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;
@@ -24,7 +25,7 @@ public class SaveMyCameraPropertyFragment extends ListFragment
         return (inflater.inflate(R.layout.list_camera_properties, container, false));
     }
 
-    public void setDismissInterface(ILoadSaveMyCameraPropertyDialogDismiss dismiss)
+    void setDismissInterface(ILoadSaveMyCameraPropertyDialogDismiss dismiss)
     {
         this.dialogDismiss = dismiss;
     }

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

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/operation/takepicture/BracketingShotControl.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/operation/takepicture/BracketingShotControl.java
index 2f689ac..31ca6ff 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/operation/takepicture/BracketingShotControl.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/operation/takepicture/BracketingShotControl.java
@@ -1,4 +1,5 @@
 package net.osdn.gokigen.gr2control.camera.olympus.operation.takepicture;
+
 import android.graphics.PointF;
 import android.util.Log;
 

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/OLYCameraPropertyListenerImpl.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/OLYCameraPropertyListenerImpl.java
index 8c985ad..0b7ccb5 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/OLYCameraPropertyListenerImpl.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/OLYCameraPropertyListenerImpl.java
@@ -33,7 +33,7 @@ public class OLYCameraPropertyListenerImpl implements OLYCameraPropertyListener,
      *
      *
      */
-    public void setFocusingControl(IFocusingModeNotify focusCallback)
+    void setFocusingControl(IFocusingModeNotify focusCallback)
     {
         this.focusCallback = focusCallback;
     }

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/OlyCameraStatusWrapper.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/OlyCameraStatusWrapper.java
index 50fe182..6e5885b 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/OlyCameraStatusWrapper.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/OlyCameraStatusWrapper.java
@@ -1,6 +1,5 @@
 package net.osdn.gokigen.gr2control.camera.olympus.wrapper;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.camera.ICameraStatus;
@@ -12,6 +11,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
 import jp.co.olympus.camerakit.OLYCamera;
 import jp.co.olympus.camerakit.OLYCameraPropertyListener;
 import jp.co.olympus.camerakit.OLYCameraStatusListener;

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/OlyCameraWrapper.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/OlyCameraWrapper.java
index 1dfad9f..419abf7 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/OlyCameraWrapper.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/OlyCameraWrapper.java
@@ -3,8 +3,6 @@ package net.osdn.gokigen.gr2control.camera.olympus.wrapper;
 import android.app.Activity;
 import android.content.SharedPreferences;
 import android.graphics.PointF;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.camera.ICameraRunMode;
@@ -16,6 +14,8 @@ import net.osdn.gokigen.gr2control.preference.IPreferencePropertyAccessor;
 
 import java.util.Map;
 
+import androidx.annotation.NonNull;
+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/gr2control/camera/olympus/wrapper/OlyCameraZoomLensControl.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/OlyCameraZoomLensControl.java
index cce6678..aec01ae 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/OlyCameraZoomLensControl.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/OlyCameraZoomLensControl.java
@@ -2,12 +2,12 @@ package net.osdn.gokigen.gr2control.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.gr2control.camera.IZoomLensControl;
 import net.osdn.gokigen.gr2control.preference.IPreferencePropertyAccessor;
 
+import androidx.preference.PreferenceManager;
 import jp.co.olympus.camerakit.OLYCamera;
 
 /**

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/connection/OlyCameraConnection.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/connection/OlyCameraConnection.java
index c52a98f..1ab02cc 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/connection/OlyCameraConnection.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/connection/OlyCameraConnection.java
@@ -10,7 +10,6 @@ import android.net.ConnectivityManager;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.provider.Settings;
-import android.support.v7.app.AlertDialog;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.R;
@@ -20,6 +19,7 @@ import net.osdn.gokigen.gr2control.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/gr2control/camera/olympus/wrapper/playback/OlyCameraPlaybackControl.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/playback/OlyCameraPlaybackControl.java
index 0e0a018..677f442 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/playback/OlyCameraPlaybackControl.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/olympus/wrapper/playback/OlyCameraPlaybackControl.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.gr2control.camera.olympus.wrapper.playback;
 
 import android.graphics.BitmapFactory;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.camera.ICameraFileInfo;
@@ -17,6 +16,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
 import jp.co.olympus.camerakit.OLYCamera;
 import jp.co.olympus.camerakit.OLYCameraFileInfo;
 

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/playback/CameraFileInfo.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/playback/CameraFileInfo.java
index 11091c1..220086e 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/playback/CameraFileInfo.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/playback/CameraFileInfo.java
@@ -1,13 +1,13 @@
 package net.osdn.gokigen.gr2control.camera.playback;
 
-import android.support.annotation.NonNull;
-
 import net.osdn.gokigen.gr2control.camera.ICameraFileInfo;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
+import androidx.annotation.NonNull;
+
 public class CameraFileInfo implements ICameraFileInfo, ICameraFileInfoSetter
 {
     private final String path;

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/playback/IPlaybackControl.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/playback/IPlaybackControl.java
index df23f9b..c0cc768 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/playback/IPlaybackControl.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/playback/IPlaybackControl.java
@@ -1,9 +1,10 @@
 package net.osdn.gokigen.gr2control.camera.playback;
 
-import android.support.annotation.NonNull;
 
 import net.osdn.gokigen.gr2control.camera.ICameraFileInfo;
 
+import androidx.annotation.NonNull;
+
 /**
  *   画像再生・取得用インタフェース
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/playback/ProgressEvent.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/playback/ProgressEvent.java
index fdfff0c..c8a3f8d 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/playback/ProgressEvent.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/playback/ProgressEvent.java
@@ -1,6 +1,6 @@
 package net.osdn.gokigen.gr2control.camera.playback;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 public class ProgressEvent
 {

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

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/RicohGr2CameraButtonControl.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/RicohGr2CameraButtonControl.java
index 767c225..5fd5499 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/RicohGr2CameraButtonControl.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/RicohGr2CameraButtonControl.java
@@ -1,11 +1,12 @@
 package net.osdn.gokigen.gr2control.camera.ricohgr2.operation;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.camera.ICameraButtonControl;
 import net.osdn.gokigen.gr2control.camera.utils.SimpleHttpClient;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/RicohGr2CameraCaptureControl.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/RicohGr2CameraCaptureControl.java
index 0c15a04..bb4283d 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/RicohGr2CameraCaptureControl.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/RicohGr2CameraCaptureControl.java
@@ -1,13 +1,13 @@
 package net.osdn.gokigen.gr2control.camera.ricohgr2.operation;
 
-import android.support.annotation.NonNull;
-
 import net.osdn.gokigen.gr2control.camera.ICameraStatus;
 import net.osdn.gokigen.gr2control.camera.ICaptureControl;
 import net.osdn.gokigen.gr2control.camera.ricohgr2.operation.takepicture.RicohGr2MovieShotControl;
 import net.osdn.gokigen.gr2control.camera.ricohgr2.operation.takepicture.RicohGr2SingleShotControl;
 import net.osdn.gokigen.gr2control.liveview.IAutoFocusFrameDisplay;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/RicohGr2CameraFocusControl.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/RicohGr2CameraFocusControl.java
index 19d786a..10560b5 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/RicohGr2CameraFocusControl.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/RicohGr2CameraFocusControl.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.gr2control.camera.ricohgr2.operation;
 
 import android.graphics.PointF;
-import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.MotionEvent;
 
@@ -10,6 +9,8 @@ import net.osdn.gokigen.gr2control.camera.ricohgr2.operation.takepicture.RicohGr
 import net.osdn.gokigen.gr2control.liveview.IAutoFocusFrameDisplay;
 import net.osdn.gokigen.gr2control.liveview.IIndicatorControl;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/takepicture/RicohGr2AutoFocusControl.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/takepicture/RicohGr2AutoFocusControl.java
index 06e420d..35c2bde 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/takepicture/RicohGr2AutoFocusControl.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/takepicture/RicohGr2AutoFocusControl.java
@@ -2,7 +2,6 @@ package net.osdn.gokigen.gr2control.camera.ricohgr2.operation.takepicture;
 
 import android.graphics.PointF;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.camera.utils.SimpleHttpClient;
@@ -11,6 +10,8 @@ import net.osdn.gokigen.gr2control.liveview.IIndicatorControl;
 
 import org.json.JSONObject;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/takepicture/RicohGr2MovieShotControl.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/takepicture/RicohGr2MovieShotControl.java
index 159be65..90869d5 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/takepicture/RicohGr2MovieShotControl.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/takepicture/RicohGr2MovieShotControl.java
@@ -1,11 +1,12 @@
 package net.osdn.gokigen.gr2control.camera.ricohgr2.operation.takepicture;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.camera.utils.SimpleHttpClient;
 import net.osdn.gokigen.gr2control.liveview.IAutoFocusFrameDisplay;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/takepicture/RicohGr2SingleShotControl.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/takepicture/RicohGr2SingleShotControl.java
index 2889705..d109413 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/takepicture/RicohGr2SingleShotControl.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/operation/takepicture/RicohGr2SingleShotControl.java
@@ -1,11 +1,12 @@
 package net.osdn.gokigen.gr2control.camera.ricohgr2.operation.takepicture;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.camera.utils.SimpleHttpClient;
 import net.osdn.gokigen.gr2control.liveview.IAutoFocusFrameDisplay;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2InterfaceProvider.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2InterfaceProvider.java
index bc675b3..a99f4ad 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2InterfaceProvider.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2InterfaceProvider.java
@@ -2,8 +2,6 @@ package net.osdn.gokigen.gr2control.camera.ricohgr2.wrapper;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.camera.ICameraButtonControl;
@@ -33,6 +31,9 @@ import net.osdn.gokigen.gr2control.liveview.IIndicatorControl;
 import net.osdn.gokigen.gr2control.liveview.liveviewlistener.ILiveViewListener;
 import net.osdn.gokigen.gr2control.preference.IPreferencePropertyAccessor;
 
+import androidx.annotation.NonNull;
+import androidx.preference.PreferenceManager;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2LiveViewControl.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2LiveViewControl.java
index 23b2c37..2f52eea 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2LiveViewControl.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2LiveViewControl.java
@@ -1,6 +1,5 @@
 package net.osdn.gokigen.gr2control.camera.ricohgr2.wrapper;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.camera.ILiveViewControl;
@@ -9,6 +8,8 @@ import net.osdn.gokigen.gr2control.camera.utils.SimpleLiveviewSlicer;
 import net.osdn.gokigen.gr2control.liveview.liveviewlistener.CameraLiveViewListenerImpl;
 import net.osdn.gokigen.gr2control.liveview.liveviewlistener.ILiveViewListener;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2PlaybackControl.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2PlaybackControl.java
index 607e79a..5a76760 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2PlaybackControl.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2PlaybackControl.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.gr2control.camera.ricohgr2.wrapper;
 
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.camera.ICameraFileInfo;
@@ -21,6 +20,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2StatusChecker.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2StatusChecker.java
index ea99b55..4b3de21 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2StatusChecker.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2StatusChecker.java
@@ -1,7 +1,5 @@
 package net.osdn.gokigen.gr2control.camera.ricohgr2.wrapper;
 
-import android.app.Activity;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.camera.ICameraStatus;
@@ -12,6 +10,8 @@ import net.osdn.gokigen.gr2control.liveview.ICameraStatusUpdateNotify;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2StatusHolder.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2StatusHolder.java
index 9eee2ad..e93578c 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2StatusHolder.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/RicohGr2StatusHolder.java
@@ -1,6 +1,5 @@
 package net.osdn.gokigen.gr2control.camera.ricohgr2.wrapper;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.liveview.ICameraStatusUpdateNotify;
@@ -11,6 +10,8 @@ import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/connection/RicohGr2CameraConnectSequence.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/connection/RicohGr2CameraConnectSequence.java
index 4211d4b..d79ef89 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/connection/RicohGr2CameraConnectSequence.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/connection/RicohGr2CameraConnectSequence.java
@@ -3,7 +3,6 @@ package net.osdn.gokigen.gr2control.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.gr2control.R;
@@ -12,6 +11,8 @@ import net.osdn.gokigen.gr2control.camera.ICameraStatusReceiver;
 import net.osdn.gokigen.gr2control.camera.utils.SimpleHttpClient;
 import net.osdn.gokigen.gr2control.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/gr2control/camera/ricohgr2/wrapper/connection/RicohGr2Connection.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/connection/RicohGr2Connection.java
index dfe5288..ca1ab4d 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/ricohgr2/wrapper/connection/RicohGr2Connection.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/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.gr2control.R;
@@ -21,6 +19,9 @@ import net.osdn.gokigen.gr2control.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/gr2control/camera/utils/SimpleHttpClient.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/utils/SimpleHttpClient.java
index fd473fc..9341e8f 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/utils/SimpleHttpClient.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/utils/SimpleHttpClient.java
@@ -2,7 +2,6 @@ package net.osdn.gokigen.gr2control.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/gr2control/camera/utils/XmlElement.java b/app/src/main/java/net/osdn/gokigen/gr2control/camera/utils/XmlElement.java
index c2544be..27f1173 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/camera/utils/XmlElement.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/camera/utils/XmlElement.java
@@ -1,6 +1,5 @@
 package net.osdn.gokigen.gr2control.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/gr2control/liveview/CameraLiveImageView.java b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/CameraLiveImageView.java
index 03d5f0c..797a0c1 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/CameraLiveImageView.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/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 :
@@ -200,7 +201,14 @@ public class CameraLiveImageView extends View implements IImageDataReceiver, IAu
             int orientation = ExifInterface.ORIENTATION_UNDEFINED;
             if ((metadata != null)&&(metadata.containsKey(EXIF_ORIENTATION)))
             {
-                orientation = Integer.parseInt((String) metadata.get(EXIF_ORIENTATION));
+                try
+                {
+                    orientation = Integer.parseInt((String) metadata.get(EXIF_ORIENTATION));
+                }
+                catch (Exception e)
+                {
+                    e.printStackTrace();
+                }
             }
             switch (orientation)
             {
@@ -952,7 +960,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/gr2control/liveview/LiveViewClickTouchListener.java b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewClickTouchListener.java
index 8856a9d..18ba1c8 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewClickTouchListener.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewClickTouchListener.java
@@ -2,12 +2,9 @@ package net.osdn.gokigen.gr2control.liveview;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.Toast;
 
 import net.osdn.gokigen.gr2control.R;
 import net.osdn.gokigen.gr2control.camera.ICameraButtonControl;
@@ -20,6 +17,9 @@ import net.osdn.gokigen.gr2control.preference.IPreferencePropertyAccessor;
 import net.osdn.gokigen.gr2control.scene.ConfirmationDialog;
 import net.osdn.gokigen.gr2control.scene.IChangeScene;
 
+import androidx.annotation.NonNull;
+import androidx.preference.PreferenceManager;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewControlPanelClickListener.java b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewControlPanelClickListener.java
index 487ddd8..318de81 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewControlPanelClickListener.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewControlPanelClickListener.java
@@ -2,8 +2,6 @@ package net.osdn.gokigen.gr2control.liveview;
 
 import android.app.Activity;
 import android.content.DialogInterface;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.View;
 
@@ -13,6 +11,9 @@ import net.osdn.gokigen.gr2control.camera.IInterfaceProvider;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewFragment.java
index a274402..3c576fc 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewFragment.java
@@ -7,15 +7,16 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Vibrator;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.res.ResourcesCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.preference.PreferenceManager;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceManager;
+
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -976,31 +977,32 @@ public class LiveViewFragment extends Fragment implements IStatusViewDrawer, IFo
                 activity.runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-                        ImageView view = getActivity().findViewById(R.id.focusUnlockImageView);
-                        if (focused)
+                        try
                         {
-                            Drawable icon = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_center_focus_strong_black_24dp, null);
-                            if (icon != null)
-                            {
-                                DrawableCompat.setTint(icon, Color.GREEN);
-                                view.setImageDrawable(icon);
+                            ImageView view = getActivity().findViewById(R.id.focusUnlockImageView);
+                            if (focused) {
+                                Drawable icon = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_center_focus_strong_black_24dp, null);
+                                if (icon != null) {
+                                    DrawableCompat.setTint(icon, Color.GREEN);
+                                    view.setImageDrawable(icon);
+                                }
+                            } else {
+                                Drawable icon = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_focus_free_black_24dp, null);
+                                if (icon != null) {
+                                    int color = Color.BLACK;
+                                    if (focusLocked) {
+                                        color = Color.RED;
+                                    }
+                                    DrawableCompat.setTint(icon, color);
+                                    view.setImageDrawable(icon);
+                                }
                             }
+                            view.invalidate();
                         }
-                        else
+                        catch (Exception e)
                         {
-                            Drawable icon = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_focus_free_black_24dp, null);
-                            if (icon != null)
-                            {
-                                int color = Color.BLACK;
-                                if (focusLocked)
-                                {
-                                    color = Color.RED;
-                                }
-                                DrawableCompat.setTint(icon, color);
-                                view.setImageDrawable(icon);
-                            }
+                            e.printStackTrace();
                         }
-                        view.invalidate();
                     }
                 });
             }

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewKeyPanelClickListener.java b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewKeyPanelClickListener.java
index d3172e6..a81156f 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewKeyPanelClickListener.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewKeyPanelClickListener.java
@@ -1,8 +1,6 @@
 package net.osdn.gokigen.gr2control.liveview;
 
 import android.os.Vibrator;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 
@@ -10,6 +8,9 @@ import net.osdn.gokigen.gr2control.R;
 import net.osdn.gokigen.gr2control.camera.ICameraButtonControl;
 import net.osdn.gokigen.gr2control.camera.IInterfaceProvider;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/ScalableImageViewPanel.java b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/ScalableImageViewPanel.java
index ce23730..afe3041 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/ScalableImageViewPanel.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/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/gr2control/logcat/LogCatExporter.java b/app/src/main/java/net/osdn/gokigen/gr2control/logcat/LogCatExporter.java
index e6d8ae1..fc2ce1b 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/logcat/LogCatExporter.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/logcat/LogCatExporter.java
@@ -2,7 +2,6 @@ package net.osdn.gokigen.gr2control.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.gr2control.R;
 import net.osdn.gokigen.gr2control.scene.ConfirmationDialog;
 
+import androidx.annotation.NonNull;
+
 class LogCatExporter implements AdapterView.OnItemLongClickListener
 {
     private final String TAG = toString();

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/logcat/LogCatFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/logcat/LogCatFragment.java
index 64fa0a4..845a0c1 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/logcat/LogCatFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/logcat/LogCatFragment.java
@@ -1,11 +1,7 @@
 package net.osdn.gokigen.gr2control.logcat;
 
 import android.app.Activity;
-import android.content.Context;
 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;
@@ -23,6 +19,10 @@ import net.osdn.gokigen.gr2control.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/gr2control/logcat/LogCatViewer.java b/app/src/main/java/net/osdn/gokigen/gr2control/logcat/LogCatViewer.java
index 4e7f5c2..fc425e4 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/logcat/LogCatViewer.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/logcat/LogCatViewer.java
@@ -1,12 +1,13 @@
 package net.osdn.gokigen.gr2control.logcat;
 
-import android.support.v7.preference.Preference;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.scene.IChangeScene;
 
+import androidx.preference.Preference;
 
-public class LogCatViewer implements android.support.v7.preference.Preference.OnPreferenceClickListener
+
+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/gr2control/playback/ImageGridViewFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/playback/ImageGridViewFragment.java
index 9525eca..58013e9 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/playback/ImageGridViewFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/playback/ImageGridViewFragment.java
@@ -17,13 +17,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.util.LruCache;
 import android.view.LayoutInflater;
@@ -49,6 +43,13 @@ import net.osdn.gokigen.gr2control.camera.playback.IPlaybackControl;
 import net.osdn.gokigen.gr2control.playback.detail.ImageContentInfoEx;
 import net.osdn.gokigen.gr2control.playback.detail.ImagePagerViewFragment;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentTransaction;
+
 public class ImageGridViewFragment extends Fragment
 {
        private final String TAG = this.toString();

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/playback/ScalableImagePager.java b/app/src/main/java/net/osdn/gokigen/gr2control/playback/ScalableImagePager.java
index f6d80b1..75e2ab7 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/playback/ScalableImagePager.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/playback/ScalableImagePager.java
@@ -1,12 +1,13 @@
 package net.osdn.gokigen.gr2control.playback;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 import android.view.View;
 
 import net.osdn.gokigen.gr2control.playback.detail.ScalableImageView;
 
+import androidx.viewpager.widget.ViewPager;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/ExifInformationDumper.java b/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/ExifInformationDumper.java
index 382071d..013ec14 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/ExifInformationDumper.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/ExifInformationDumper.java
@@ -1,11 +1,12 @@
 package net.osdn.gokigen.gr2control.playback.detail;
 
-import android.support.media.ExifInterface;
 import android.util.Log;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.exifinterface.media.ExifInterface;
+
 /**
  *  EXIF情報をログに出力する
  */

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/ImagePagerViewFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/ImagePagerViewFragment.java
index 9a7031b..441267b 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/ImagePagerViewFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/ImagePagerViewFragment.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.gr2control.playback.detail;
 
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -10,14 +9,7 @@ import java.util.Map;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v4.view.ViewPager.OnPageChangeListener;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.util.LruCache;
 import android.view.LayoutInflater;
@@ -34,6 +26,13 @@ import net.osdn.gokigen.gr2control.camera.ICameraRunMode;
 import net.osdn.gokigen.gr2control.camera.playback.IDownloadThumbnailImageCallback;
 import net.osdn.gokigen.gr2control.camera.playback.IPlaybackControl;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 public class ImagePagerViewFragment extends Fragment
 {
     private final String TAG = this.toString();
@@ -328,7 +327,7 @@ public class ImagePagerViewFragment extends Fragment
                
        }
 
-       private class ImagePageChangeListener implements OnPageChangeListener
+       private class ImagePageChangeListener implements ViewPager.OnPageChangeListener
        {
 
                @Override

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/MyContentDownloader.java b/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/MyContentDownloader.java
index 12f5ff6..3ac2e01 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/MyContentDownloader.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/MyContentDownloader.java
@@ -10,8 +10,6 @@ import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Environment;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -28,6 +26,9 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Locale;
 
+import androidx.annotation.NonNull;
+import androidx.preference.PreferenceManager;
+
 /**
  *   コンテントのダウンロード
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/ScalableImageView.java b/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/ScalableImageView.java
index 3bb9cc0..dbd49f3 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/ScalableImageView.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/playback/detail/ScalableImageView.java
@@ -5,12 +5,13 @@ import android.graphics.Bitmap;
 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;
+
 /**
  *  イメージを表示する
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/preference/olympus/PreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/preference/olympus/PreferenceFragment.java
index 90c3150..9adbee1 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/preference/olympus/PreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/preference/olympus/PreferenceFragment.java
@@ -1,17 +1,9 @@
 package net.osdn.gokigen.gr2control.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.gr2control.R;
@@ -29,6 +21,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/gr2control/preference/ricohgr2/RicohGr2PreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/preference/ricohgr2/RicohGr2PreferenceFragment.java
index 16ede36..bf9c221 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/preference/ricohgr2/RicohGr2PreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/preference/ricohgr2/RicohGr2PreferenceFragment.java
@@ -3,14 +3,6 @@ package net.osdn.gokigen.gr2control.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.gr2control.R;
@@ -21,6 +13,15 @@ import net.osdn.gokigen.gr2control.scene.IChangeScene;
 
 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/gr2control/scene/CameraSceneUpdater.java b/app/src/main/java/net/osdn/gokigen/gr2control/scene/CameraSceneUpdater.java
index 4e6e899..a0e218a 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/scene/CameraSceneUpdater.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/scene/CameraSceneUpdater.java
@@ -1,9 +1,5 @@
 package net.osdn.gokigen.gr2control.scene;
 
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.preference.PreferenceFragmentCompat;
 import android.util.Log;
 
 import net.osdn.gokigen.gr2control.R;
@@ -16,6 +12,11 @@ import net.osdn.gokigen.gr2control.playback.ImageGridViewFragment;
 import net.osdn.gokigen.gr2control.preference.olympus.PreferenceFragment;
 import net.osdn.gokigen.gr2control.preference.ricohgr2.RicohGr2PreferenceFragment;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.PreferenceFragmentCompat;
+
 /**
  *
  *

diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/scene/ConfirmationDialog.java b/app/src/main/java/net/osdn/gokigen/gr2control/scene/ConfirmationDialog.java
index ba44f6b..c92b67a 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/gr2control/scene/ConfirmationDialog.java
+++ b/app/src/main/java/net/osdn/gokigen/gr2control/scene/ConfirmationDialog.java
@@ -2,11 +2,12 @@ package net.osdn.gokigen.gr2control.scene;
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
 
 import net.osdn.gokigen.gr2control.R;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
 public class ConfirmationDialog extends DialogFragment
 {
     private Context context = null;

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..bbdc379 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.core.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.core.app.FragmentTabHost>
 
-<android.support.v4.view.ViewPager
+<androidx.core.view.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 6c2bb63..af70df7 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     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

diff --git a/gradle.properties b/gradle.properties
index 743d692..8de5058 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit