修复合并冲突

goweii · Nov 22, 2020 · 9b11fd9 · 9b11fd9
1 parent 7c04dad
commit 9b11fd9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/anylayer-ktx/src/main/java/per/goweii/anylayer/ktx/FloatLayers.kt b/anylayer-ktx/src/main/java/per/goweii/anylayer/ktx/FloatLayers.kt
@@ -1,7 +1,7 @@
 package per.goweii.anylayer.ktx
 
 import android.view.View
-import androidx.annotation.LayoutRes
+import android.support.annotation.LayoutRes
 import per.goweii.anylayer.floats.FloatLayer
 
 fun <T : FloatLayer> T.setFloatView(@LayoutRes layoutId: Int) = this.apply {

diff --git a/anylayer-ktx/src/main/java/per/goweii/anylayer/ktx/GuideLayers.kt b/anylayer-ktx/src/main/java/per/goweii/anylayer/ktx/GuideLayers.kt
@@ -1,9 +1,9 @@
 package per.goweii.anylayer.ktx
 
 import android.view.View
-import androidx.annotation.ColorInt
-import androidx.annotation.ColorRes
-import androidx.annotation.IdRes
+import android.support.annotation.ColorInt
+import android.support.annotation.ColorRes
+import android.support.annotation.IdRes
 import per.goweii.anylayer.Layer
 import per.goweii.anylayer.guide.GuideLayer
 

diff --git a/anylayer-ktx/src/main/java/per/goweii/anylayer/ktx/NotificationLayers.kt b/anylayer-ktx/src/main/java/per/goweii/anylayer/ktx/NotificationLayers.kt
@@ -2,9 +2,9 @@ package per.goweii.anylayer.ktx
 
 import android.graphics.drawable.Drawable
 import android.view.View
-import androidx.annotation.DrawableRes
-import androidx.annotation.LayoutRes
-import androidx.annotation.StringRes
+import android.support.annotation.DrawableRes
+import android.support.annotation.LayoutRes
+import android.support.annotation.StringRes
 import per.goweii.anylayer.notification.NotificationLayer
 
 

diff --git a/anylayer-ktx/src/main/java/per/goweii/anylayer/ktx/ToastLayers.kt b/anylayer-ktx/src/main/java/per/goweii/anylayer/ktx/ToastLayers.kt
@@ -1,10 +1,10 @@
 package per.goweii.anylayer.ktx
 
 import android.graphics.drawable.Drawable
-import androidx.annotation.ColorInt
-import androidx.annotation.ColorRes
-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
+import android.support.annotation.ColorInt
+import android.support.annotation.ColorRes
+import android.support.annotation.DrawableRes
+import android.support.annotation.StringRes
 import per.goweii.anylayer.toast.ToastLayer
 
 fun <T : ToastLayer> T.setRemoveOthers(removeOthers: Boolean) = this.apply {