WIP

blackbbc · Mar 15, 2018 · b2daa9e · b2daa9e
1 parent 40b5b15
commit b2daa9e
Show file tree

Hide file tree

Showing 40 changed files with 126 additions and 120 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -70,6 +70,10 @@ versioneye {
     }
 }
 
+kapt {
+    useBuildCache = true
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
@@ -85,7 +89,7 @@ dependencies {
     implementation project(':gsyVideoPlayer')
     /* TakePhoto */
     implementation project(':takephoto_library')
-    implementation 'com.android.support:multidex:1.0.2'
+    implementation 'com.android.support:multidex:1.0.3'
     /* Support Library */
     implementation "com.android.support:appcompat-v7:${versions.supportLibrary}"
     implementation "com.android.support:recyclerview-v7:${versions.supportLibrary}"
@@ -95,6 +99,8 @@ dependencies {
     /* Kotlin */
     implementation "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
     kapt "com.android.databinding:compiler:${versions.gradle}"
+    /* Anko */
+    implementation "org.jetbrains.anko:anko-commons:${versions.anko}"
     /* RxJava2 */
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
     implementation 'io.reactivex.rxjava2:rxjava:2.1.8'
@@ -123,10 +129,10 @@ dependencies {
     implementation 'com.google.dagger:dagger:2.14.1'
     kapt 'com.google.dagger:dagger-compiler:2.14.1'
     /* Glide */
-    implementation 'com.github.bumptech.glide:glide:4.4.0'
+    implementation 'com.github.bumptech.glide:glide:4.6.1'
     implementation "com.android.support:support-v4:${versions.supportLibrary}"
-    implementation 'com.github.bumptech.glide:annotations:4.4.0'
-    kapt 'com.github.bumptech.glide:compiler:4.4.0'
+    implementation 'com.github.bumptech.glide:annotations:4.6.1'
+    kapt 'com.github.bumptech.glide:compiler:4.6.1'
     /* RecyclerView Adapter */
     implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
     /* Jsoup */

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -209,10 +209,8 @@
 
 # Glide
 -keep public class * implements com.bumptech.glide.module.GlideModule
--keep public class * extends com.bumptech.glide.AppGlideModule
 -keep public class * extends com.bumptech.glide.module.AppGlideModule
--keep class com.bumptech.glide.GeneratedAppGlideModuleImpl
--keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
   **[] $VALUES;
   public *;
 }

diff --git a/app/src/main/kotlin/me/sweetll/tucao/AppGlideModule.kt b/app/src/main/kotlin/me/sweetll/tucao/AppGlideModule.kt
@@ -8,7 +8,7 @@ import com.bumptech.glide.module.AppGlideModule
 
 @GlideModule
 class AppGlideModule: AppGlideModule() {
-    override fun registerComponents(context: Context?, glide: Glide?, registry: Registry?) {
+    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
         super.registerComponents(context, glide, registry)
     }
 

diff --git a/app/src/main/kotlin/me/sweetll/tucao/business/channel/fragment/ChannelDetailFragment.kt b/app/src/main/kotlin/me/sweetll/tucao/business/channel/fragment/ChannelDetailFragment.kt
@@ -56,36 +56,36 @@ class ChannelDetailFragment : BaseFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        tid = arguments.getInt(ARG_TID, 0)
+        tid = arguments!!.getInt(ARG_TID, 0)
 
         AppApplication.get()
                 .getApiComponent()
                 .inject(this)
     }
 
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_channel_detail, container, false)
         return binding.root
     }
 
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         videoAdapter.setOnLoadMoreListener ({
             loadMoreData()
         }, binding.videoRecycler)
         binding.videoRecycler.addOnItemTouchListener(object : OnItemClickListener() {
             override fun onSimpleItemClick(helper: BaseQuickAdapter<*, *>, itemView: View, position: Int) {
-                val video: Video = videoAdapter.getItem(position)
+                val video: Video = videoAdapter.getItem(position)!!
                 if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                     val coverImg = itemView.findViewById<ImageView>(R.id.img_thumb)
                     val titleText = itemView.findViewById<View>(R.id.text_title)
                     val p1: Pair<View, String> = Pair.create(coverImg, "cover")
                     val cover = titleText.tag as String
                     val options = ActivityOptionsCompat
-                            .makeSceneTransitionAnimation(activity, p1)
-                    VideoActivity.intentTo(activity, video, cover, options.toBundle())
+                            .makeSceneTransitionAnimation(activity!!, p1)
+                    VideoActivity.intentTo(activity!!, video, cover, options.toBundle()!!)
                 } else {
-                    VideoActivity.intentTo(activity, video)
+                    VideoActivity.intentTo(activity!!, video)
                 }
             }
         })

diff --git a/app/src/main/kotlin/me/sweetll/tucao/business/download/fragment/DownloadedFragment.kt b/app/src/main/kotlin/me/sweetll/tucao/business/download/fragment/DownloadedFragment.kt
@@ -28,12 +28,12 @@ class DownloadedFragment: BaseFragment(), DownloadActivity.ContextMenuCallback {
         DownloadedVideoAdapter(activity as DownloadActivity, DownloadHelpers.loadDownloadedVideos())
     }
 
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_downloaded, container, false)
         return binding.root
     }
 
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupRecyclerView()
     }

diff --git a/app/src/main/kotlin/me/sweetll/tucao/business/download/fragment/DownloadingFragment.kt b/app/src/main/kotlin/me/sweetll/tucao/business/download/fragment/DownloadingFragment.kt
@@ -28,12 +28,12 @@ class DownloadingFragment: BaseFragment(), DownloadActivity.ContextMenuCallback
         DownloadingVideoAdapter(activity as DownloadActivity, DownloadHelpers.loadDownloadingVideos())
     }
 
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_downloading, container, false)
         return binding.root
     }
 
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupRecyclerView()
     }

diff --git a/app/src/main/kotlin/me/sweetll/tucao/business/drrr/DrrrDetailActivity.kt b/app/src/main/kotlin/me/sweetll/tucao/business/drrr/DrrrDetailActivity.kt
@@ -126,13 +126,13 @@ class DrrrDetailActivity : BaseActivity() {
             Const.LOAD_MORE_COMPLETE -> {
                 adapter.data[1].replyNum(total)
                 adapter.notifyItemChanged(1)
-                adapter.addData(data)
+                adapter.addData(data!!)
                 adapter.loadMoreComplete()
             }
             Const.LOAD_MORE_END -> {
                 adapter.data[1].replyNum(total)
                 adapter.notifyItemChanged(1)
-                adapter.addData(data)
+                adapter.addData(data!!)
                 adapter.loadMoreEnd()
             }
             Const.LOAD_MORE_FAIL -> {

diff --git a/app/src/main/kotlin/me/sweetll/tucao/business/drrr/DrrrListActivity.kt b/app/src/main/kotlin/me/sweetll/tucao/business/drrr/DrrrListActivity.kt
@@ -108,12 +108,12 @@ class DrrrListActivity : BaseActivity() {
         )
         adapter.setOnItemClickListener {
             _, _, position ->
-            val post = adapter.getItem(position)
+            val post = adapter.getItem(position)!!
             DrrrDetailActivity.intentTo(this, post)
         }
         adapter.setOnItemChildClickListener {
             _, view, position ->
-            val post = adapter.getItem(position)
+            val post = adapter.getItem(position)!!
             if (!post.vote) {
                 post.vote = true
                 post.voteNum++
@@ -140,11 +140,11 @@ class DrrrListActivity : BaseActivity() {
     fun loadMoreData(data: MutableList<Post>?, flag: Int) {
         when (flag) {
             Const.LOAD_MORE_COMPLETE -> {
-                adapter.addData(data)
+                adapter.addData(data!!)
                 adapter.loadMoreComplete()
             }
             Const.LOAD_MORE_END -> {
-                adapter.addData(data)
+                adapter.addData(data!!)
                 adapter.loadMoreEnd()
             }
             Const.LOAD_MORE_FAIL -> {

diff --git a/app/src/main/kotlin/me/sweetll/tucao/business/home/PlayHistoryActivity.kt b/app/src/main/kotlin/me/sweetll/tucao/business/home/PlayHistoryActivity.kt
@@ -59,7 +59,7 @@ class PlayHistoryActivity : BaseActivity() {
             }
 
             override fun onItemSwiped(p0: RecyclerView.ViewHolder?, position: Int) {
-                val result = playHistoryAdapter.getItem(position)
+                val result = playHistoryAdapter.getItem(position)!!
                 HistoryHelpers.removePlayHistory(result)
             }
 

diff --git a/app/src/main/kotlin/me/sweetll/tucao/business/home/StarActivity.kt b/app/src/main/kotlin/me/sweetll/tucao/business/home/StarActivity.kt
@@ -59,7 +59,7 @@ class StarActivity : BaseActivity() {
             }
 
             override fun onItemSwiped(p0: RecyclerView.ViewHolder?, position: Int) {
-                val result = starAdapter.getItem(position)
+                val result = starAdapter.getItem(position)!!
                 HistoryHelpers.removePlayHistory(result)
             }
 

diff --git a/app/src/main/kotlin/me/sweetll/tucao/business/home/adapter/BannerHolder.kt b/app/src/main/kotlin/me/sweetll/tucao/business/home/adapter/BannerHolder.kt
@@ -15,6 +15,7 @@ import me.sweetll.tucao.business.browser.BrowserActivity
 import me.sweetll.tucao.business.video.VideoActivity
 import me.sweetll.tucao.extension.load
 import me.sweetll.tucao.model.raw.Banner
+
 class BannerHolder: Holder<Banner> {
     lateinit var rootView: View
 
@@ -33,8 +34,8 @@ class BannerHolder: Holder<Banner> {
                     val p1: Pair<View, String> = Pair.create(bannerImg, "cover")
                     val p2: Pair<View, String> = Pair.create(bg, "bg")
                     val options = ActivityOptionsCompat
-                            .makeSceneTransitionAnimation(context as Activity, p1, p2).toBundle()
-                    VideoActivity.intentTo(context, banner.hid, banner.imgUrl, options)
+                            .makeSceneTransitionAnimation(context as Activity, p1, p2)
+                    VideoActivity.intentTo(context, banner.hid, banner.imgUrl, options.toBundle())
                 } else {
                     VideoActivity.intentTo(context, banner.hid)
                 }

diff --git a/app/src/main/kotlin/me/sweetll/tucao/business/home/fragment/AnimationFragment.kt b/app/src/main/kotlin/me/sweetll/tucao/business/home/fragment/AnimationFragment.kt
@@ -42,7 +42,7 @@ class AnimationFragment : BaseFragment() {
         return binding.root
     }
 
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding.swipeRefresh.isEnabled = false
         binding.swipeRefresh.setColorSchemeResources(R.color.colorPrimary)
@@ -75,7 +75,7 @@ class AnimationFragment : BaseFragment() {
             override fun onSimpleItemChildClick(adapter: BaseQuickAdapter<*, *>, view: View, position: Int) {
                 when (view.id) {
                     R.id.card_more -> {
-                        ChannelDetailActivity.intentTo(activity, view.tag as Int)
+                        ChannelDetailActivity.intentTo(activity!!, view.tag as Int)
                     }
                     R.id.card1, R.id.card2, R.id.card3, R.id.card4 -> {
                         if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -85,10 +85,10 @@ class AnimationFragment : BaseFragment() {
                             val p2: Pair<View, String> = Pair.create(titleText, "bg")
                             val cover = titleText.tag as String
                             val options = ActivityOptionsCompat
-                                    .makeSceneTransitionAnimation(activity, p1, p2)
-                            VideoActivity.intentTo(activity, view.tag as String, cover, options.toBundle())
+                                    .makeSceneTransitionAnimation(activity!!, p1, p2)
+                            VideoActivity.intentTo(activity!!, view.tag as String, cover, options.toBundle())
                         } else {
-                            VideoActivity.intentTo(activity, view.tag as String)
+                            VideoActivity.intentTo(activity!!, view.tag as String)
                         }
                     }
                 }
@@ -103,8 +103,8 @@ class AnimationFragment : BaseFragment() {
         val arcMotion = ArcMotion()
         changeBounds.pathMotion = arcMotion
 
-        activity.window.sharedElementExitTransition = changeBounds
-        activity.window.sharedElementReenterTransition = null
+        activity!!.window.sharedElementExitTransition = changeBounds
+        activity!!.window.sharedElementReenterTransition = null
     }
 
     override fun setUserVisibleHint(isVisibleToUser: Boolean) {

diff --git a/app/src/main/kotlin/me/sweetll/tucao/business/home/fragment/BangumiFragment.kt b/app/src/main/kotlin/me/sweetll/tucao/business/home/fragment/BangumiFragment.kt
@@ -45,7 +45,7 @@ class BangumiFragment : BaseFragment() {
         return binding.root
     }
 
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding.swipeRefresh.isEnabled = false
         binding.swipeRefresh.setColorSchemeResources(R.color.colorPrimary)
@@ -78,7 +78,7 @@ class BangumiFragment : BaseFragment() {
             override fun onSimpleItemChildClick(adapter: BaseQuickAdapter<*, *>, view: View, position: Int) {
                 when (view.id) {
                     R.id.card_more -> {
-                        ChannelDetailActivity.intentTo(activity, view.tag as Int)
+                        ChannelDetailActivity.intentTo(activity!!, view.tag as Int)
                     }
                     R.id.card1, R.id.card2, R.id.card3, R.id.card4 -> {
                         if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -88,10 +88,10 @@ class BangumiFragment : BaseFragment() {
                             val p2: Pair<View, String> = Pair.create(titleText, "bg")
                             val cover = titleText.tag as String
                             val options = ActivityOptionsCompat
-                                    .makeSceneTransitionAnimation(activity, p1, p2)
-                            VideoActivity.intentTo(activity, view.tag as String, cover, options.toBundle())
+                                    .makeSceneTransitionAnimation(activity!!, p1, p2)
+                            VideoActivity.intentTo(activity!!, view.tag as String, cover, options.toBundle())
                         } else {
-                            VideoActivity.intentTo(activity, view.tag as String)
+                            VideoActivity.intentTo(activity!!, view.tag as String)
                         }
                     }
                 }
@@ -107,8 +107,8 @@ class BangumiFragment : BaseFragment() {
         val arcMotion = ArcMotion()
         changeBounds.pathMotion = arcMotion
 
-        activity.window.sharedElementExitTransition = changeBounds
-        activity.window.sharedElementReenterTransition = null
+        activity!!.window.sharedElementExitTransition = changeBounds
+        activity!!.window.sharedElementReenterTransition = null
     }
 
     override fun setUserVisibleHint(isVisibleToUser: Boolean) {

diff --git a/app/src/main/kotlin/me/sweetll/tucao/business/home/fragment/ChannelListFragment.kt b/app/src/main/kotlin/me/sweetll/tucao/business/home/fragment/ChannelListFragment.kt
@@ -22,7 +22,7 @@ class ChannelListFragment : BaseFragment() {
         return binding.root
     }
 
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
     }
 

diff --git a/app/src/main/kotlin/me/sweetll/tucao/business/home/fragment/GameFragment.kt b/app/src/main/kotlin/me/sweetll/tucao/business/home/fragment/GameFragment.kt
@@ -43,7 +43,7 @@ class GameFragment : BaseFragment() {
         return binding.root
     }
 
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding.swipeRefresh.isEnabled = false
         binding.swipeRefresh.setColorSchemeResources(R.color.colorPrimary)
@@ -76,7 +76,7 @@ class GameFragment : BaseFragment() {
             override fun onSimpleItemChildClick(adapter: BaseQuickAdapter<*, *>, view: View, position: Int) {
                 when (view.id) {
                     R.id.card_more -> {
-                        ChannelDetailActivity.intentTo(activity, view.tag as Int)
+                        ChannelDetailActivity.intentTo(activity!!, view.tag as Int)
                     }
                     R.id.card1, R.id.card2, R.id.card3, R.id.card4 -> {
                         if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -86,10 +86,10 @@ class GameFragment : BaseFragment() {
                             val p2: Pair<View, String> = Pair.create(titleText, "bg")
                             val cover = titleText.tag as String
                             val options = ActivityOptionsCompat
-                                    .makeSceneTransitionAnimation(activity, p1, p2)
-                            VideoActivity.intentTo(activity, view.tag as String, cover, options.toBundle())
+                                    .makeSceneTransitionAnimation(activity!!, p1, p2)
+                            VideoActivity.intentTo(activity!!, view.tag as String, cover, options.toBundle())
                         } else {
-                            VideoActivity.intentTo(activity, view.tag as String)
+                            VideoActivity.intentTo(activity!!, view.tag as String)
                         }
                     }
                 }
@@ -104,8 +104,8 @@ class GameFragment : BaseFragment() {
         val arcMotion = ArcMotion()
         changeBounds.pathMotion = arcMotion
 
-        activity.window.sharedElementExitTransition = changeBounds
-        activity.window.sharedElementReenterTransition = null
+        activity!!.window.sharedElementExitTransition = changeBounds
+        activity!!.window.sharedElementReenterTransition = null
     }
 
     override fun setUserVisibleHint(isVisibleToUser: Boolean) {