➕ Sample app depend Androidx

ZyElite · Oct 19, 2018 · 46b3008 · 46b3008
1 parent 879f533
commit 46b3008
Show file tree

Hide file tree

Showing 32 changed files with 96 additions and 338 deletions.
diff --git a/build_kotlin.gradle b/build_kotlin.gradle
@@ -1,6 +1,10 @@
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
+androidExtensions {
+    experimental = true
+}
+
 dependencies{
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
 

diff --git a/gradle.properties b/gradle.properties
@@ -39,4 +39,5 @@ FFMPEG_MEDIA_METADATA_RETRIEVER_VERSION=1.0.14
 EVENT_BUS_VERSION=3.0.0
 RETROFIT_VERSION=2.3.0
 LEAK_CANARY_ANDROID_VERSION=1.5
-FLEXBOX=0.3.2
+FLEXBOX=0.3.2
+ANDROIDX=0.3.1
diff --git a/ktx/.gitignore b/ktx/.gitignore
diff --git a/ktx/build.gradle b/ktx/build.gradle
diff --git a/ktx/proguard-rules.pro b/ktx/proguard-rules.pro
diff --git a/ktx/src/main/AndroidManifest.xml b/ktx/src/main/AndroidManifest.xml
diff --git a/ktx/src/main/java/me/panpf/ktx/Dimen.kt b/ktx/src/main/java/me/panpf/ktx/Dimen.kt
diff --git a/ktx/src/main/java/me/panpf/ktx/Toast.kt b/ktx/src/main/java/me/panpf/ktx/Toast.kt
diff --git a/ktx/src/main/java/me/panpf/ktx/View.kt b/ktx/src/main/java/me/panpf/ktx/View.kt
diff --git a/ktx/src/main/java/me/panpf/ktx/ViewModelBinder.kt b/ktx/src/main/java/me/panpf/ktx/ViewModelBinder.kt
diff --git a/ktx/src/main/res/values/strings.xml b/ktx/src/main/res/values/strings.xml
diff --git a/sample-video-thumbnail/build.gradle b/sample-video-thumbnail/build.gradle
@@ -42,7 +42,6 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':sketch')
-    implementation project(':ktx')
 
     implementation "com.android.support:appcompat-v7:${SUPPORT_VERSION}"
     implementation "com.android.support:recyclerview-v7:${SUPPORT_VERSION}"
@@ -57,6 +56,9 @@ dependencies {
     implementation "me.panpf:assembly-adapter:${ASSEMBLY_ADAPTER_VERSION}"
     implementation "me.panpf:assembly-adapter-ktx:${ASSEMBLY_ADAPTER_VERSION}"
     implementation "me.panpf:assembly-paged-list-adapter:${ASSEMBLY_ADAPTER_VERSION}"
+    implementation "me.panpf:androidx-kt:${ANDROIDX}"
+    implementation "me.panpf:androidx-kt-args:${ANDROIDX}"
+    implementation "me.panpf:androidx-kt-arch:${ANDROIDX}"
 
     implementation "com.github.wseemann:FFmpegMediaMetadataRetriever:${FFMPEG_MEDIA_METADATA_RETRIEVER_VERSION}"
 }

diff --git a/sample-video-thumbnail/src/main/java/me/panpf/sketch/sample/vt/bean/VideoInfo.kt b/sample-video-thumbnail/src/main/java/me/panpf/sketch/sample/vt/bean/VideoInfo.kt
@@ -3,8 +3,7 @@ package me.panpf.sketch.sample.vt.bean
 import android.content.Context
 import android.support.v7.util.DiffUtil
 import android.text.format.Formatter
-import java.text.SimpleDateFormat
-import java.util.*
+import me.panpf.javaxkt.util.formatYMDHM
 
 class VideoInfo {
     var title: String? = null
@@ -21,29 +20,22 @@ class VideoInfo {
         val secondsRemaining = second % 60
         val minute = second / 60
         val builder = StringBuilder()
-        if (minute <= 0) {
-            builder.append("00")
-        } else if (minute < 10) {
-            builder.append("0" + minute)
-        } else {
-            builder.append(minute)
+        when {
+            minute <= 0 -> builder.append("00")
+            minute < 10 -> builder.append("0$minute")
+            else -> builder.append(minute)
         }
 
         builder.append(":")
-
-        if (secondsRemaining <= 0) {
-            builder.append("00")
-        } else if (secondsRemaining < 10) {
-            builder.append("0" + secondsRemaining)
-        } else {
-            builder.append(secondsRemaining)
+        when {
+            secondsRemaining <= 0 -> builder.append("00")
+            secondsRemaining < 10 -> builder.append("0$secondsRemaining")
+            else -> builder.append(secondsRemaining)
         }
         builder.toString()
     }
 
-    val tempFormattedDate: String by lazy {
-        SimpleDateFormat("yyyy-MM-dd HH:mm").format(Date(date))
-    }
+    val tempFormattedDate: String by lazy { date.formatYMDHM() }
 
     fun getTempFormattedSize(context: Context): String {
         if (tempFormattedSize == null) {
@@ -57,12 +49,12 @@ class VideoInfo {
     }
 
     class DiffCallback : DiffUtil.ItemCallback<VideoInfo>() {
-        override fun areItemsTheSame(oldItem: VideoInfo?, newItem: VideoInfo?): Boolean {
+        override fun areItemsTheSame(oldItem: VideoInfo, newItem: VideoInfo): Boolean {
             return oldItem == newItem
         }
 
-        override fun areContentsTheSame(oldItem: VideoInfo?, newItem: VideoInfo?): Boolean {
-            return oldItem != null && newItem != null && oldItem.path.equals(newItem.path)
+        override fun areContentsTheSame(oldItem: VideoInfo, newItem: VideoInfo): Boolean {
+            return oldItem.path.equals(newItem.path)
         }
     }
 }
diff --git a/sample-video-thumbnail/src/main/java/me/panpf/sketch/sample/vt/ds/VideoListDataSource.kt b/sample-video-thumbnail/src/main/java/me/panpf/sketch/sample/vt/ds/VideoListDataSource.kt
@@ -47,7 +47,7 @@ class VideoListDataSource constructor(context: Context,
                         MediaStore.Video.Media.DURATION, MediaStore.Video.Media.DATE_TAKEN,
                         MediaStore.Video.Media.MIME_TYPE), null, null,
                 MediaStore.Video.Media.DATE_TAKEN + " DESC" + " limit " + startPosition + "," + pageSize)
-        val list = ArrayList<VideoInfo>(cursor.count)
+        val list = ArrayList<VideoInfo>(cursor?.count ?: 0)
         cursor?.use {
             while (cursor.moveToNext()) {
                 val video = VideoInfo()

diff --git a/sample-video-thumbnail/src/main/java/me/panpf/sketch/sample/vt/ui/VideoListFragment.kt b/sample-video-thumbnail/src/main/java/me/panpf/sketch/sample/vt/ui/VideoListFragment.kt
@@ -25,9 +25,9 @@ import android.view.View
 import androidx.core.view.setPadding
 import kotlinx.android.synthetic.main.fragment_recycler.*
 import me.panpf.adapter.paged.AssemblyPagedListAdapter
-import me.panpf.ktx.bindViewModel
-import me.panpf.ktx.dp2px
-import me.panpf.ktx.longToast
+import me.panpf.androidxkt.arch.bindViewModel
+import me.panpf.androidxkt.util.dp2px
+import me.panpf.androidxkt.widget.showLongToast
 import me.panpf.sketch.sample.vt.BaseFragment
 import me.panpf.sketch.sample.vt.BindContentView
 import me.panpf.sketch.sample.vt.R
@@ -53,7 +53,7 @@ class VideoListFragment : BaseFragment() {
                 startActivity(intent)
             } catch (e: Throwable) {
                 e.printStackTrace()
-                longToast("Not found can play video app")
+                showLongToast("Not found can play video app")
             }
         })
         setMoreItem(LoadMoreItemFactory())
@@ -63,7 +63,7 @@ class VideoListFragment : BaseFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         recyclerFragment_contentRecycler.apply {
-            setPadding(2.dp2px(checkNotNull(context)))
+            setPadding(checkNotNull(context).dp2px(2))
             clipToPadding = false
 
             layoutManager = LinearLayoutManager(activity)

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -80,10 +80,12 @@ dependencies {
     implementation "me.panpf:pager-indicator:${PAGER_INDICATOR}"
     implementation "me.panpf:assembly-adapter:${ASSEMBLY_ADAPTER_VERSION}"
     implementation "me.panpf:assembly-adapter-ktx:${ASSEMBLY_ADAPTER_VERSION}"
+    implementation "me.panpf:androidx-kt:${ANDROIDX}"
+    implementation "me.panpf:androidx-kt-args:${ANDROIDX}"
+    implementation "me.panpf:androidx-kt-arch:${ANDROIDX}"
 
     implementation project(':sketch')
     normalImplementation project(':sketch-gif')
-    implementation project(':ktx')
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${LEAK_CANARY_ANDROID_VERSION}"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAK_CANARY_ANDROID_VERSION}"

diff --git a/sample/src/main/java/me/panpf/sketch/sample/ImageOptions.kt b/sample/src/main/java/me/panpf/sketch/sample/ImageOptions.kt
@@ -32,8 +32,6 @@ import me.panpf.sketch.shaper.RoundRectImageShaper
 import me.panpf.sketch.state.DrawableStateImage
 import me.panpf.sketch.state.OldStateImage
 import me.panpf.sketch.util.SketchUtils
-import java.lang.annotation.Retention
-import java.lang.annotation.RetentionPolicy
 
 object ImageOptions {
     /**
@@ -159,6 +157,6 @@ object ImageOptions {
     }
 
     @IntDef(RECT, CIRCULAR_STROKE, WINDOW_BACKGROUND, ROUND_RECT, LIST_FULL)
-    @Retention(RetentionPolicy.SOURCE)
+    @Retention(AnnotationRetention.SOURCE)
     annotation class Type
 }