Merge pull request #983 from mikepenz/develop

dev -> main

Author: mikepenz

.gitignore

@@ -28,6 +28,7 @@ proguard/
 
 #IntelliJ files
 *.iml
-.idea/
+.idea/*
+!.idea/dictionaries
 
-*.DS_STORE
+*.DS_STORE

.idea/dictionaries/benji.xml

@@ -1,4 +1,4 @@
-FastAdapter contributors (sorted alphabeticaly)
+FastAdapter contributors (sorted alphabetically)
 ============================================
 
 * **[Fabian Terhorst](https://github.com/FabianTerhorst)**

CONTRIBUTORS.md

@@ -24,8 +24,8 @@ override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int, pa
 
 #### v4.x.y
 
-v4 is a huge release changing most of the codebase to Kotlin. This comes with many refactors, and as a result of that with many breaking API changes. 
-We put a lot of focus on type safety with this release, as such this release is a lot more strict and tries to prevent as many potential bad type mixups as possible.
+v4 is a huge release changing most of the codebase to Kotlin. This comes with many refactorings, and as a result of that with many breaking API changes. 
+We put a lot of focus on type safety with this release, as such this release is a lot more strict and tries to prevent as many potential bad type mix-ups as possible.
 
 * For compatibility, most existing static fields and functions remain static in Java. For newer functions, accessing from Java may require using the `Companion` class. For instance, `FastAdapter.example()` becomes `FastAdapter.Companion.example()`
 * The `IItem` interface now requires a type specification. E.g. `IItem<RecyclerView.ViewHolder>`
@@ -57,7 +57,7 @@ If you have any issues during the migration, or any questions come up please ope
 * Further details about migrating to androidX and a overview can be found on the official docs. https://developer.android.com/topic/libraries/support-library/refactor
 
 #### v3.2.4
-* Adjusted the `set(int position, Item item, int preItemCount)` to include the `preItemCount` to corretly notify the adapter about the changed element.
+* Adjusted the `set(int position, Item item, int preItemCount)` to include the `preItemCount` to correctly notify the adapter about the changed element.
 
 #### v3.2.3
 * The `ActionModeHelper` requires a `FastAdapter` with the `SelectExtension` applied. This is done in current versions via `withSelectable(true)`. Make sure this is called before creating the `ActionModeHelper`.
@@ -156,17 +156,17 @@ public ViewHolder getViewHolder(View v) {
 
 **SHORT OVERVIEW**
 * If you have items implemented by using the interface you have to implement the new methods (**unbindView**)
-* If you have expandable items make sure to adjust the Model type definitions as metioned below. Check out the `AbstractExpandableItem` to simplify this for you
+* If you have expandable items make sure to adjust the Model type definitions as mentioned below. Check out the `AbstractExpandableItem` to simplify this for you
 * If you use the `MaterialDrawer`, the `AboutLibraries` in your project, please make sure to update them so the changed interfaces do not cause conflicts
 
 **DETAILED**
 * New `unbindView` method was added to the `IItem` --> This method is called when the current item is no longer set and before the `ViewHolder` is used for the next item
  * You should move your view resetting logic here, or for example glide image loading canceling
 * `IExpandable` Model types changes
- * it is now required to define the type which will be used for the subItems. This can be an implementation or `ISubItem`. We now require this, as we will keep the references between childs, and parents.
+ * it is now required to define the type which will be used for the subItems. This can be an implementation or `ISubItem`. We now require this, as we will keep the references between children, and parents.
  * this allows more optimizations, and many additional usecases
 * New `ISubItem` interface added 
- * items serving as subitems, have to implement this. 
+ * items serving as subItems, have to implement this. 
 * New `AbstractExpandableItem` added, which combines `IExpandable` and `ISubItem` with an `AbstractItem` to simplify your life
 * A new `SubItemUtil` was introduced which simplifies some use cases when working with expandable / collapsing lists
 

MIGRATION.md

@@ -1,7 +1,7 @@
 # FastAdapter
 
 The FastAdapter is here to simplify creating adapters for RecyclerViews. Don't worry about the adapter anymore. Just write the logic for how your view/item should look like, and you are done.
-It's blazingly fast, minimizing the code you need to write, and is easy to extend.
+It's blazing fast, minimizing the code you need to write, and is easy to extend.
 
 -------
 
@@ -48,7 +48,7 @@ It's blazingly fast, minimizing the code you need to write, and is easy to exten
 
 ## Latest releases 🛠
 
-- Kotlin | [v5.3.4](https://github.com/mikepenz/FastAdapter/tree/v5.3.4)
+- Kotlin | [v5.3.5](https://github.com/mikepenz/FastAdapter/tree/v5.3.5)
 - Java && AndroidX | [v3.3.1](https://github.com/mikepenz/FastAdapter/tree/v3.3.1)
 - Java && AppCompat | [v3.2.9](https://github.com/mikepenz/FastAdapter/tree/v3.2.9)
 

README.md

@@ -28,7 +28,7 @@ import java.util.*
 import java.util.concurrent.atomic.AtomicLong
 
 /**
- * This sample showcases compatibility the awesome Sticky-Headers library by timehop
+ * This sample showcases compatibility with the awesome Sticky-Headers library by timehop
  * https://github.com/timehop/sticky-headers-recyclerview
  */
 class AdvancedSampleActivity : AppCompatActivity() {
@@ -82,7 +82,7 @@ class AdvancedSampleActivity : AppCompatActivity() {
             if (item is IExpandable<*> && item.subItems.isNotEmpty()) {
                 true
             } else {
-                //handle the longclick actions
+                //handle the long click actions
                 val actionMode = mActionModeHelper?.onLongClick(this@AdvancedSampleActivity, position)
                 if (actionMode != null) {
                     //we want color our CAB

app/src/main/java/com/mikepenz/fastadapter/app/AdvancedSampleActivity.kt

@@ -63,7 +63,7 @@ class DiffUtilActivity : AppCompatActivity() {
 
     override fun onSaveInstanceState(_outState: Bundle) {
         var outState = _outState
-        //add the values which need to be saved from the adapter to the bundel
+        //add the values which need to be saved from the adapter to the bundle
         outState = fastItemAdapter.saveInstanceState(outState)
         super.onSaveInstanceState(outState)
     }

app/src/main/java/com/mikepenz/fastadapter/app/DiffUtilActivity.kt

@@ -128,7 +128,7 @@ class ExpandableMultiselectDeleteSampleActivity : AppCompatActivity() {
                         .identifier = (i + 1).toLong()
                 //.withIsExpanded(true) don't use this in such a setup, use adapter.expand() to expand all items instead
 
-                //add subitems so we can showcase the collapsible functionality
+                //add subItems so we can showcase the collapsible functionality
                 val subItems = LinkedList<ISubItem<*>>()
                 for (ii in 1..5) {
                     val sampleItem = SimpleSubItem()
@@ -159,7 +159,7 @@ class ExpandableMultiselectDeleteSampleActivity : AppCompatActivity() {
                     val headerItem = item.parent
                     if (headerItem != null) {
                         val pos = fastItemAdapter.getAdapterPosition(headerItem)
-                        // Important: notify the header directly, not via the notifyadapterItemChanged!
+                        // Important: notify the header directly, not via the notifyAdapterItemChanged!
                         // we just want to update the view and we are sure, nothing else has to be done
                         fastItemAdapter.notifyItemChanged(pos)
                     }

app/src/main/java/com/mikepenz/fastadapter/app/ExpandableMultiselectDeleteSampleActivity.kt

@@ -45,6 +45,6 @@
     <string name="sample_diff_util">Diff Util Sample</string>
     <string name="sample_diff_util_descr">Diff Util, refresh list using DiffUtil</string>
     <string name="open_source">Open Source</string>
-    <string name="search_title">Suche</string>
+    <string name="search_title">Search</string>
     <string name="action_undo">UNDO</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -4,8 +4,8 @@ buildscript {
 
     ext {
         release = [
-                versionName: "5.3.4",
-                versionCode: 5034
+                versionName: "5.3.5",
+                versionCode: 5035
         ]
 
         setup = [