Android X

.gitignore

@@ -1,7 +1,7 @@
 .gradle
-/local.properties
+local.properties
 .DS_Store
-/build
-/captures
-/.idea
+build
+captures
+.idea
 *.iml

build.gradle

@@ -1,22 +1,18 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
  repositories {
- jcenter()
  google()
+ jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.2.0'
- classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
- // NOTE: Do not place your application dependencies here; they belong
- // in the individual module build.gradle files
+ classpath 'com.android.tools.build:gradle:3.5.3'
+ classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
  }
 }
 
 allprojects {
  repositories {
+ google()
  maven { url "https://jitpack.io" }
  jcenter()
- google()
  }
 }

gradle.properties

@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Sep 14 15:32:46 JST 2018
+#Thu Jan 30 13:13:59 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.10-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-6.1.1-all.zip

library/build.gradle

@@ -1,19 +1,19 @@
 apply plugin: 'com.android.library'
 
 android {
- compileSdkVersion 28
+ compileSdkVersion 29
  defaultConfig {
  minSdkVersion 14
- targetSdkVersion 28
+ targetSdkVersion 29
  versionCode 1
  versionName "1.0"
  }
 }
 
 dependencies {
- implementation 'com.android.support:support-annotations:28.0.0'
- implementation 'com.android.support:support-compat:28.0.0'
- implementation 'com.android.support:support-dynamic-animation:28.0.0'
+ implementation 'androidx.annotation:annotation:1.1.0'
+ implementation 'androidx.core:core:1.1.0'
+ implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0'
 }
 
 // build a jar with source files

library/src/main/java/jp/co/recruit_lifestyle/android/floatingview/FloatingView.java

@@ -27,14 +27,14 @@
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
-import android.support.animation.DynamicAnimation;
-import android.support.animation.FlingAnimation;
-import android.support.animation.FloatValueHolder;
-import android.support.animation.SpringAnimation;
-import android.support.animation.SpringForce;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewCompat;
+import androidx.dynamicanimation.animation.DynamicAnimation;
+import androidx.dynamicanimation.animation.FlingAnimation;
+import androidx.dynamicanimation.animation.FloatValueHolder;
+import androidx.dynamicanimation.animation.SpringAnimation;
+import androidx.dynamicanimation.animation.SpringForce;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.core.view.ViewCompat;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.KeyCharacterMap;

library/src/main/java/jp/co/recruit_lifestyle/android/floatingview/FloatingViewManager.java

@@ -23,10 +23,10 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.core.view.ViewCompat;
 import android.util.DisplayMetrics;
 import android.view.DisplayCutout;
 import android.view.HapticFeedbackConstants;

library/src/main/java/jp/co/recruit_lifestyle/android/floatingview/TrashView.java

@@ -28,7 +28,7 @@
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.MotionEvent;

sample/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
- compileSdkVersion 28
+ compileSdkVersion 29
  defaultConfig {
  applicationId "jp.co.recruit.floatingview"
  minSdkVersion 14
- targetSdkVersion 28
+ targetSdkVersion 29
  versionCode 1
  versionName "1.0"
  }
@@ -18,7 +18,6 @@ android {
 }
 
 dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation 'com.android.support:preference-v14:28.0.0'
+ implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
  implementation project(':library')
 }

sample/src/main/java/jp/co/recruit_lifestyle/sample/DeleteActionActivity.java

@@ -1,8 +1,8 @@
 package jp.co.recruit_lifestyle.sample;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.app.AppCompatActivity;
 
 import jp.co.recruit.floatingview.R;
 import jp.co.recruit_lifestyle.sample.fragment.DeleteActionFragment;

sample/src/main/java/jp/co/recruit_lifestyle/sample/MainActivity.java

@@ -4,8 +4,8 @@
 import android.app.NotificationManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.app.AppCompatActivity;
 
 import jp.co.recruit.floatingview.R;
 import jp.co.recruit_lifestyle.sample.fragment.FloatingViewControlFragment;

sample/src/main/java/jp/co/recruit_lifestyle/sample/fragment/DeleteActionFragment.java

@@ -3,8 +3,8 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

sample/src/main/java/jp/co/recruit_lifestyle/sample/fragment/FloatingViewControlFragment.java

@@ -6,20 +6,20 @@
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
 import jp.co.recruit.floatingview.R;
 import jp.co.recruit_lifestyle.android.floatingview.FloatingViewManager;
 import jp.co.recruit_lifestyle.sample.service.ChatHeadService;
@@ -149,10 +149,6 @@ private static void startFloatingViewService(Activity activity, boolean isCustom
  if (activity.getWindow().getAttributes().layoutInDisplayCutoutMode == WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER) {
  throw new RuntimeException("'windowLayoutInDisplayCutoutMode' do not be set to 'never'");
  }
- // 2. Do not set Activity to landscape
- if (activity.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
- throw new RuntimeException("Do not set Activity to landscape");
- }
  }
 
  // launch service

sample/src/main/java/jp/co/recruit_lifestyle/sample/fragment/FloatingViewSettingsFragment.java

@@ -2,7 +2,7 @@
 
 
 import android.os.Bundle;
-import android.support.v7.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceFragmentCompat;
 
 import jp.co.recruit.floatingview.R;
 

sample/src/main/java/jp/co/recruit_lifestyle/sample/service/ChatHeadService.java

@@ -6,7 +6,7 @@
 import android.content.Intent;
 import android.graphics.Rect;
 import android.os.IBinder;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.LayoutInflater;

sample/src/main/java/jp/co/recruit_lifestyle/sample/service/CustomFloatingViewService.java

@@ -10,8 +10,8 @@
 import android.net.Uri;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.LayoutInflater;