update the ItemsAdapter to the new RecyclerViewAdapter

tibbi · tibbi · commit 554507f684fa · 2017-11-18T22:24:08.000+01:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -46,7 +46,7 @@ ext {
 }
 
 dependencies {
-    compile 'com.simplemobiletools:commons:2.38.6'
+    compile 'com.simplemobiletools:commons:2.39.10'
     compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
@@ -57,7 +57,7 @@ dependencies {
 }
 
 buildscript {
-    ext.kotlin_version = '1.1.51'
+    ext.kotlin_version = '1.1.60'
     repositories {
         mavenCentral()
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/FavoritesActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/FavoritesActivity.kt
@@ -1,10 +1,10 @@
 package com.simplemobiletools.filemanager.activities
 
-import android.graphics.PorterDuff
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
+import com.simplemobiletools.commons.extensions.applyColorFilter
 import com.simplemobiletools.commons.extensions.beVisibleIf
 import com.simplemobiletools.filemanager.R
 import com.simplemobiletools.filemanager.extensions.config
@@ -31,7 +31,7 @@ class FavoritesActivity : SimpleActivity() {
                     setTextColor(config.textColor)
                 }
                 favorite_icon.apply {
-                    setColorFilter(config.textColor, PorterDuff.Mode.SRC_IN)
+                    applyColorFilter(config.textColor)
                     setOnClickListener {
                         config.removeFavorite(favorite)
                         updateFavorites()
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/ChangeSortingDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/ChangeSortingDialog.kt
@@ -2,14 +2,15 @@ package com.simplemobiletools.filemanager.dialogs
 
 import android.support.v7.app.AlertDialog
 import android.view.LayoutInflater
+import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.filemanager.R
 import com.simplemobiletools.filemanager.activities.SimpleActivity
 import com.simplemobiletools.filemanager.extensions.config
 import kotlinx.android.synthetic.main.dialog_change_sorting.view.*
 
-class ChangeSortingDialog(val activity: SimpleActivity, val path: String = "", val callback: () -> Unit) {
+class ChangeSortingDialog(val activity: BaseSimpleActivity, val path: String = "", val callback: () -> Unit) {
     private var currSorting = 0
     private var config = activity.config
     private var view = LayoutInflater.from(activity).inflate(R.layout.dialog_change_sorting, null)
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CompressAsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CompressAsDialog.kt
@@ -3,15 +3,15 @@ package com.simplemobiletools.filemanager.dialogs
 import android.support.v7.app.AlertDialog
 import android.view.View
 import android.view.WindowManager
+import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.filemanager.R
-import com.simplemobiletools.filemanager.activities.SimpleActivity
 import com.simplemobiletools.filemanager.extensions.config
 import kotlinx.android.synthetic.main.dialog_compress_as.view.*
 import java.io.File
 
-class CompressAsDialog(val activity: SimpleActivity, val path: String, val callback: (destination: String) -> Unit) {
+class CompressAsDialog(val activity: BaseSimpleActivity, val path: String, val callback: (destination: String) -> Unit) {
     private val view = activity.layoutInflater.inflate(R.layout.dialog_compress_as, null)
 
     init {
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CreateNewItemDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CreateNewItemDialog.kt
@@ -3,14 +3,15 @@ package com.simplemobiletools.filemanager.dialogs
 import android.support.v7.app.AlertDialog
 import android.view.View
 import android.view.WindowManager
+import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.filemanager.R
 import com.simplemobiletools.filemanager.activities.SimpleActivity
 import kotlinx.android.synthetic.main.dialog_create_new.view.*
 import java.io.File
 import java.io.IOException
 
-class CreateNewItemDialog(val activity: SimpleActivity, val path: String, val callback: (success: Boolean) -> Unit) {
+class CreateNewItemDialog(val activity: BaseSimpleActivity, val path: String, val callback: (success: Boolean) -> Unit) {
     private val view = activity.layoutInflater.inflate(R.layout.dialog_create_new, null)
 
     init {
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/SaveAsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/SaveAsDialog.kt
@@ -3,6 +3,7 @@ package com.simplemobiletools.filemanager.dialogs
 import android.support.v7.app.AlertDialog
 import android.view.LayoutInflater
 import android.view.WindowManager
+import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
 import com.simplemobiletools.commons.extensions.*
@@ -11,7 +12,7 @@ import com.simplemobiletools.filemanager.activities.SimpleActivity
 import kotlinx.android.synthetic.main.dialog_save_as.view.*
 import java.io.File
 
-class SaveAsDialog(val activity: SimpleActivity, var path: String, val callback: (savePath: String) -> Unit) {
+class SaveAsDialog(val activity: BaseSimpleActivity, var path: String, val callback: (savePath: String) -> Unit) {
 
     init {
         if (path.isEmpty()) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
@@ -13,7 +13,6 @@ import com.simplemobiletools.commons.dialogs.StoragePickerDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.models.FileDirItem
 import com.simplemobiletools.commons.views.Breadcrumbs
-import com.simplemobiletools.commons.views.MyScalableRecyclerView
 import com.simplemobiletools.filemanager.R
 import com.simplemobiletools.filemanager.activities.MainActivity
 import com.simplemobiletools.filemanager.activities.SimpleActivity
@@ -132,20 +131,17 @@ class ItemsFragment : Fragment(), ItemsAdapter.ItemOperationsListener, Breadcrum
                 storedItems = items
                 val currAdapter = items_list.adapter
                 if (currAdapter == null) {
-                    items_list.apply {
-                        this.adapter = ItemsAdapter(activity as SimpleActivity, storedItems, this@ItemsFragment, isPickMultipleIntent) {
-                            itemClicked(it)
-                        }
-
-                        DividerItemDecoration(context, DividerItemDecoration.VERTICAL).apply {
-                            setDrawable(context.resources.getDrawable(com.simplemobiletools.commons.R.drawable.divider))
-                            addItemDecoration(this)
-                        }
+                    val adapter = ItemsAdapter(activity as SimpleActivity, storedItems, this@ItemsFragment, items_list, isPickMultipleIntent) {
+                        itemClicked(it as FileDirItem)
+                    }
+                    adapter.setupDragListener(true)
 
-                        isDragSelectionEnabled = true
+                    DividerItemDecoration(context, DividerItemDecoration.VERTICAL).apply {
+                        setDrawable(context.resources.getDrawable(com.simplemobiletools.commons.R.drawable.divider))
+                        items_list.addItemDecoration(this)
                     }
+                    items_list.adapter = adapter
                     items_fastscroller.setViews(items_list, items_swipe_refresh)
-                    setupRecyclerViewListener()
                 } else {
                     (currAdapter as ItemsAdapter).updateItems(storedItems)
 
@@ -160,28 +156,6 @@ class ItemsFragment : Fragment(), ItemsAdapter.ItemOperationsListener, Breadcrum
         }
     }
 
-    private fun setupRecyclerViewListener() {
-        mView.items_list?.listener = object : MyScalableRecyclerView.MyScalableRecyclerViewListener {
-            override fun zoomIn() {
-
-            }
-
-            override fun zoomOut() {
-
-            }
-
-            override fun selectItem(position: Int) {
-                getRecyclerAdapter().selectItem(position)
-            }
-
-            override fun selectRange(initialSelection: Int, lastDraggedIndex: Int, minReached: Int, maxReached: Int) {
-                getRecyclerAdapter().selectRange(initialSelection, lastDraggedIndex, minReached, maxReached)
-            }
-        }
-    }
-
-    private fun getRecyclerAdapter() = (items_list.adapter as ItemsAdapter)
-
     fun getScrollState() = getRecyclerLayoutManager().onSaveInstanceState()
 
     private fun getRecyclerLayoutManager() = (mView.items_list.layoutManager as LinearLayoutManager)
@@ -288,10 +262,6 @@ class ItemsFragment : Fragment(), ItemsAdapter.ItemOperationsListener, Breadcrum
         }
     }
 
-    override fun itemLongClicked(position: Int) {
-        items_list.setDragSelectActive(position)
-    }
-
     override fun selectedPaths(paths: ArrayList<String>) {
         (activity as MainActivity).pickedPaths(paths)
     }
diff --git a/app/src/main/res/layout/items_fragment.xml b/app/src/main/res/layout/items_fragment.xml
@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:padding="@dimen/activity_margin"/>
 
-            <com.simplemobiletools.commons.views.MyScalableRecyclerView
+            <com.simplemobiletools.commons.views.MyRecyclerView
                 android:id="@+id/items_list"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/item_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
     android:foreground="@drawable/selector">
 
     <RelativeLayout
@@ -30,7 +33,7 @@
             android:maxLines="3"
             android:paddingLeft="@dimen/small_margin"
             android:paddingTop="@dimen/small_margin"
-            android:text="Directory"/>
+            tools:text="Directory"/>
 
         <TextView
             android:id="@+id/item_details"
@@ -39,8 +42,8 @@
             android:layout_below="@+id/item_name"
             android:layout_toRightOf="@+id/item_icon"
             android:paddingLeft="@dimen/small_margin"
-            android:text="1 KB"
-            android:textSize="@dimen/smaller_text_size"/>
+            android:textSize="@dimen/smaller_text_size"
+            tools:text="1 KB"/>
 
     </RelativeLayout>
 </FrameLayout>

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ ext {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`dependencies {`
`49`		`- compile 'com.simplemobiletools:commons:2.38.6'`
	`49`	`+ compile 'com.simplemobiletools:commons:2.39.10'`
`50`	`50`	`compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'`
`51`	`51`	`compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"`
`52`	`52`
`@@ -57,7 +57,7 @@ dependencies {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`buildscript {`
`60`		`- ext.kotlin_version = '1.1.51'`
	`60`	`+ ext.kotlin_version = '1.1.60'`
`61`	`61`	`repositories {`
`62`	`62`	`mavenCentral()`
`63`	`63`	`}`