Update to Android-Ktx 0.3

muzei · Apr 4, 2018 · 6148b42 · 6148b42
1 parent 5ebf202
commit 6148b42
Show file tree

Hide file tree

Showing 27 changed files with 33 additions and 33 deletions.
diff --git a/...-common/src/main/java/com/google/android/apps/muzei/provider/DirectBootCacheJobService.kt b/...-common/src/main/java/com/google/android/apps/muzei/provider/DirectBootCacheJobService.kt
@@ -12,7 +12,7 @@ import android.os.Build
 import android.support.annotation.RequiresApi
 import android.support.v4.content.ContextCompat
 import android.util.Log
-import androidx.content.systemService
+import androidx.core.content.systemService
 import com.google.android.apps.muzei.api.MuzeiContract
 import net.nurik.roman.muzei.androidclientcommon.BuildConfig
 import java.io.File

diff --git a/android-client-common/src/main/java/com/google/android/apps/muzei/room/ArtworkDao.kt b/android-client-common/src/main/java/com/google/android/apps/muzei/room/ArtworkDao.kt
@@ -29,7 +29,7 @@ import android.database.Cursor
 import android.net.Uri
 import android.provider.BaseColumns
 import android.util.Log
-import androidx.database.getLong
+import androidx.core.database.getLong
 import com.google.android.apps.muzei.api.MuzeiContract
 import com.google.android.apps.muzei.provider.MuzeiProvider
 import com.google.android.apps.muzei.room.converter.ComponentNameTypeConverter

diff --git a/...ent-common/src/main/java/com/google/android/apps/muzei/room/converter/UriTypeConverter.kt b/...ent-common/src/main/java/com/google/android/apps/muzei/room/converter/UriTypeConverter.kt
@@ -18,7 +18,7 @@ package com.google.android.apps.muzei.room.converter
 
 import android.arch.persistence.room.TypeConverter
 import android.net.Uri
-import androidx.net.toUri
+import androidx.core.net.toUri
 
 /**
  * Converts a [Uri] into and from a persisted value

diff --git a/...oid-client-common/src/main/java/com/google/android/apps/muzei/wearable/ArtworkTransfer.kt b/...oid-client-common/src/main/java/com/google/android/apps/muzei/wearable/ArtworkTransfer.kt
@@ -18,8 +18,8 @@
 
 package com.google.android.apps.muzei.wearable
 
-import androidx.net.toUri
-import androidx.os.bundleOf
+import androidx.core.net.toUri
+import androidx.core.os.bundleOf
 import com.google.android.apps.muzei.room.Artwork
 import com.google.android.gms.wearable.DataMap
 

diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         targetSdkVersion = 25
 
         kotlinVersion = "1.2.31"
-        ktxVersion = "0.2"
+        ktxVersion = "0.3"
         supportLibraryVersion = "27.1.0"
         constraintLayoutVersion = "1.0.2"
         lifecycleVersion = "1.1.1"

diff --git a/...500px/src/main/java/com/example/muzei/examplesource500px/FiveHundredPxExampleArtSource.kt b/...500px/src/main/java/com/example/muzei/examplesource500px/FiveHundredPxExampleArtSource.kt
@@ -18,7 +18,7 @@ package com.example.muzei.examplesource500px
 
 import android.content.Intent
 import android.util.Log
-import androidx.net.toUri
+import androidx.core.net.toUri
 import com.example.muzei.examplesource500px.FiveHundredPxService.Photo
 import com.google.android.apps.muzei.api.Artwork
 import com.google.android.apps.muzei.api.RemoteMuzeiArtSource

diff --git a/main/src/main/java/com/google/android/apps/muzei/ArtDetailFragment.kt b/main/src/main/java/com/google/android/apps/muzei/ArtDetailFragment.kt
@@ -35,8 +35,8 @@ import android.view.ViewGroup
 import android.widget.PopupMenu
 import android.widget.TextView
 import android.widget.Toast
-import androidx.view.isGone
-import androidx.view.isVisible
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
 import com.google.android.apps.muzei.api.MuzeiArtSource
 import com.google.android.apps.muzei.api.MuzeiContract
 import com.google.android.apps.muzei.notifications.NewWallpaperNotificationReceiver

diff --git a/main/src/main/java/com/google/android/apps/muzei/PhotoSetAsTargetActivity.kt b/main/src/main/java/com/google/android/apps/muzei/PhotoSetAsTargetActivity.kt
@@ -22,7 +22,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
-import androidx.os.bundleOf
+import androidx.core.os.bundleOf
 import com.google.android.apps.muzei.single.SingleArtSource
 import com.google.android.apps.muzei.sources.SourceManager
 import com.google.android.apps.muzei.util.observeOnce

diff --git a/main/src/main/java/com/google/android/apps/muzei/TutorialFragment.kt b/main/src/main/java/com/google/android/apps/muzei/TutorialFragment.kt
@@ -30,8 +30,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.animation.OvershootInterpolator
 import android.widget.ImageView
-import androidx.animation.doOnEnd
-import androidx.content.edit
+import androidx.core.animation.doOnEnd
+import androidx.core.content.edit
 import com.google.firebase.analytics.FirebaseAnalytics
 import net.nurik.roman.muzei.R
 

diff --git a/...main/java/com/google/android/apps/muzei/notifications/NewWallpaperNotificationReceiver.kt b/...main/java/com/google/android/apps/muzei/notifications/NewWallpaperNotificationReceiver.kt
@@ -32,7 +32,7 @@ import android.support.v4.app.NotificationCompat
 import android.support.v4.app.NotificationManagerCompat
 import android.support.v4.app.RemoteInput
 import android.support.v4.content.ContextCompat
-import androidx.content.edit
+import androidx.core.content.edit
 import com.google.android.apps.muzei.ArtDetailOpenLiveData
 import com.google.android.apps.muzei.api.MuzeiArtSource
 import com.google.android.apps.muzei.api.MuzeiContract

diff --git a/...in/java/com/google/android/apps/muzei/notifications/NotificationSettingsDialogFragment.kt b/...in/java/com/google/android/apps/muzei/notifications/NotificationSettingsDialogFragment.kt
@@ -25,7 +25,7 @@ import android.provider.Settings
 import android.support.v4.app.DialogFragment
 import android.support.v4.app.Fragment
 import android.support.v7.app.AlertDialog
-import androidx.content.edit
+import androidx.core.content.edit
 import net.nurik.roman.muzei.R
 
 class NotificationSettingsDialogFragment : DialogFragment() {

diff --git a/main/src/main/java/com/google/android/apps/muzei/render/DemoRenderController.kt b/main/src/main/java/com/google/android/apps/muzei/render/DemoRenderController.kt
@@ -20,7 +20,7 @@ import android.animation.Animator
 import android.animation.ObjectAnimator
 import android.content.Context
 import android.os.Handler
-import androidx.animation.doOnEnd
+import androidx.core.animation.doOnEnd
 
 class DemoRenderController(
         context: Context, renderer: MuzeiBlurRenderer,

diff --git a/main/src/main/java/com/google/android/apps/muzei/render/MuzeiRendererFragment.kt b/main/src/main/java/com/google/android/apps/muzei/render/MuzeiRendererFragment.kt
@@ -29,7 +29,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import androidx.os.bundleOf
+import androidx.core.os.bundleOf
 
 import com.google.android.apps.muzei.util.ImageBlurrer
 import com.google.android.apps.muzei.util.blur

diff --git a/main/src/main/java/com/google/android/apps/muzei/settings/AboutActivity.kt b/main/src/main/java/com/google/android/apps/muzei/settings/AboutActivity.kt
@@ -27,7 +27,7 @@ import android.text.method.LinkMovementMethod
 import android.view.View
 import android.view.ViewPropertyAnimator
 import android.widget.TextView
-import androidx.net.toUri
+import androidx.core.net.toUri
 import com.google.android.apps.muzei.render.MuzeiRendererFragment
 import com.google.android.apps.muzei.util.AnimatedMuzeiLogoFragment
 import net.nurik.roman.muzei.BuildConfig

diff --git a/main/src/main/java/com/google/android/apps/muzei/settings/EffectsFragment.kt b/main/src/main/java/com/google/android/apps/muzei/settings/EffectsFragment.kt
@@ -27,7 +27,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.CheckBox
 import android.widget.SeekBar
-import androidx.content.edit
+import androidx.core.content.edit
 
 import com.google.android.apps.muzei.render.MuzeiBlurRenderer
 

diff --git a/main/src/main/java/com/google/android/apps/muzei/sources/ChooseSourceFragment.kt b/main/src/main/java/com/google/android/apps/muzei/sources/ChooseSourceFragment.kt
@@ -56,7 +56,7 @@ import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import android.widget.TextView
 import android.widget.Toast
-import androidx.os.bundleOf
+import androidx.core.os.bundleOf
 import com.google.android.apps.muzei.api.MuzeiArtSource
 import com.google.android.apps.muzei.notifications.NotificationSettingsDialogFragment
 import com.google.android.apps.muzei.room.MuzeiDatabase

diff --git a/main/src/main/java/com/google/android/apps/muzei/tasker/TaskerSettingActivity.kt b/main/src/main/java/com/google/android/apps/muzei/tasker/TaskerSettingActivity.kt
@@ -19,7 +19,7 @@ package com.google.android.apps.muzei.tasker
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import androidx.os.bundleOf
+import androidx.core.os.bundleOf
 import com.google.android.apps.muzei.api.MuzeiArtSource
 import com.google.android.apps.muzei.api.internal.ProtocolConstants
 import com.twofortyfouram.locale.api.Intent.EXTRA_BUNDLE

diff --git a/main/src/main/java/com/google/android/apps/muzei/util/Scrollbar.kt b/main/src/main/java/com/google/android/apps/muzei/util/Scrollbar.kt
@@ -23,7 +23,7 @@ import android.graphics.Path
 import android.graphics.RectF
 import android.util.AttributeSet
 import android.view.View
-import androidx.content.res.use
+import androidx.core.content.res.use
 import net.nurik.roman.muzei.R
 
 class Scrollbar @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)

diff --git a/main/src/main/java/com/google/android/apps/muzei/widget/AppWidgetUpdateTask.kt b/main/src/main/java/com/google/android/apps/muzei/widget/AppWidgetUpdateTask.kt
@@ -33,7 +33,7 @@ import android.util.Log
 import android.util.TypedValue
 import android.view.View
 import android.widget.RemoteViews
-import androidx.os.bundleOf
+import androidx.core.os.bundleOf
 import com.google.android.apps.muzei.render.BitmapRegionLoader
 import com.google.android.apps.muzei.render.sampleSize
 import com.google.android.apps.muzei.room.MuzeiDatabase

diff --git a/source-gallery/src/main/java/com/google/android/apps/muzei/gallery/GalleryArtSource.kt b/source-gallery/src/main/java/com/google/android/apps/muzei/gallery/GalleryArtSource.kt
@@ -40,8 +40,8 @@ import android.support.v4.content.ContextCompat
 import android.text.TextUtils
 import android.text.format.DateUtils
 import android.util.Log
-import androidx.database.getString
-import androidx.net.toUri
+import androidx.core.database.getString
+import androidx.core.net.toUri
 import com.google.android.apps.muzei.api.Artwork
 import com.google.android.apps.muzei.api.MuzeiArtSource
 import java.io.IOException

diff --git a/.../src/main/java/com/google/android/apps/muzei/gallery/GalleryImportPhotosDialogFragment.kt b/.../src/main/java/com/google/android/apps/muzei/gallery/GalleryImportPhotosDialogFragment.kt
@@ -11,7 +11,7 @@ import android.support.v4.app.DialogFragment
 import android.support.v4.app.FragmentManager
 import android.support.v7.app.AlertDialog
 import android.widget.ArrayAdapter
-import androidx.content.withStyledAttributes
+import androidx.core.content.withStyledAttributes
 import com.google.android.apps.muzei.util.observe
 
 class GalleryImportPhotosDialogFragment : DialogFragment() {

diff --git a/...ce-gallery/src/main/java/com/google/android/apps/muzei/gallery/GallerySettingsActivity.kt b/...ce-gallery/src/main/java/com/google/android/apps/muzei/gallery/GallerySettingsActivity.kt
@@ -67,8 +67,8 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
 import android.widget.ViewAnimator
-import androidx.content.edit
-import androidx.database.getStringOrNull
+import androidx.core.content.edit
+import androidx.core.database.getStringOrNull
 import com.google.android.apps.muzei.util.MultiSelectionController
 import com.google.android.apps.muzei.util.observe
 import com.google.android.apps.muzei.util.observeOnce

diff --git a/...gallery/src/main/java/com/google/android/apps/muzei/gallery/converter/UriTypeConverter.kt b/...gallery/src/main/java/com/google/android/apps/muzei/gallery/converter/UriTypeConverter.kt
@@ -18,7 +18,7 @@ package com.google.android.apps.muzei.gallery.converter
 
 import android.arch.persistence.room.TypeConverter
 import android.net.Uri
-import androidx.net.toUri
+import androidx.core.net.toUri
 
 /**
  * Converts a [Uri] into and from a persisted value

diff --git a/source-single/src/main/java/com/google/android/apps/muzei/single/SingleArtSource.kt b/source-single/src/main/java/com/google/android/apps/muzei/single/SingleArtSource.kt
@@ -23,7 +23,7 @@ import android.content.Intent
 import android.net.Uri
 import android.provider.DocumentsContract
 import android.util.Log
-import androidx.database.getStringOrNull
+import androidx.core.database.getStringOrNull
 import com.google.android.apps.muzei.api.Artwork
 import com.google.android.apps.muzei.api.MuzeiArtSource
 import java.io.File

diff --git a/wearable/src/main/java/com/google/android/apps/muzei/MuzeiWatchFace.kt b/wearable/src/main/java/com/google/android/apps/muzei/MuzeiWatchFace.kt
@@ -51,7 +51,7 @@ import android.text.format.DateFormat
 import android.util.Log
 import android.view.Gravity
 import android.view.SurfaceHolder
-import androidx.content.edit
+import androidx.core.content.edit
 import com.google.android.apps.muzei.api.MuzeiContract
 import com.google.android.apps.muzei.complications.ArtworkComplicationProviderService
 import com.google.android.apps.muzei.datalayer.ArtworkCacheIntentService

diff --git a/...in/java/com/google/android/apps/muzei/complications/ArtworkComplicationProviderService.kt b/...in/java/com/google/android/apps/muzei/complications/ArtworkComplicationProviderService.kt
@@ -27,8 +27,8 @@ import android.support.wearable.complications.ComplicationManager
 import android.support.wearable.complications.ComplicationProviderService
 import android.support.wearable.complications.ComplicationText
 import android.util.Log
-import androidx.content.edit
-import androidx.os.bundleOf
+import androidx.core.content.edit
+import androidx.core.os.bundleOf
 import com.google.android.apps.muzei.FullScreenActivity
 import com.google.android.apps.muzei.api.MuzeiContract
 import com.google.android.apps.muzei.room.MuzeiDatabase

diff --git a/wearable/src/main/java/com/google/android/apps/muzei/datalayer/ActivateMuzeiIntentService.kt b/wearable/src/main/java/com/google/android/apps/muzei/datalayer/ActivateMuzeiIntentService.kt
@@ -35,7 +35,7 @@ import android.support.v4.content.ContextCompat
 import android.support.wearable.activity.ConfirmationActivity
 import android.util.Log
 import android.widget.Toast
-import androidx.content.edit
+import androidx.core.content.edit
 import com.google.android.gms.tasks.Tasks
 import com.google.android.gms.wearable.CapabilityClient
 import com.google.android.gms.wearable.CapabilityInfo