From cbe59af2ad5ee5baf1e5c2f4c5643348f28207a6 Mon Sep 17 00:00:00 2001
From: R12rus <roman.tc@omega-r.com>
Date: Thu, 31 Jan 2019 17:15:51 +0300
Subject: [PATCH 01/32] fast scroll has been added

---
 .idea/gradle.xml                              |   3 +
 app/build.gradle                              |   2 +-
 app/src/main/AndroidManifest.xml              |   2 +-
 .../omegarecyclerview/MainActivity.java       |  15 +-
 .../FastScrollActivity.java                   |  37 ++
 .../fastscroll_example/FastScrollAdapter.java |  46 ++
 .../main/res/layout/activity_fastscroll.xml   |  12 +
 app/src/main/res/layout/activity_main.xml     |  90 +--
 app/src/main/res/layout/item_text.xml         |  12 +
 app/src/main/res/values/strings.xml           |   1 +
 omegarecyclerviewlibs/build.gradle            |   3 +-
 .../fast_scroll/AnimatorListener.java         |  36 ++
 .../FastScrollStateChangeListener.java        |  15 +
 .../OmegaFastScrollRecyclerView.java          | 165 ++++++
 .../fast_scroll/OmegaFastScrollerLayout.java  | 522 ++++++++++++++++++
 .../fast_scroll/SectionIndexer.java           |   7 +
 .../src/main/res/drawable/ic_bubble_down.xml  |  39 ++
 .../src/main/res/drawable/ic_bubble_up.xml    |  39 ++
 .../src/main/res/drawable/ic_handle.xml       |  31 ++
 .../src/main/res/drawable/ic_track.xml        |  27 +
 .../src/main/res/layout/view_fastscroller.xml |  49 ++
 .../src/main/res/values/attrs.xml             |  10 +
 .../src/main/res/values/dimens.xml            |  20 +
 23 files changed, 1133 insertions(+), 50 deletions(-)
 create mode 100644 app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java
 create mode 100644 app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java
 create mode 100644 app/src/main/res/layout/activity_fastscroll.xml
 create mode 100644 app/src/main/res/layout/item_text.xml
 create mode 100644 omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/AnimatorListener.java
 create mode 100644 omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/FastScrollStateChangeListener.java
 create mode 100644 omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollRecyclerView.java
 create mode 100644 omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollerLayout.java
 create mode 100644 omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/SectionIndexer.java
 create mode 100644 omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_down.xml
 create mode 100644 omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_up.xml
 create mode 100644 omegarecyclerviewlibs/src/main/res/drawable/ic_handle.xml
 create mode 100644 omegarecyclerviewlibs/src/main/res/drawable/ic_track.xml
 create mode 100644 omegarecyclerviewlibs/src/main/res/layout/view_fastscroller.xml
 create mode 100644 omegarecyclerviewlibs/src/main/res/values/dimens.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7a8de54..3b65dc8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/app/build.gradle b/app/build.gradle
index 41ef6da..47572e8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.1.0-alpha02'
+    implementation 'com.google.android.material:material:1.1.0-alpha03'
 
     implementation 'com.github.Omega-R.OmegaIntentBuilder:core:' + rootProject.omegaIntentBuilder
     implementation 'com.github.Omega-R.OmegaIntentBuilder:annotations:' + rootProject.omegaIntentBuilder
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 065a6d1..acc7256 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
         <activity android:name=".expandable_example.core.ExpandableActivity" />
         <activity android:name=".expandable_example.support_sticky.DefaultStickyExpandableActivity" />
         <activity android:name=".expandable_example.ChooseExpandableActivity" />
-        <activity android:name=".expandable_example.sticky_groups.StickyGroupsActivity"></activity>
+        <activity android:name=".fastscroll_example.FastScrollActivity"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/MainActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/MainActivity.java
index cef0393..2de84f0 100644
--- a/app/src/main/java/com/omega_r/omegarecyclerview/MainActivity.java
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/MainActivity.java
@@ -5,6 +5,8 @@
 import android.view.View;
 
 import com.omega_r.libs.omegaintentbuilder.AppOmegaIntentBuilder;
+import com.omega_r.libs.omegaintentbuilder.OmegaIntentBuilder;
+import com.omega_r.omegarecyclerview.fastscroll_example.FastScrollActivity;
 
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
 
@@ -20,6 +22,7 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.button_viewpager).setOnClickListener(this);
         findViewById(R.id.button_list_adapter).setOnClickListener(this);
         findViewById(R.id.button_expandable_recyclerview).setOnClickListener(this);
+        findViewById(R.id.button_fastscroll).setOnClickListener(this);
     }
 
     /**
@@ -34,49 +37,47 @@ public void onClick(View view) {
                 AppOmegaIntentBuilder.from(this)
                         .appActivities()
                         .swipeMenuActivity()
-                        .createIntentHandler()
                         .startActivity();
                 break;
             case R.id.button_sticky_header:
                 AppOmegaIntentBuilder.from(this)
                         .appActivities()
                         .stickyHeaderActivity()
-                        .createIntentHandler()
                         .startActivity();
                 break;
             case R.id.button_pagination:
                 AppOmegaIntentBuilder.from(this)
                         .appActivities()
                         .paginationActivity()
-                        .createIntentHandler()
                         .startActivity();
                 break;
             case R.id.button_sections:
                 AppOmegaIntentBuilder.from(this)
                         .appActivities()
                         .sectionsActivity()
-                        .createIntentHandler()
                         .startActivity();
                 break;
             case R.id.button_viewpager:
                 AppOmegaIntentBuilder.from(this)
                         .appActivities()
                         .viewPagerActivity()
-                        .createIntentHandler()
                         .startActivity();
                 break;
             case R.id.button_list_adapter:
                 AppOmegaIntentBuilder.from(this)
                         .appActivities()
                         .listAdapterActivity()
-                        .createIntentHandler()
                         .startActivity();
                 break;
             case R.id.button_expandable_recyclerview:
                 AppOmegaIntentBuilder.from(this)
                         .appActivities()
                         .chooseExpandableActivity()
-                        .createIntentHandler()
+                        .startActivity();
+                break;
+            case R.id.button_fastscroll:
+                OmegaIntentBuilder.from(this)
+                        .activity(FastScrollActivity.class)
                         .startActivity();
                 break;
         }
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java
new file mode 100644
index 0000000..c866eab
--- /dev/null
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java
@@ -0,0 +1,37 @@
+package com.omega_r.omegarecyclerview.fastscroll_example;
+
+import android.os.Bundle;
+import android.util.Log;
+
+import com.omega_r.libs.omegarecyclerview.fast_scroll.FastScrollStateChangeListener;
+import com.omega_r.libs.omegarecyclerview.fast_scroll.OmegaFastScrollRecyclerView;
+import com.omega_r.libs.omegarecyclerview.fast_scroll.OmegaFastScrollerLayout;
+import com.omega_r.omegarecyclerview.R;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public class FastScrollActivity extends AppCompatActivity implements FastScrollStateChangeListener {
+
+    private static final String TAG = FastScrollActivity.class.getSimpleName();
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_fastscroll);
+        OmegaFastScrollRecyclerView recyclerView = findViewById(R.id.recyclerview);
+        recyclerView.setAdapter(new FastScrollAdapter());
+        recyclerView.setFastScrollStateChangeListener(this);
+    }
+
+    @Override
+    public void onFastScrollStart(OmegaFastScrollerLayout fastScrollerLayout) {
+        Log.d(TAG, "onFastScrollStart");
+    }
+
+    @Override
+    public void onFastScrollStop(OmegaFastScrollerLayout fastScrollerLayout) {
+        Log.d(TAG, "onFastScrollStop");
+    }
+
+}
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java
new file mode 100644
index 0000000..36302e4
--- /dev/null
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java
@@ -0,0 +1,46 @@
+package com.omega_r.omegarecyclerview.fastscroll_example;
+
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
+import com.omega_r.libs.omegarecyclerview.fast_scroll.SectionIndexer;
+import com.omega_r.omegarecyclerview.R;
+
+import androidx.annotation.NonNull;
+
+public class FastScrollAdapter extends OmegaRecyclerView.Adapter<FastScrollAdapter.ViewHolder> implements SectionIndexer {
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new ViewHolder(parent);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+        holder.textView.setText(String.valueOf(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return 50;
+    }
+
+    @Override
+    public String getSectionText(int position) {
+        return String.valueOf(position);
+    }
+
+    class ViewHolder extends OmegaRecyclerView.ViewHolder {
+
+        final TextView textView;
+
+        ViewHolder(ViewGroup parent) {
+            super(parent, R.layout.item_text);
+            textView = findViewById(R.id.text_item);
+        }
+
+    }
+
+}
diff --git a/app/src/main/res/layout/activity_fastscroll.xml b/app/src/main/res/layout/activity_fastscroll.xml
new file mode 100644
index 0000000..97df74c
--- /dev/null
+++ b/app/src/main/res/layout/activity_fastscroll.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.omega_r.libs.omegarecyclerview.fast_scroll.OmegaFastScrollRecyclerView
+        android:id="@+id/recyclerview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index edc4af2..1dbf850 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,54 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="16dp"
-    tools:context="com.omega_r.omegarecyclerview.MainActivity">
+    android:layout_height="match_parent">
 
-    <Button
-        android:id="@+id/button_swipe_menu"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/swipe_menu_example"/>
+        android:orientation="vertical"
+        android:padding="16dp"
+        tools:context="com.omega_r.omegarecyclerview.MainActivity">
 
-    <Button
-        android:id="@+id/button_sticky_header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/sticky_header_example"/>
+        <Button
+            android:id="@+id/button_swipe_menu"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/swipe_menu_example" />
 
-    <Button
-        android:id="@+id/button_pagination"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/pagination_example"/>
+        <Button
+            android:id="@+id/button_sticky_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/sticky_header_example" />
 
-    <Button
-        android:id="@+id/button_sections"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/sections_example"/>
+        <Button
+            android:id="@+id/button_pagination"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/pagination_example" />
 
-    <Button
-        android:id="@+id/button_viewpager"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/viewpager_example"/>
+        <Button
+            android:id="@+id/button_sections"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/sections_example" />
 
-    <Button
-        android:id="@+id/button_list_adapter"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/list_adapter_example"/>
+        <Button
+            android:id="@+id/button_viewpager"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/viewpager_example" />
 
+        <Button
+            android:id="@+id/button_list_adapter"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/list_adapter_example" />
 
-    <Button
-        android:id="@+id/button_expandable_recyclerview"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/expandable_recyclerview_example"/>
+        <Button
+            android:id="@+id/button_expandable_recyclerview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/expandable_recyclerview_example" />
+
+        <Button
+            android:id="@+id/button_fastscroll"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/fastscroll_example" />
+
+    </LinearLayout>
 
-</LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/item_text.xml b/app/src/main/res/layout/item_text.xml
new file mode 100644
index 0000000..78d3961
--- /dev/null
+++ b/app/src/main/res/layout/item_text.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/text_item"
+    android:layout_width="match_parent"
+    android:layout_height="72dp"
+    android:gravity="center_vertical"
+    android:padding="16dp"
+    android:background="#dff"
+    android:textAppearance="?android:attr/textAppearanceMedium"
+    tools:text="Sample text"/>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b27afa4..540a01d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,4 +32,5 @@
     <string name="button_core">Core</string>
     <string name="button_support_sticky">Sticky header support</string>
     <string name="button_group_sticky">Group as sticky header</string>
+    <string name="fastscroll_example">FastScroll Example</string>
 </resources>
diff --git a/omegarecyclerviewlibs/build.gradle b/omegarecyclerviewlibs/build.gradle
index 6ec272e..48e40b1 100644
--- a/omegarecyclerviewlibs/build.gradle
+++ b/omegarecyclerviewlibs/build.gradle
@@ -26,6 +26,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
-    implementation 'com.google.android.material:material:1.1.0-alpha02'
+    implementation 'com.google.android.material:material:1.1.0-alpha03'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
 }
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/AnimatorListener.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/AnimatorListener.java
new file mode 100644
index 0000000..2973d78
--- /dev/null
+++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/AnimatorListener.java
@@ -0,0 +1,36 @@
+package com.omega_r.libs.omegarecyclerview.fast_scroll;
+
+import android.animation.Animator;
+
+class AnimatorListener implements Animator.AnimatorListener {
+
+    @Override
+    public void onAnimationStart(Animator animation, boolean isReverse) {
+        // nothing
+    }
+
+    @Override
+    public void onAnimationEnd(Animator animation, boolean isReverse) {
+        // nothing
+    }
+
+    @Override
+    public void onAnimationStart(Animator animation) {
+        // nothing
+    }
+
+    @Override
+    public void onAnimationEnd(Animator animation) {
+        // nothing
+    }
+
+    @Override
+    public void onAnimationCancel(Animator animation) {
+        // nothing
+    }
+
+    @Override
+    public void onAnimationRepeat(Animator animation) {
+        // nothing
+    }
+}
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/FastScrollStateChangeListener.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/FastScrollStateChangeListener.java
new file mode 100644
index 0000000..b80dd87
--- /dev/null
+++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/FastScrollStateChangeListener.java
@@ -0,0 +1,15 @@
+package com.omega_r.libs.omegarecyclerview.fast_scroll;
+
+public interface FastScrollStateChangeListener {
+
+    /**
+     * Called when fast scrolling begins
+     */
+    void onFastScrollStart(OmegaFastScrollerLayout fastScrollerLayout);
+
+    /**
+     * Called when fast scrolling ends
+     */
+    void onFastScrollStop(OmegaFastScrollerLayout fastScrollerLayout);
+
+}
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollRecyclerView.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollRecyclerView.java
new file mode 100644
index 0000000..b753e25
--- /dev/null
+++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollRecyclerView.java
@@ -0,0 +1,165 @@
+package com.omega_r.libs.omegarecyclerview.fast_scroll;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+
+import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+
+public class OmegaFastScrollRecyclerView extends OmegaRecyclerView {
+
+    private OmegaFastScrollerLayout mFastScrollerLayout;
+
+    public OmegaFastScrollRecyclerView(@NonNull Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public OmegaFastScrollRecyclerView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public OmegaFastScrollRecyclerView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(context, attrs);
+    }
+
+    private void init(@NonNull Context context, @Nullable AttributeSet attrs) {
+        mFastScrollerLayout = new OmegaFastScrollerLayout(context, attrs);
+    }
+
+    @Override
+    public final void setAdapter(RecyclerView.Adapter adapter) {
+        super.setAdapter(adapter);
+        if (adapter instanceof SectionIndexer) {
+            setSectionIndexer((SectionIndexer) adapter);
+        } else if (adapter == null) {
+            setSectionIndexer(null);
+        }
+    }
+
+    @Override
+    public final void setVisibility(int visibility) {
+        super.setVisibility(visibility);
+        mFastScrollerLayout.setVisibility(visibility);
+    }
+
+    /**
+     * Set the [SectionIndexer] for the [FastScroller].
+     *
+     * @param indexer The SectionIndexer that provides section text for the FastScroller
+     */
+    public final void setSectionIndexer(SectionIndexer indexer) {
+        mFastScrollerLayout.setSectionIndexer(indexer);
+    }
+
+    /**
+     * Set the enabled state of fast scrolling.
+     *
+     * @param enabled True to enable fast scrolling, false otherwise
+     */
+    public final void setFastScrollEnabled(boolean enabled) {
+        mFastScrollerLayout.setEnabled(enabled);
+    }
+
+    /**
+     * Hide the scrollbar when not scrolling.
+     *
+     * @param hide True to hide the scrollbar, false to show
+     */
+    public final void setHideScrollbar(boolean hide) {
+        mFastScrollerLayout.setHideScrollbar(hide);
+    }
+
+
+    /**
+     * Display a scroll track while scrolling.
+     *
+     * @param visible True to show scroll track, false to hide
+     */
+    public final void setTrackVisible(boolean visible) {
+        mFastScrollerLayout.setTrackVisible(visible);
+    }
+
+    /**
+     * Set the color of the scroll track.
+     *
+     * @param color The color for the scroll track
+     */
+    public final void setTrackColor(@ColorInt int color) {
+        mFastScrollerLayout.setTrackColor(color);
+    }
+
+    /**
+     * Set the color for the scroll handle.
+     *
+     * @param color The color for the scroll handle
+     */
+    public final void setHandleColor(@ColorInt int color) {
+        mFastScrollerLayout.setHandleColor(color);
+    }
+
+    /**
+     * Show the section bubble while scrolling.
+     *
+     * @param visible True to show the bubble, false to hide
+     */
+    public final void setBubbleVisible(boolean visible) {
+        mFastScrollerLayout.setBubbleVisible(visible);
+    }
+
+    /**
+     * Set the background color of the index bubble.
+     *
+     * @param color The background color for the index bubble
+     */
+    public final void setBubbleColor(@ColorInt int color) {
+        mFastScrollerLayout.setBubbleColor(color);
+    }
+
+    /**
+     * Set the text color of the index bubble.
+     *
+     * @param color The text color for the index bubble
+     */
+    public final void setBubbleTextColor(@ColorInt int color) {
+        mFastScrollerLayout.setBubbleTextColor(color);
+    }
+
+    /**
+     * Set the fast scroll state change listener.
+     *
+     * @param listener The interface that will listen to fastscroll state change events
+     */
+    public final void setFastScrollStateChangeListener(FastScrollStateChangeListener listener) {
+        mFastScrollerLayout.setFastScrollStateChangeListener(listener);
+    }
+
+    @Override
+    protected final void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        mFastScrollerLayout.attachRecyclerView(this);
+
+        ViewParent parent = getParent();
+
+        if (parent instanceof ViewGroup) {
+            ((ViewGroup) parent).addView(mFastScrollerLayout);
+            mFastScrollerLayout.setLayoutParams((ViewGroup) parent);
+        }
+    }
+
+    @Override
+    protected final void onDetachedFromWindow() {
+        mFastScrollerLayout.detachRecyclerView();
+        super.onDetachedFromWindow();
+    }
+
+}
\ No newline at end of file
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollerLayout.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollerLayout.java
new file mode 100644
index 0000000..dc0061b
--- /dev/null
+++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollerLayout.java
@@ -0,0 +1,522 @@
+package com.omega_r.libs.omegarecyclerview.fast_scroll;
+
+import android.animation.Animator;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import androidx.annotation.ColorInt;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.view.GravityCompat;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewPropertyAnimator;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.omega_r.libs.omegarecyclerview.R;
+
+public class OmegaFastScrollerLayout extends LinearLayout {
+
+    private static final AnimatorListener sDefaultAnimatorListener = new AnimatorListener();
+    private static final long BUBBLE_ANIM_DURATION_IN_MILLIS = 100;
+    private static final long SCROLLBAR_ANIM_DURATION_IN_MILLIS = 300;
+    private static final long SCROLLBAR_HIDE_DELAY_IN_MILLIS = 1000;
+    private static final long TRACK_SNAP_RANGE = 5;
+
+    private RecyclerView mRecyclerView;
+    private TextView mBubbleTextView;
+    private ImageView mHandleImageView;
+    private ImageView mTrackImageView;
+    private View mScrollbarContainer;
+    private Drawable mBubbleImageUpDrawable;
+    private Drawable mBubbleImageDownDrawable;
+    private Drawable mHandleImageDrawable;
+    private Drawable mTrackImageDrawable;
+
+    @ColorInt
+    private int mBubbleColor;
+    @ColorInt
+    private int mHandleColor;
+    private int mBubbleHeight;
+    private int mHandleHeight;
+    private int mViewHeight;
+    private boolean mHideScrollbar;
+    private boolean mShowBubble;
+    private SectionIndexer mSectionIndexer;
+    private ViewPropertyAnimator mScrollbarAnimator;
+    private ViewPropertyAnimator mBubbleAnimator;
+    private FastScrollStateChangeListener mFastScrollStateChangeListener;
+    private final Runnable mScrollbarHider = new Runnable() {
+        @Override
+        public void run() {
+            hideScrollbar();
+        }
+    };
+    private RecyclerView.OnScrollListener mScrollListener = new RecyclerView.OnScrollListener() {
+
+        @Override
+        public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+            if (!mHandleImageView.isSelected() && isEnabled()) {
+                setViewPositions(getScrollProportion(recyclerView));
+            }
+        }
+
+        @Override
+        public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+            super.onScrollStateChanged(recyclerView, newState);
+            if (!isEnabled()) return;
+            switch (newState) {
+                case RecyclerView.SCROLL_STATE_DRAGGING:
+                    getHandler().removeCallbacks(mScrollbarHider);
+                    cancelAnimation(mScrollbarAnimator);
+                    if (!isViewVisible(mScrollbarContainer)) showScrollbar();
+                    break;
+                case RecyclerView.SCROLL_STATE_IDLE:
+                    if (mHideScrollbar && !mHandleImageView.isSelected()) {
+                        getHandler().postDelayed(mScrollbarHider, SCROLLBAR_HIDE_DELAY_IN_MILLIS);
+                    }
+                    break;
+            }
+        }
+    };
+    private int mScrollbarPaddingEnd;
+    private Animator.AnimatorListener mHideScrollbarListener = new AnimatorListener() {
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            onAnimationCancel(animation);
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+            mScrollbarContainer.setVisibility(View.GONE);
+            mScrollbarAnimator = null;
+        }
+    };
+    private Animator.AnimatorListener mHideBubbleListener = new AnimatorListener() {
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            onAnimationCancel(animation);
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+            mBubbleTextView.setVisibility(View.GONE);
+            mBubbleAnimator = null;
+        }
+    };
+
+    public OmegaFastScrollerLayout(Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public OmegaFastScrollerLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public OmegaFastScrollerLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    public OmegaFastScrollerLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(context, attrs);
+    }
+
+    private void init(Context context, @Nullable AttributeSet attrs) {
+        inflate(context, R.layout.view_fastscroller, this);
+        setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT));
+        setClipChildren(false);
+        setOrientation(HORIZONTAL);
+
+        mScrollbarPaddingEnd = getResources().getDimensionPixelSize(R.dimen.fastscroll_scrollbar_padding_end);
+        mBubbleTextView = findViewById(R.id.textview_bubble);
+        mHandleImageView = findViewById(R.id.imageview_handle);
+        mTrackImageView = findViewById(R.id.imageview_track);
+        mScrollbarContainer = findViewById(R.id.scrollbar_container);
+
+        @ColorInt int bubbleColor = Color.GRAY;
+        @ColorInt int handleColor = Color.DKGRAY;
+        @ColorInt int trackColor = Color.LTGRAY;
+        @ColorInt int textColor = Color.WHITE;
+
+        boolean hideScrollbar = true;
+        boolean showBubble = true;
+        boolean showTrack = false;
+
+        if (attrs != null) {
+            TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.OmegaFastScrollerLayout, 0, 0);
+
+            bubbleColor = typedArray.getColor(R.styleable.OmegaFastScrollerLayout_bubbleColor, bubbleColor);
+            handleColor = typedArray.getColor(R.styleable.OmegaFastScrollerLayout_handleColor, handleColor);
+            trackColor = typedArray.getColor(R.styleable.OmegaFastScrollerLayout_trackColor, trackColor);
+            textColor = typedArray.getColor(R.styleable.OmegaFastScrollerLayout_bubbleTextColor, textColor);
+            hideScrollbar = typedArray.getBoolean(R.styleable.OmegaFastScrollerLayout_hideScrollbar, hideScrollbar);
+            showBubble = typedArray.getBoolean(R.styleable.OmegaFastScrollerLayout_showBubble, showBubble);
+            showTrack = typedArray.getBoolean(R.styleable.OmegaFastScrollerLayout_showTrack, showTrack);
+            typedArray.recycle();
+        }
+        mTrackImageDrawable = ContextCompat.getDrawable(context, R.drawable.ic_track);
+        mHandleImageDrawable = ContextCompat.getDrawable(context, R.drawable.ic_handle);
+        mBubbleImageUpDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_up);
+        mBubbleImageDownDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_down);
+
+        setTrackColor(trackColor);
+        setHandleColor(handleColor);
+        setBubbleColor(bubbleColor);
+        setBubbleTextColor(textColor);
+        setHideScrollbar(hideScrollbar);
+        setBubbleVisible(showBubble);
+        setTrackVisible(showTrack);
+    }
+
+    @Override
+    public void setLayoutParams(ViewGroup.LayoutParams params) {
+        params.width = LayoutParams.WRAP_CONTENT;
+        super.setLayoutParams(params);
+    }
+
+    final void setLayoutParams(ViewGroup viewGroup) {
+        @IdRes int recyclerViewId = mRecyclerView == null ? View.NO_ID : mRecyclerView.getId();
+
+        if (recyclerViewId == View.NO_ID) {
+            throw new IllegalArgumentException("RecyclerView must have a view ID");
+        }
+
+        int marginTop = getResources().getDimensionPixelSize(R.dimen.fastscroll_scrollbar_margin_top);
+        int marginBottom = getResources().getDimensionPixelSize(R.dimen.fastscroll_scrollbar_margin_bottom);
+
+        if (viewGroup instanceof ConstraintLayout) {
+            ConstraintSet constraintSet = new ConstraintSet();
+            int id = getId();
+            constraintSet.clone((ConstraintLayout) viewGroup);
+            constraintSet.connect(id, ConstraintSet.TOP, recyclerViewId, ConstraintSet.TOP);
+            constraintSet.connect(id, ConstraintSet.BOTTOM, recyclerViewId, ConstraintSet.BOTTOM);
+            constraintSet.connect(id, ConstraintSet.END, recyclerViewId, ConstraintSet.END);
+            constraintSet.applyTo((ConstraintLayout) viewGroup);
+            ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) getLayoutParams();
+            layoutParams.setMargins(0, marginTop, 0, marginBottom);
+            setLayoutParams(layoutParams);
+        } else if (viewGroup instanceof CoordinatorLayout) {
+            CoordinatorLayout.LayoutParams layoutParams = (CoordinatorLayout.LayoutParams) getLayoutParams();
+            layoutParams.setAnchorId(recyclerViewId);
+            layoutParams.anchorGravity = GravityCompat.END;
+            layoutParams.setMargins(0, marginTop, 0, marginBottom);
+            setLayoutParams(layoutParams);
+        } else if (viewGroup instanceof FrameLayout) {
+            FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) getLayoutParams();
+            layoutParams.gravity = GravityCompat.END;
+            layoutParams.setMargins(0, marginTop, 0, marginBottom);
+            setLayoutParams(layoutParams);
+        } else if (viewGroup instanceof RelativeLayout) {
+            RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
+            int endRule = Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 ?
+                    RelativeLayout.ALIGN_END : RelativeLayout.ALIGN_RIGHT;
+
+            layoutParams.addRule(RelativeLayout.ALIGN_TOP, recyclerViewId);
+            layoutParams.addRule(RelativeLayout.ALIGN_BOTTOM, recyclerViewId);
+            layoutParams.addRule(endRule, recyclerViewId);
+            layoutParams.setMargins(0, marginTop, 0, marginBottom);
+            setLayoutParams(layoutParams);
+        } else {
+            throw new IllegalArgumentException("Parent ViewGroup must be a ConstraintLayout, " +
+                    "CoordinatorLayout, FrameLayout, or RelativeLayout");
+        }
+        updateViewHeights();
+    }
+
+    private void updateViewHeights() {
+        int measureSpec = MeasureSpec.makeMeasureSpec(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
+        mBubbleTextView.measure(measureSpec, measureSpec);
+        mBubbleHeight = mBubbleTextView.getMeasuredHeight();
+        mHandleImageView.measure(measureSpec, measureSpec);
+        mHandleHeight = mHandleImageView.getMeasuredHeight();
+    }
+
+    public final void setSectionIndexer(@Nullable SectionIndexer sectionIndexer) {
+        mSectionIndexer = sectionIndexer;
+    }
+
+    public final void attachRecyclerView(RecyclerView recyclerView) {
+        detachRecyclerView();
+        this.mRecyclerView = recyclerView;
+        if (this.mRecyclerView != null) {
+            this.mRecyclerView.addOnScrollListener(mScrollListener);
+            post(new Runnable() {
+                @Override
+                public void run() {
+                    // set initial positions for bubble and handle
+                    setViewPositions(getScrollProportion(OmegaFastScrollerLayout.this.mRecyclerView));
+                }
+            });
+        }
+    }
+
+    public final void detachRecyclerView() {
+        if (mRecyclerView != null) {
+            mRecyclerView.removeOnScrollListener(mScrollListener);
+            mRecyclerView = null;
+        }
+    }
+
+    public final void setHideScrollbar(boolean hideScrollbar) {
+        this.mHideScrollbar = hideScrollbar;
+        mScrollbarContainer.setVisibility(hideScrollbar ? View.GONE : View.VISIBLE);
+    }
+
+    public final void setBubbleVisible(boolean visible) {
+        mShowBubble = visible;
+    }
+
+    public final void setTrackVisible(boolean visible) {
+        mTrackImageView.setVisibility(visible ? View.VISIBLE : View.GONE);
+    }
+
+    public final void setTrackColor(@ColorInt int color) {
+        DrawableCompat.setTint(mTrackImageDrawable, color);
+        mTrackImageView.setImageDrawable(mTrackImageDrawable);
+    }
+
+    public final void setHandleColor(@ColorInt int color) {
+        mHandleColor = color;
+        DrawableCompat.setTint(mHandleImageDrawable, mHandleColor);
+        mHandleImageView.setImageDrawable(mHandleImageDrawable);
+    }
+
+    public final void setBubbleColor(@ColorInt int color) {
+        mBubbleColor = color;
+
+        DrawableCompat.setTint(mBubbleImageUpDrawable, mBubbleColor);
+        DrawableCompat.setTint(mBubbleImageDownDrawable, mBubbleColor);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            mBubbleTextView.setBackground(mBubbleImageUpDrawable);
+        } else {
+            mBubbleTextView.setBackgroundDrawable(mBubbleImageUpDrawable);
+        }
+    }
+
+    public final void setBubbleTextColor(@ColorInt int color) {
+        mBubbleTextView.setTextColor(color);
+    }
+
+    public final void setFastScrollStateChangeListener(@Nullable FastScrollStateChangeListener listener) {
+        mFastScrollStateChangeListener = listener;
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        setVisibility(enabled ? VISIBLE : GONE);
+    }
+
+    @Override
+    @SuppressLint("ClickableViewAccessibility")
+    public boolean onTouchEvent(MotionEvent event) {
+        float y = event.getY();
+
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                if (event.getX() < mHandleImageView.getX() - ViewCompat.getPaddingStart(mHandleImageView)) {
+                    return false;
+                }
+
+                requestDisallowInterceptTouchEvent(true);
+                setHandleSelected(true);
+                getHandler().removeCallbacks(mScrollbarHider);
+
+                cancelAnimation(mScrollbarAnimator);
+                cancelAnimation(mBubbleAnimator);
+
+                if (!isViewVisible(mScrollbarContainer)) {
+                    showScrollbar();
+                }
+                if (mShowBubble && mSectionIndexer != null) {
+                    showBubble();
+                }
+                if (mFastScrollStateChangeListener != null) {
+                    mFastScrollStateChangeListener.onFastScrollStart(this);
+                }
+                setViewPositions(y);
+                setRecyclerViewPosition(y);
+                return true;
+            case MotionEvent.ACTION_MOVE:
+                setViewPositions(y);
+                setRecyclerViewPosition(y);
+                return true;
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+                requestDisallowInterceptTouchEvent(false);
+                setHandleSelected(false);
+                if (mHideScrollbar) {
+                    getHandler().postDelayed(mScrollbarHider, SCROLLBAR_HIDE_DELAY_IN_MILLIS);
+                }
+                hideBubble();
+                if (mFastScrollStateChangeListener != null) {
+                    mFastScrollStateChangeListener.onFastScrollStop(this);
+                }
+
+                return true;
+        }
+
+        return super.onTouchEvent(event);
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        mViewHeight = h;
+    }
+
+    private void setRecyclerViewPosition(float positionY) {
+        if (mRecyclerView == null) return;
+        RecyclerView.LayoutManager layoutManager = mRecyclerView.getLayoutManager();
+        if (layoutManager == null) return;
+        RecyclerView.Adapter adapter = mRecyclerView.getAdapter();
+        if (adapter == null) return;
+
+        int itemCount = adapter.getItemCount();
+        float proportion;
+        if (mHandleImageView.getY() == 0f) {
+            proportion = 0f;
+        } else if (mHandleImageView.getY() + mHandleHeight >= mViewHeight - TRACK_SNAP_RANGE) {
+            proportion = 1f;
+        } else {
+            proportion = positionY / mViewHeight;
+        }
+        int scrolledItemCount = Math.round(proportion * itemCount);
+
+        if (isLayoutReversed(layoutManager)) {
+            scrolledItemCount = itemCount - scrolledItemCount;
+        }
+        int targetPos = getValueInRange(itemCount - 1, scrolledItemCount);
+        layoutManager.scrollToPosition(targetPos);
+
+        if (mShowBubble && mSectionIndexer != null) {
+            mBubbleTextView.setText(mSectionIndexer.getSectionText(targetPos));
+        }
+    }
+
+    private float getScrollProportion(@Nullable RecyclerView recyclerView) {
+        if (recyclerView == null) return 0f;
+
+        int verticalScrollOffset = recyclerView.computeVerticalScrollOffset();
+        int verticalScrollRange = recyclerView.computeVerticalScrollRange();
+        float rangeDiff = verticalScrollRange - mViewHeight;
+        float proportion = verticalScrollOffset / (rangeDiff > 0 ? rangeDiff : 1f);
+
+        return mViewHeight * proportion;
+    }
+
+    private void setViewPositions(float y) {
+        mBubbleHeight = mBubbleTextView.getHeight();
+        mHandleHeight = mHandleImageView.getHeight();
+
+        int bubbleY = getValueInRange(mViewHeight - mBubbleHeight, (int) y);
+        if (y > mViewHeight / 2) {
+            bubbleY = getValueInRange(mViewHeight - mBubbleHeight - mHandleHeight / 2, (int) (y - mBubbleHeight));
+            Drawable background = mBubbleTextView.getBackground();
+            if (background != null && background != mBubbleImageDownDrawable) {
+                ViewCompat.setBackground(mBubbleTextView, mBubbleImageDownDrawable);
+            }
+        } else {
+            Drawable background = mBubbleTextView.getBackground();
+            if (background != null && background != mBubbleImageUpDrawable) {
+                ViewCompat.setBackground(mBubbleTextView, mBubbleImageUpDrawable);
+            }
+        }
+        int handleY = getValueInRange(mViewHeight - mHandleHeight, (int) (y - mHandleHeight / 2));
+        if (mShowBubble) mBubbleTextView.setY(bubbleY);
+        mHandleImageView.setY(handleY);
+    }
+
+    private int getValueInRange(int max, int value) {
+        return Math.min(Math.max(0, value), max);
+    }
+
+    private boolean isLayoutReversed(RecyclerView.LayoutManager layoutManager) {
+        if (layoutManager instanceof LinearLayoutManager) {
+            return ((LinearLayoutManager) layoutManager).getReverseLayout();
+        } else if (layoutManager instanceof StaggeredGridLayoutManager) {
+            return ((StaggeredGridLayoutManager) layoutManager).getReverseLayout();
+        }
+        return false;
+    }
+
+    private boolean isViewVisible(@Nullable View view) {
+        return view != null && view.getVisibility() == View.VISIBLE;
+    }
+
+    private void cancelAnimation(@Nullable ViewPropertyAnimator animator) {
+        if (animator != null) animator.cancel();
+    }
+
+    private void showBubble() {
+        if (!isViewVisible(mBubbleTextView)) {
+            mBubbleTextView.setVisibility(View.VISIBLE);
+            mBubbleAnimator = mBubbleTextView.animate()
+                    .alpha(1f)
+                    .setDuration(BUBBLE_ANIM_DURATION_IN_MILLIS)
+                    .setListener(sDefaultAnimatorListener);
+        }
+    }
+
+    private void hideBubble() {
+        if (isViewVisible(mBubbleTextView)) {
+            mBubbleAnimator = mBubbleTextView.animate()
+                    .alpha(0f)
+                    .setDuration(BUBBLE_ANIM_DURATION_IN_MILLIS)
+                    .setListener(mHideBubbleListener);
+        }
+    }
+
+    private void showScrollbar() {
+        if (mRecyclerView != null && mRecyclerView.computeVerticalScrollRange() - mViewHeight > 0) {
+            mScrollbarContainer.setTranslationX(mScrollbarPaddingEnd);
+            mScrollbarContainer.setVisibility(View.VISIBLE);
+            mScrollbarAnimator = mScrollbarContainer.animate()
+                    .alpha(1f)
+                    .translationX(0f)
+                    .setDuration(SCROLLBAR_ANIM_DURATION_IN_MILLIS)
+                    .setListener(sDefaultAnimatorListener);
+        }
+    }
+
+    private void hideScrollbar() {
+        mScrollbarAnimator = mScrollbarContainer.animate()
+                .alpha(0f)
+                .translationX(mScrollbarPaddingEnd)
+                .setDuration(SCROLLBAR_ANIM_DURATION_IN_MILLIS)
+                .setListener(mHideScrollbarListener);
+    }
+
+    private void setHandleSelected(boolean selected) {
+        mHandleImageView.setSelected(selected);
+        DrawableCompat.setTint(mHandleImageDrawable, selected ? mBubbleColor : mHandleColor);
+    }
+
+}
\ No newline at end of file
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/SectionIndexer.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/SectionIndexer.java
new file mode 100644
index 0000000..2420adb
--- /dev/null
+++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/SectionIndexer.java
@@ -0,0 +1,7 @@
+package com.omega_r.libs.omegarecyclerview.fast_scroll;
+
+public interface SectionIndexer {
+
+    String getSectionText(int position);
+
+}
\ No newline at end of file
diff --git a/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_down.xml b/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_down.xml
new file mode 100644
index 0000000..4448ec4
--- /dev/null
+++ b/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_down.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 L4 Digital LLC. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle">
+
+    <tools:solid android:color="#777777" />
+
+    <corners
+        android:topLeftRadius="@dimen/fastscroll_bubble_radius"
+        android:topRightRadius="@dimen/fastscroll_bubble_radius"
+        android:bottomLeftRadius="@dimen/fastscroll_bubble_radius"
+        android:bottomRightRadius="0dp" />
+
+    <size
+        android:height="@dimen/fastscroll_bubble_size"
+        android:width="@dimen/fastscroll_bubble_size" />
+
+    <padding
+        android:left="@dimen/fastscroll_bubble_padding"
+        android:right="@dimen/fastscroll_bubble_padding" />
+
+</shape>
diff --git a/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_up.xml b/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_up.xml
new file mode 100644
index 0000000..44099c0
--- /dev/null
+++ b/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_up.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 L4 Digital LLC. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle">
+
+    <tools:solid android:color="#777777" />
+
+    <corners
+        android:topLeftRadius="@dimen/fastscroll_bubble_radius"
+        android:topRightRadius="0dp"
+        android:bottomLeftRadius="@dimen/fastscroll_bubble_radius"
+        android:bottomRightRadius="@dimen/fastscroll_bubble_radius" />
+
+    <size
+        android:height="@dimen/fastscroll_bubble_size"
+        android:width="@dimen/fastscroll_bubble_size" />
+
+    <padding
+        android:left="@dimen/fastscroll_bubble_padding"
+        android:right="@dimen/fastscroll_bubble_padding" />
+
+</shape>
diff --git a/omegarecyclerviewlibs/src/main/res/drawable/ic_handle.xml b/omegarecyclerviewlibs/src/main/res/drawable/ic_handle.xml
new file mode 100644
index 0000000..7a5f7e8
--- /dev/null
+++ b/omegarecyclerviewlibs/src/main/res/drawable/ic_handle.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 L4 Digital LLC. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle">
+
+    <tools:solid android:color="#555555" />
+
+    <corners android:radius="@dimen/fastscroll_handle_radius" />
+
+    <size
+        android:height="@dimen/fastscroll_handle_height"
+        android:width="@dimen/fastscroll_handle_width" />
+
+</shape>
diff --git a/omegarecyclerviewlibs/src/main/res/drawable/ic_track.xml b/omegarecyclerviewlibs/src/main/res/drawable/ic_track.xml
new file mode 100644
index 0000000..fb9b16c
--- /dev/null
+++ b/omegarecyclerviewlibs/src/main/res/drawable/ic_track.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 L4 Digital LLC. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle">
+
+    <tools:solid android:color="#CCCCCC" />
+
+    <size android:width="@dimen/fastscroll_track_width" />
+
+</shape>
diff --git a/omegarecyclerviewlibs/src/main/res/layout/view_fastscroller.xml b/omegarecyclerviewlibs/src/main/res/layout/view_fastscroller.xml
new file mode 100644
index 0000000..4d75911
--- /dev/null
+++ b/omegarecyclerviewlibs/src/main/res/layout/view_fastscroller.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <TextView
+        android:id="@+id/textview_bubble"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:gravity="center"
+        android:maxLines="1"
+        android:textSize="36sp"
+        android:visibility="gone"
+        tools:background="@drawable/ic_bubble_up"
+        tools:text="A"
+        tools:textColor="#ffffff"
+        tools:visibility="visible" />
+
+    <FrameLayout
+        android:id="@+id/scrollbar_container"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingEnd="@dimen/fastscroll_scrollbar_padding_end"
+        android:paddingLeft="@dimen/fastscroll_scrollbar_padding_start"
+        android:paddingRight="@dimen/fastscroll_scrollbar_padding_end"
+        android:paddingStart="@dimen/fastscroll_scrollbar_padding_start"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <ImageView
+            android:id="@+id/imageview_track"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_horizontal"
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/ic_track" />
+
+        <ImageView
+            android:id="@+id/imageview_handle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/ic_handle" />
+
+    </FrameLayout>
+
+</merge>
diff --git a/omegarecyclerviewlibs/src/main/res/values/attrs.xml b/omegarecyclerviewlibs/src/main/res/values/attrs.xml
index 1746493..8278c11 100644
--- a/omegarecyclerviewlibs/src/main/res/values/attrs.xml
+++ b/omegarecyclerviewlibs/src/main/res/values/attrs.xml
@@ -73,4 +73,14 @@
         <attr name="backgrounds" format="reference" />
     </declare-styleable>
 
+    <declare-styleable name="OmegaFastScrollerLayout">
+        <attr name="hideScrollbar" format="boolean" />
+        <attr name="showBubble" format="boolean" />
+        <attr name="showTrack" format="boolean" />
+        <attr name="trackColor" format="color" />
+        <attr name="handleColor" format="color" />
+        <attr name="bubbleColor" format="color" />
+        <attr name="bubbleTextColor" format="color" />
+    </declare-styleable>
+
 </resources>
diff --git a/omegarecyclerviewlibs/src/main/res/values/dimens.xml b/omegarecyclerviewlibs/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..ff2da8c
--- /dev/null
+++ b/omegarecyclerviewlibs/src/main/res/values/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <dimen name="fastscroll_bubble_radius">44dp</dimen>
+    <dimen name="fastscroll_bubble_size">88dp</dimen>
+    <dimen name="fastscroll_bubble_textsize">48sp</dimen>
+    <dimen name="fastscroll_bubble_padding">16dp</dimen>
+
+    <dimen name="fastscroll_handle_height">40dp</dimen>
+    <dimen name="fastscroll_handle_width">4dp</dimen>
+    <dimen name="fastscroll_handle_radius">2dp</dimen>
+
+    <dimen name="fastscroll_track_width">1dp</dimen>
+
+    <dimen name="fastscroll_scrollbar_margin_top">8dp</dimen>
+    <dimen name="fastscroll_scrollbar_margin_bottom">8dp</dimen>
+    <dimen name="fastscroll_scrollbar_padding_start">8dp</dimen>
+    <dimen name="fastscroll_scrollbar_padding_end">8dp</dimen>
+
+</resources>
\ No newline at end of file

From 99b8f28a782560c30f57431ffca12ad78931a883 Mon Sep 17 00:00:00 2001
From: R12rus <roman.tc@omega-r.com>
Date: Thu, 31 Jan 2019 17:18:32 +0300
Subject: [PATCH 02/32] resources have been updated

---
 .../fast_scroll/OmegaFastScrollRecyclerView.java |  1 -
 .../src/main/res/drawable/ic_bubble_down.xml     | 16 ----------------
 .../src/main/res/drawable/ic_bubble_up.xml       | 16 ----------------
 .../src/main/res/drawable/ic_handle.xml          | 16 ----------------
 .../src/main/res/drawable/ic_track.xml           | 16 ----------------
 5 files changed, 65 deletions(-)

diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollRecyclerView.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollRecyclerView.java
index b753e25..a4de5e6 100644
--- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollRecyclerView.java
+++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollRecyclerView.java
@@ -12,7 +12,6 @@
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
-
 public class OmegaFastScrollRecyclerView extends OmegaRecyclerView {
 
     private OmegaFastScrollerLayout mFastScrollerLayout;
diff --git a/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_down.xml b/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_down.xml
index 4448ec4..e3970ff 100644
--- a/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_down.xml
+++ b/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_down.xml
@@ -1,20 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2016 L4 Digital LLC. All rights reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_up.xml b/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_up.xml
index 44099c0..d29183b 100644
--- a/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_up.xml
+++ b/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_up.xml
@@ -1,20 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2016 L4 Digital LLC. All rights reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/omegarecyclerviewlibs/src/main/res/drawable/ic_handle.xml b/omegarecyclerviewlibs/src/main/res/drawable/ic_handle.xml
index 7a5f7e8..3fc198e 100644
--- a/omegarecyclerviewlibs/src/main/res/drawable/ic_handle.xml
+++ b/omegarecyclerviewlibs/src/main/res/drawable/ic_handle.xml
@@ -1,20 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2016 L4 Digital LLC. All rights reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/omegarecyclerviewlibs/src/main/res/drawable/ic_track.xml b/omegarecyclerviewlibs/src/main/res/drawable/ic_track.xml
index fb9b16c..7302d8c 100644
--- a/omegarecyclerviewlibs/src/main/res/drawable/ic_track.xml
+++ b/omegarecyclerviewlibs/src/main/res/drawable/ic_track.xml
@@ -1,20 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2016 L4 Digital LLC. All rights reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"

From 61c5ac5ace3a85123a170f84c4d5eaeda7dab197 Mon Sep 17 00:00:00 2001
From: R12rus <roman.tc@omega-r.com>
Date: Mon, 4 Feb 2019 10:18:15 +0300
Subject: [PATCH 03/32] fast scroll module has been created

---
 .idea/modules.xml                             |  3 ++-
 app/build.gradle                              | 13 ++++-----
 app/src/main/AndroidManifest.xml              |  2 +-
 .../FastScrollActivity.java                   |  6 ++---
 .../fastscroll_example/FastScrollAdapter.java |  5 ++--
 .../main/res/layout/activity_fastscroll.xml   |  2 +-
 build.gradle                                  |  7 ++++-
 gradle/wrapper/gradle-wrapper.properties      |  4 +--
 .../.gitignore                                |  0
 .../build.gradle                              | 17 ++++--------
 .../proguard-rules.pro                        |  0
 .../src/main/AndroidManifest.xml              |  1 +
 .../widget/ExpandedRecyclerView.java          |  0
 .../omegarecyclerview/BaseArrayAdapter.java   |  0
 .../omegarecyclerview/BaseListAdapter.java    |  0
 .../omegarecyclerview/ClickViewHolder.java    |  0
 .../omegarecyclerview/OmegaRecyclerView.java  |  0
 .../ChildClippingFrameLayout.java             |  0
 .../ExpandableStickyHeaderDecoration.java     |  0
 .../OmegaExpandableRecyclerView.java          |  0
 .../animation/AnimationHelper.java            |  0
 .../animation/ExpandableItemAnimator.java     |  0
 .../animation/OnAnimationEndListener.java     |  0
 .../DropDownItemAnimator.java                 |  0
 .../standard_animations/FadeItemAnimator.java |  0
 .../data/ExpandableType.java                  |  0
 .../data/ExpandableViewData.java              |  0
 .../data/FlatGroupingList.java                |  0
 .../data/GroupProvider.java                   |  0
 .../data/PositionData.java                    |  0
 .../expandable_recycler_view/data/Range.java  |  0
 .../data/UniqueIdProvider.java                |  0
 .../ExpandableLayoutManager.java              |  0
 .../header/HeaderFooterWrapperAdapter.java    |  0
 .../header/SectionContentFrameLayout.java     |  0
 .../item_decoration/BaseItemDecoration.java   |  0
 .../DividerItemDecoration.java                |  0
 .../item_decoration/SpaceItemDecoration.java  |  0
 .../DividerDecorationHelper.java              |  0
 .../pagination/OnPageRequestListener.java     |  0
 .../pagination/PageRequester.java             |  0
 .../pagination/PaginationAdapter.java         |  0
 .../pagination/PaginationViewCreator.java     |  0
 .../pagination/WrapperAdapter.java            |  0
 .../BaseStickyHeaderDecoration.java           |  0
 .../sticky_header/StickyHeaderAdapter.java    |  0
 .../sticky_header/StickyHeaderDecoration.java |  0
 .../swipe_menu/SwipeHorizontalMenuLayout.java |  0
 .../swipe_menu/SwipeMenuHelper.java           |  0
 .../swipe_menu/SwipeMenuLayout.java           |  0
 .../swipe_menu/SwipeViewHolder.java           |  1 -
 .../listener/SwipeFractionListener.java       |  0
 .../listener/SwipeSwitchListener.java         |  0
 .../swiper/LeftHorizontalSwiper.java          |  0
 .../swiper/RightHorizontalSwiper.java         |  0
 .../swipe_menu/swiper/Swiper.java             |  0
 .../viewpager/DefaultPagerAdapter.java        |  0
 .../viewpager/Direction.java                  |  0
 .../viewpager/OmegaPagerRecyclerView.java     |  0
 .../viewpager/ViewPagerLayoutManager.java     |  0
 .../AccordionTransformer.java                 |  0
 .../BackgroundToForegroundTransformer.java    |  0
 .../CubeInTransformer.java                    |  0
 .../CubeOutTransformer.java                   |  0
 .../DepthPageTransformer.java                 |  0
 .../default_transformers/FadeTransformer.java |  0
 .../default_transformers/FlipTransformer.java |  0
 .../ForegroundToBackgroundTransformer.java    |  0
 .../viewpager/default_transformers/Pivot.java |  0
 .../RotateDownTransformer.java                |  0
 .../RotateUpTransformer.java                  |  0
 .../ScaleTransformer.java                     |  0
 .../StackTransformer.java                     |  0
 .../TabletTransformer.java                    |  0
 .../ZoomInTransformer.java                    |  0
 .../ZoomOutSlideTransformer.java              |  0
 .../orientation/HorizontalHelper.java         |  0
 .../orientation/OrientationHelper.java        |  0
 .../viewpager/orientation/VerticalHelper.java |  0
 .../viewpager/transform/ItemTransformer.java  |  0
 .../transform/ItemTransformerWrapper.java     |  0
 .../src/main/res/drawable/ic_error_omega.xml  |  0
 .../layout/pagination_error_omega_layout.xml  |  0
 .../res/layout/pagination_omega_layout.xml    |  0
 .../src/main/res/values/attrs.xml             |  0
 .../src/main/res/values/ids.xml               |  0
 .../src/main/res/values/integers.xml          |  0
 .../src/main/res/values/strings.xml           |  0
 omegarecyclerview_fastscroll/.gitignore       |  1 +
 omegarecyclerview_fastscroll/build.gradle     | 27 +++++++++++++++++++
 .../proguard-rules.pro                        | 21 +++++++++++++++
 .../src/main/AndroidManifest.xml              |  1 +
 .../AnimatorListener.java                     |  2 +-
 .../FastScrollStateChangeListener.java        |  2 +-
 .../OmegaFastScrollRecyclerView.java          | 12 ++++-----
 .../OmegaFastScrollerLayout.java              | 16 +++++------
 .../SectionAdapter.java                       |  7 +++++
 .../src/main/res/drawable/ic_bubble_down.xml  |  0
 .../src/main/res/drawable/ic_bubble_up.xml    |  0
 .../src/main/res/drawable/ic_handle.xml       |  0
 .../src/main/res/drawable/ic_track.xml        |  0
 .../src/main/res/layout/view_fastscroller.xml |  0
 .../src/main/res/values/attrs.xml             | 14 ++++++++++
 .../src/main/res/values/dimens.xml            |  0
 .../src/main/AndroidManifest.xml              |  4 ---
 .../fast_scroll/SectionIndexer.java           |  7 -----
 settings.gradle                               |  2 +-
 107 files changed, 118 insertions(+), 59 deletions(-)
 rename {omegarecyclerviewlibs => omegarecyclerview}/.gitignore (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/build.gradle (58%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/proguard-rules.pro (100%)
 create mode 100644 omegarecyclerview/src/main/AndroidManifest.xml
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/androidx/recyclerview/widget/ExpandedRecyclerView.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/BaseArrayAdapter.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/BaseListAdapter.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/ClickViewHolder.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ChildClippingFrameLayout.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ExpandableStickyHeaderDecoration.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/OmegaExpandableRecyclerView.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/AnimationHelper.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/ExpandableItemAnimator.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/OnAnimationEndListener.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/DropDownItemAnimator.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/FadeItemAnimator.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableType.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableViewData.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/FlatGroupingList.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/GroupProvider.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/PositionData.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/Range.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/UniqueIdProvider.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/layout_manager/ExpandableLayoutManager.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/header/SectionContentFrameLayout.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/BaseItemDecoration.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/SpaceItemDecoration.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/decoration_helpers/DividerDecorationHelper.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/OnPageRequestListener.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PageRequester.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationAdapter.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationViewCreator.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/WrapperAdapter.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/BaseStickyHeaderDecoration.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderAdapter.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderDecoration.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuHelper.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuLayout.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeViewHolder.java (99%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/listener/SwipeFractionListener.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/listener/SwipeSwitchListener.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/swiper/LeftHorizontalSwiper.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/swiper/RightHorizontalSwiper.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/swiper/Swiper.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/DefaultPagerAdapter.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/Direction.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/OmegaPagerRecyclerView.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/AccordionTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/BackgroundToForegroundTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/CubeInTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/CubeOutTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/DepthPageTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/FadeTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/FlipTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ForegroundToBackgroundTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/Pivot.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/RotateDownTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/RotateUpTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ScaleTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/StackTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/TabletTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ZoomInTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ZoomOutSlideTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/orientation/HorizontalHelper.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/orientation/OrientationHelper.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/orientation/VerticalHelper.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/transform/ItemTransformer.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/transform/ItemTransformerWrapper.java (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/res/drawable/ic_error_omega.xml (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/res/layout/pagination_error_omega_layout.xml (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/res/layout/pagination_omega_layout.xml (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/res/values/attrs.xml (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/res/values/ids.xml (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/res/values/integers.xml (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview}/src/main/res/values/strings.xml (100%)
 create mode 100644 omegarecyclerview_fastscroll/.gitignore
 create mode 100644 omegarecyclerview_fastscroll/build.gradle
 create mode 100644 omegarecyclerview_fastscroll/proguard-rules.pro
 create mode 100644 omegarecyclerview_fastscroll/src/main/AndroidManifest.xml
 rename {omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll => omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll}/AnimatorListener.java (92%)
 rename {omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll => omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll}/FastScrollStateChangeListener.java (84%)
 rename {omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll => omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll}/OmegaFastScrollRecyclerView.java (92%)
 rename {omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll => omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll}/OmegaFastScrollerLayout.java (97%)
 create mode 100644 omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/SectionAdapter.java
 rename {omegarecyclerviewlibs => omegarecyclerview_fastscroll}/src/main/res/drawable/ic_bubble_down.xml (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview_fastscroll}/src/main/res/drawable/ic_bubble_up.xml (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview_fastscroll}/src/main/res/drawable/ic_handle.xml (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview_fastscroll}/src/main/res/drawable/ic_track.xml (100%)
 rename {omegarecyclerviewlibs => omegarecyclerview_fastscroll}/src/main/res/layout/view_fastscroller.xml (100%)
 create mode 100644 omegarecyclerview_fastscroll/src/main/res/values/attrs.xml
 rename {omegarecyclerviewlibs => omegarecyclerview_fastscroll}/src/main/res/values/dimens.xml (100%)
 delete mode 100644 omegarecyclerviewlibs/src/main/AndroidManifest.xml
 delete mode 100644 omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/SectionIndexer.java

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 2edf4f5..a8b3e35 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,7 +4,8 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/OmegaRecyclerView.iml" filepath="$PROJECT_DIR$/OmegaRecyclerView.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/omegarecyclerviewlibs/omegarecyclerviewlibs.iml" filepath="$PROJECT_DIR$/omegarecyclerviewlibs/omegarecyclerviewlibs.iml" />
+      <module fileurl="file://$PROJECT_DIR$/omegarecyclerview/omegarecyclerview.iml" filepath="$PROJECT_DIR$/omegarecyclerview/omegarecyclerview.iml" />
+      <module fileurl="file://$PROJECT_DIR$/omegarecyclerview_fastscroll/omegarecyclerview_fastscroll.iml" filepath="$PROJECT_DIR$/omegarecyclerview_fastscroll/omegarecyclerview_fastscroll.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 47572e8..01a63cf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
     defaultConfig {
         applicationId "com.omega_r.omegarecyclerview"
-        minSdkVersion 16
-        targetSdkVersion 28
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -23,15 +23,16 @@ android {
 dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.1.0-alpha03'
+    implementation 'androidx.appcompat:appcompat:' + rootProject.appcompatVersion
+    implementation 'com.google.android.material:material:' + rootProject.materialVersion
 
     implementation 'com.github.Omega-R.OmegaIntentBuilder:core:' + rootProject.omegaIntentBuilder
     implementation 'com.github.Omega-R.OmegaIntentBuilder:annotations:' + rootProject.omegaIntentBuilder
     annotationProcessor 'com.github.Omega-R.OmegaIntentBuilder:processor:' + rootProject.omegaIntentBuilder
 
-    api project(':omegarecyclerviewlibs')
+    implementation project(':omegarecyclerview')
+    implementation project(':omegarecyclerview_fastscroll')
 
     androidTestImplementation('com.android.support.test.espresso:espresso-core:' + rootProject.espressoVersion, {
         exclude group: 'com.android.support', module: 'support-annotations'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index acc7256..9d9d278 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name_omega"
+        android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AppCompat.Light">
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java
index c866eab..55bef45 100644
--- a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java
@@ -3,9 +3,9 @@
 import android.os.Bundle;
 import android.util.Log;
 
-import com.omega_r.libs.omegarecyclerview.fast_scroll.FastScrollStateChangeListener;
-import com.omega_r.libs.omegarecyclerview.fast_scroll.OmegaFastScrollRecyclerView;
-import com.omega_r.libs.omegarecyclerview.fast_scroll.OmegaFastScrollerLayout;
+import com.omega_r.libs.omegarecyclerview_fastscroll.FastScrollStateChangeListener;
+import com.omega_r.libs.omegarecyclerview_fastscroll.OmegaFastScrollRecyclerView;
+import com.omega_r.libs.omegarecyclerview_fastscroll.OmegaFastScrollerLayout;
 import com.omega_r.omegarecyclerview.R;
 
 import androidx.annotation.Nullable;
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java
index 36302e4..30c14c7 100644
--- a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java
@@ -4,12 +4,13 @@
 import android.widget.TextView;
 
 import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
-import com.omega_r.libs.omegarecyclerview.fast_scroll.SectionIndexer;
+
+import com.omega_r.libs.omegarecyclerview_fastscroll.SectionAdapter;
 import com.omega_r.omegarecyclerview.R;
 
 import androidx.annotation.NonNull;
 
-public class FastScrollAdapter extends OmegaRecyclerView.Adapter<FastScrollAdapter.ViewHolder> implements SectionIndexer {
+public class FastScrollAdapter extends OmegaRecyclerView.Adapter<FastScrollAdapter.ViewHolder> implements SectionAdapter {
 
     @NonNull
     @Override
diff --git a/app/src/main/res/layout/activity_fastscroll.xml b/app/src/main/res/layout/activity_fastscroll.xml
index 97df74c..c1c7bc9 100644
--- a/app/src/main/res/layout/activity_fastscroll.xml
+++ b/app/src/main/res/layout/activity_fastscroll.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.omega_r.libs.omegarecyclerview.fast_scroll.OmegaFastScrollRecyclerView
+    <com.omega_r.libs.omegarecyclerview_fastscroll.OmegaFastScrollRecyclerView
         android:id="@+id/recyclerview"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/build.gradle b/build.gradle
index f4f8314..98221b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -30,6 +30,11 @@ task clean(type: Delete) {
 
 ext {
     buildToolsVersion = "28.0.3"
+    compileSdkVersion = 28
+    minSdkVersion = 16
+    targetSdkVersion = 28
+    appcompatVersion = "1.1.0-alpha01"
+    materialVersion = "1.1.0-alpha03"
     espressoVersion = "3.0.1"
     junitVersion = "4.12"
     omegaIntentBuilder = "1.1.5"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1a97d31..4fcab55 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 04 09:42:55 MSK 2018
+#Mon Feb 04 09:19:33 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/omegarecyclerviewlibs/.gitignore b/omegarecyclerview/.gitignore
similarity index 100%
rename from omegarecyclerviewlibs/.gitignore
rename to omegarecyclerview/.gitignore
diff --git a/omegarecyclerviewlibs/build.gradle b/omegarecyclerview/build.gradle
similarity index 58%
rename from omegarecyclerviewlibs/build.gradle
rename to omegarecyclerview/build.gradle
index 48e40b1..29b5628 100644
--- a/omegarecyclerviewlibs/build.gradle
+++ b/omegarecyclerview/build.gradle
@@ -1,19 +1,14 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
-group = 'com.github.Omega-R'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
-
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
     }
     buildTypes {
         release {
@@ -25,8 +20,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
-    implementation 'com.google.android.material:material:1.1.0-alpha03'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-
+    implementation 'androidx.appcompat:appcompat:' + rootProject.appcompatVersion
+    implementation 'com.google.android.material:material:' + rootProject.materialVersion
 }
diff --git a/omegarecyclerviewlibs/proguard-rules.pro b/omegarecyclerview/proguard-rules.pro
similarity index 100%
rename from omegarecyclerviewlibs/proguard-rules.pro
rename to omegarecyclerview/proguard-rules.pro
diff --git a/omegarecyclerview/src/main/AndroidManifest.xml b/omegarecyclerview/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..425e11c
--- /dev/null
+++ b/omegarecyclerview/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.omega_r.libs.omegarecyclerview" />
diff --git a/omegarecyclerviewlibs/src/main/java/androidx/recyclerview/widget/ExpandedRecyclerView.java b/omegarecyclerview/src/main/java/androidx/recyclerview/widget/ExpandedRecyclerView.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/androidx/recyclerview/widget/ExpandedRecyclerView.java
rename to omegarecyclerview/src/main/java/androidx/recyclerview/widget/ExpandedRecyclerView.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseArrayAdapter.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/BaseArrayAdapter.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseArrayAdapter.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/BaseArrayAdapter.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseListAdapter.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/BaseListAdapter.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseListAdapter.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/BaseListAdapter.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/ClickViewHolder.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/ClickViewHolder.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/ClickViewHolder.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/ClickViewHolder.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ChildClippingFrameLayout.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ChildClippingFrameLayout.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ChildClippingFrameLayout.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ChildClippingFrameLayout.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ExpandableStickyHeaderDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ExpandableStickyHeaderDecoration.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ExpandableStickyHeaderDecoration.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ExpandableStickyHeaderDecoration.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/OmegaExpandableRecyclerView.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/OmegaExpandableRecyclerView.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/OmegaExpandableRecyclerView.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/OmegaExpandableRecyclerView.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/AnimationHelper.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/AnimationHelper.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/AnimationHelper.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/AnimationHelper.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/ExpandableItemAnimator.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/ExpandableItemAnimator.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/ExpandableItemAnimator.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/ExpandableItemAnimator.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/OnAnimationEndListener.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/OnAnimationEndListener.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/OnAnimationEndListener.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/OnAnimationEndListener.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/DropDownItemAnimator.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/DropDownItemAnimator.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/DropDownItemAnimator.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/DropDownItemAnimator.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/FadeItemAnimator.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/FadeItemAnimator.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/FadeItemAnimator.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/FadeItemAnimator.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableType.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableType.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableType.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableType.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableViewData.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableViewData.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableViewData.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableViewData.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/FlatGroupingList.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/FlatGroupingList.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/FlatGroupingList.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/FlatGroupingList.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/GroupProvider.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/GroupProvider.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/GroupProvider.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/GroupProvider.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/PositionData.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/PositionData.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/PositionData.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/PositionData.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/Range.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/Range.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/Range.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/Range.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/UniqueIdProvider.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/UniqueIdProvider.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/UniqueIdProvider.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/UniqueIdProvider.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/layout_manager/ExpandableLayoutManager.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/layout_manager/ExpandableLayoutManager.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/layout_manager/ExpandableLayoutManager.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/layout_manager/ExpandableLayoutManager.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/header/SectionContentFrameLayout.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/SectionContentFrameLayout.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/header/SectionContentFrameLayout.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/SectionContentFrameLayout.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/BaseItemDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/BaseItemDecoration.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/BaseItemDecoration.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/BaseItemDecoration.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/SpaceItemDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/SpaceItemDecoration.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/SpaceItemDecoration.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/SpaceItemDecoration.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/decoration_helpers/DividerDecorationHelper.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/decoration_helpers/DividerDecorationHelper.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/decoration_helpers/DividerDecorationHelper.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/decoration_helpers/DividerDecorationHelper.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/OnPageRequestListener.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/OnPageRequestListener.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/OnPageRequestListener.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/OnPageRequestListener.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PageRequester.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PageRequester.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PageRequester.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PageRequester.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationAdapter.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationAdapter.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationAdapter.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationAdapter.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationViewCreator.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationViewCreator.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationViewCreator.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationViewCreator.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/WrapperAdapter.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/WrapperAdapter.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/WrapperAdapter.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/WrapperAdapter.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/BaseStickyHeaderDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/BaseStickyHeaderDecoration.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/BaseStickyHeaderDecoration.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/BaseStickyHeaderDecoration.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderAdapter.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderAdapter.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderAdapter.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderAdapter.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderDecoration.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderDecoration.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderDecoration.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuHelper.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuHelper.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuHelper.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuHelper.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuLayout.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuLayout.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuLayout.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuLayout.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeViewHolder.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeViewHolder.java
similarity index 99%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeViewHolder.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeViewHolder.java
index 7494ebf..d0fa08b 100644
--- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeViewHolder.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeViewHolder.java
@@ -1,7 +1,6 @@
 package com.omega_r.libs.omegarecyclerview.swipe_menu;
 
 import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/listener/SwipeFractionListener.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/listener/SwipeFractionListener.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/listener/SwipeFractionListener.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/listener/SwipeFractionListener.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/listener/SwipeSwitchListener.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/listener/SwipeSwitchListener.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/listener/SwipeSwitchListener.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/listener/SwipeSwitchListener.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/swiper/LeftHorizontalSwiper.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/swiper/LeftHorizontalSwiper.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/swiper/LeftHorizontalSwiper.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/swiper/LeftHorizontalSwiper.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/swiper/RightHorizontalSwiper.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/swiper/RightHorizontalSwiper.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/swiper/RightHorizontalSwiper.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/swiper/RightHorizontalSwiper.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/swiper/Swiper.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/swiper/Swiper.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/swiper/Swiper.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/swiper/Swiper.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/DefaultPagerAdapter.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/DefaultPagerAdapter.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/DefaultPagerAdapter.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/DefaultPagerAdapter.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/Direction.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/Direction.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/Direction.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/Direction.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/OmegaPagerRecyclerView.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/OmegaPagerRecyclerView.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/OmegaPagerRecyclerView.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/OmegaPagerRecyclerView.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/AccordionTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/AccordionTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/AccordionTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/AccordionTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/BackgroundToForegroundTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/BackgroundToForegroundTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/BackgroundToForegroundTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/BackgroundToForegroundTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/CubeInTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/CubeInTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/CubeInTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/CubeInTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/CubeOutTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/CubeOutTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/CubeOutTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/CubeOutTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/DepthPageTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/DepthPageTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/DepthPageTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/DepthPageTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/FadeTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/FadeTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/FadeTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/FadeTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/FlipTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/FlipTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/FlipTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/FlipTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ForegroundToBackgroundTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ForegroundToBackgroundTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ForegroundToBackgroundTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ForegroundToBackgroundTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/Pivot.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/Pivot.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/Pivot.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/Pivot.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/RotateDownTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/RotateDownTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/RotateDownTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/RotateDownTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/RotateUpTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/RotateUpTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/RotateUpTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/RotateUpTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ScaleTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ScaleTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ScaleTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ScaleTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/StackTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/StackTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/StackTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/StackTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/TabletTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/TabletTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/TabletTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/TabletTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ZoomInTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ZoomInTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ZoomInTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ZoomInTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ZoomOutSlideTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ZoomOutSlideTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ZoomOutSlideTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ZoomOutSlideTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/orientation/HorizontalHelper.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/orientation/HorizontalHelper.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/orientation/HorizontalHelper.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/orientation/HorizontalHelper.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/orientation/OrientationHelper.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/orientation/OrientationHelper.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/orientation/OrientationHelper.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/orientation/OrientationHelper.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/orientation/VerticalHelper.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/orientation/VerticalHelper.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/orientation/VerticalHelper.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/orientation/VerticalHelper.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/transform/ItemTransformer.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/transform/ItemTransformer.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/transform/ItemTransformer.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/transform/ItemTransformer.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/transform/ItemTransformerWrapper.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/transform/ItemTransformerWrapper.java
similarity index 100%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/transform/ItemTransformerWrapper.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/transform/ItemTransformerWrapper.java
diff --git a/omegarecyclerviewlibs/src/main/res/drawable/ic_error_omega.xml b/omegarecyclerview/src/main/res/drawable/ic_error_omega.xml
similarity index 100%
rename from omegarecyclerviewlibs/src/main/res/drawable/ic_error_omega.xml
rename to omegarecyclerview/src/main/res/drawable/ic_error_omega.xml
diff --git a/omegarecyclerviewlibs/src/main/res/layout/pagination_error_omega_layout.xml b/omegarecyclerview/src/main/res/layout/pagination_error_omega_layout.xml
similarity index 100%
rename from omegarecyclerviewlibs/src/main/res/layout/pagination_error_omega_layout.xml
rename to omegarecyclerview/src/main/res/layout/pagination_error_omega_layout.xml
diff --git a/omegarecyclerviewlibs/src/main/res/layout/pagination_omega_layout.xml b/omegarecyclerview/src/main/res/layout/pagination_omega_layout.xml
similarity index 100%
rename from omegarecyclerviewlibs/src/main/res/layout/pagination_omega_layout.xml
rename to omegarecyclerview/src/main/res/layout/pagination_omega_layout.xml
diff --git a/omegarecyclerviewlibs/src/main/res/values/attrs.xml b/omegarecyclerview/src/main/res/values/attrs.xml
similarity index 100%
rename from omegarecyclerviewlibs/src/main/res/values/attrs.xml
rename to omegarecyclerview/src/main/res/values/attrs.xml
diff --git a/omegarecyclerviewlibs/src/main/res/values/ids.xml b/omegarecyclerview/src/main/res/values/ids.xml
similarity index 100%
rename from omegarecyclerviewlibs/src/main/res/values/ids.xml
rename to omegarecyclerview/src/main/res/values/ids.xml
diff --git a/omegarecyclerviewlibs/src/main/res/values/integers.xml b/omegarecyclerview/src/main/res/values/integers.xml
similarity index 100%
rename from omegarecyclerviewlibs/src/main/res/values/integers.xml
rename to omegarecyclerview/src/main/res/values/integers.xml
diff --git a/omegarecyclerviewlibs/src/main/res/values/strings.xml b/omegarecyclerview/src/main/res/values/strings.xml
similarity index 100%
rename from omegarecyclerviewlibs/src/main/res/values/strings.xml
rename to omegarecyclerview/src/main/res/values/strings.xml
diff --git a/omegarecyclerview_fastscroll/.gitignore b/omegarecyclerview_fastscroll/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/omegarecyclerview_fastscroll/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/omegarecyclerview_fastscroll/build.gradle b/omegarecyclerview_fastscroll/build.gradle
new file mode 100644
index 0000000..2bbc42d
--- /dev/null
+++ b/omegarecyclerview_fastscroll/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+
+android {
+    compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':omegarecyclerview')
+    implementation 'androidx.appcompat:appcompat:' + rootProject.appcompatVersion
+    implementation 'com.google.android.material:material:' + rootProject.materialVersion
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+}
diff --git a/omegarecyclerview_fastscroll/proguard-rules.pro b/omegarecyclerview_fastscroll/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/omegarecyclerview_fastscroll/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/omegarecyclerview_fastscroll/src/main/AndroidManifest.xml b/omegarecyclerview_fastscroll/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..e74ebd3
--- /dev/null
+++ b/omegarecyclerview_fastscroll/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.omega_r.libs.omegarecyclerview_fastscroll" />
\ No newline at end of file
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/AnimatorListener.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/AnimatorListener.java
similarity index 92%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/AnimatorListener.java
rename to omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/AnimatorListener.java
index 2973d78..ae30645 100644
--- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/AnimatorListener.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/AnimatorListener.java
@@ -1,4 +1,4 @@
-package com.omega_r.libs.omegarecyclerview.fast_scroll;
+package com.omega_r.libs.omegarecyclerview_fastscroll;
 
 import android.animation.Animator;
 
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/FastScrollStateChangeListener.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollStateChangeListener.java
similarity index 84%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/FastScrollStateChangeListener.java
rename to omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollStateChangeListener.java
index b80dd87..85b539f 100644
--- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/FastScrollStateChangeListener.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollStateChangeListener.java
@@ -1,4 +1,4 @@
-package com.omega_r.libs.omegarecyclerview.fast_scroll;
+package com.omega_r.libs.omegarecyclerview_fastscroll;
 
 public interface FastScrollStateChangeListener {
 
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollRecyclerView.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
similarity index 92%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollRecyclerView.java
rename to omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
index a4de5e6..a39671f 100644
--- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollRecyclerView.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
@@ -1,4 +1,4 @@
-package com.omega_r.libs.omegarecyclerview.fast_scroll;
+package com.omega_r.libs.omegarecyclerview_fastscroll;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -38,8 +38,8 @@ private void init(@NonNull Context context, @Nullable AttributeSet attrs) {
     @Override
     public final void setAdapter(RecyclerView.Adapter adapter) {
         super.setAdapter(adapter);
-        if (adapter instanceof SectionIndexer) {
-            setSectionIndexer((SectionIndexer) adapter);
+        if (adapter instanceof SectionAdapter) {
+            setSectionIndexer((SectionAdapter) adapter);
         } else if (adapter == null) {
             setSectionIndexer(null);
         }
@@ -52,11 +52,11 @@ public final void setVisibility(int visibility) {
     }
 
     /**
-     * Set the [SectionIndexer] for the [FastScroller].
+     * Set the [SectionAdapter] for the [FastScroller].
      *
-     * @param indexer The SectionIndexer that provides section text for the FastScroller
+     * @param indexer The SectionAdapter that provides section text for the FastScroller
      */
-    public final void setSectionIndexer(SectionIndexer indexer) {
+    public final void setSectionIndexer(SectionAdapter indexer) {
         mFastScrollerLayout.setSectionIndexer(indexer);
     }
 
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollerLayout.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollerLayout.java
similarity index 97%
rename from omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollerLayout.java
rename to omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollerLayout.java
index dc0061b..706f37c 100644
--- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/OmegaFastScrollerLayout.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollerLayout.java
@@ -1,4 +1,4 @@
-package com.omega_r.libs.omegarecyclerview.fast_scroll;
+package com.omega_r.libs.omegarecyclerview_fastscroll;
 
 import android.animation.Animator;
 import android.annotation.SuppressLint;
@@ -34,8 +34,6 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.omega_r.libs.omegarecyclerview.R;
-
 public class OmegaFastScrollerLayout extends LinearLayout {
 
     private static final AnimatorListener sDefaultAnimatorListener = new AnimatorListener();
@@ -63,7 +61,7 @@ public class OmegaFastScrollerLayout extends LinearLayout {
     private int mViewHeight;
     private boolean mHideScrollbar;
     private boolean mShowBubble;
-    private SectionIndexer mSectionIndexer;
+    private SectionAdapter mSectionAdapter;
     private ViewPropertyAnimator mScrollbarAnimator;
     private ViewPropertyAnimator mBubbleAnimator;
     private FastScrollStateChangeListener mFastScrollStateChangeListener;
@@ -257,8 +255,8 @@ private void updateViewHeights() {
         mHandleHeight = mHandleImageView.getMeasuredHeight();
     }
 
-    public final void setSectionIndexer(@Nullable SectionIndexer sectionIndexer) {
-        mSectionIndexer = sectionIndexer;
+    public final void setSectionIndexer(@Nullable SectionAdapter sectionAdapter) {
+        mSectionAdapter = sectionAdapter;
     }
 
     public final void attachRecyclerView(RecyclerView recyclerView) {
@@ -355,7 +353,7 @@ public boolean onTouchEvent(MotionEvent event) {
                 if (!isViewVisible(mScrollbarContainer)) {
                     showScrollbar();
                 }
-                if (mShowBubble && mSectionIndexer != null) {
+                if (mShowBubble && mSectionAdapter != null) {
                     showBubble();
                 }
                 if (mFastScrollStateChangeListener != null) {
@@ -416,8 +414,8 @@ private void setRecyclerViewPosition(float positionY) {
         int targetPos = getValueInRange(itemCount - 1, scrolledItemCount);
         layoutManager.scrollToPosition(targetPos);
 
-        if (mShowBubble && mSectionIndexer != null) {
-            mBubbleTextView.setText(mSectionIndexer.getSectionText(targetPos));
+        if (mShowBubble && mSectionAdapter != null) {
+            mBubbleTextView.setText(mSectionAdapter.getSectionText(targetPos));
         }
     }
 
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/SectionAdapter.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/SectionAdapter.java
new file mode 100644
index 0000000..6910e4a
--- /dev/null
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/SectionAdapter.java
@@ -0,0 +1,7 @@
+package com.omega_r.libs.omegarecyclerview_fastscroll;
+
+public interface SectionAdapter {
+
+    String getSectionText(int position);
+
+}
\ No newline at end of file
diff --git a/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_down.xml b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_down.xml
similarity index 100%
rename from omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_down.xml
rename to omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_down.xml
diff --git a/omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_up.xml b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up.xml
similarity index 100%
rename from omegarecyclerviewlibs/src/main/res/drawable/ic_bubble_up.xml
rename to omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up.xml
diff --git a/omegarecyclerviewlibs/src/main/res/drawable/ic_handle.xml b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_handle.xml
similarity index 100%
rename from omegarecyclerviewlibs/src/main/res/drawable/ic_handle.xml
rename to omegarecyclerview_fastscroll/src/main/res/drawable/ic_handle.xml
diff --git a/omegarecyclerviewlibs/src/main/res/drawable/ic_track.xml b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_track.xml
similarity index 100%
rename from omegarecyclerviewlibs/src/main/res/drawable/ic_track.xml
rename to omegarecyclerview_fastscroll/src/main/res/drawable/ic_track.xml
diff --git a/omegarecyclerviewlibs/src/main/res/layout/view_fastscroller.xml b/omegarecyclerview_fastscroll/src/main/res/layout/view_fastscroller.xml
similarity index 100%
rename from omegarecyclerviewlibs/src/main/res/layout/view_fastscroller.xml
rename to omegarecyclerview_fastscroll/src/main/res/layout/view_fastscroller.xml
diff --git a/omegarecyclerview_fastscroll/src/main/res/values/attrs.xml b/omegarecyclerview_fastscroll/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..b92bf06
--- /dev/null
+++ b/omegarecyclerview_fastscroll/src/main/res/values/attrs.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="OmegaFastScrollerLayout">
+        <attr name="hideScrollbar" format="boolean" />
+        <attr name="showBubble" format="boolean" />
+        <attr name="showTrack" format="boolean" />
+        <attr name="trackColor" format="color" />
+        <attr name="handleColor" format="color" />
+        <attr name="bubbleColor" format="color" />
+        <attr name="bubbleTextColor" format="color" />
+    </declare-styleable>
+
+</resources>
diff --git a/omegarecyclerviewlibs/src/main/res/values/dimens.xml b/omegarecyclerview_fastscroll/src/main/res/values/dimens.xml
similarity index 100%
rename from omegarecyclerviewlibs/src/main/res/values/dimens.xml
rename to omegarecyclerview_fastscroll/src/main/res/values/dimens.xml
diff --git a/omegarecyclerviewlibs/src/main/AndroidManifest.xml b/omegarecyclerviewlibs/src/main/AndroidManifest.xml
deleted file mode 100644
index fe00fa6..0000000
--- a/omegarecyclerviewlibs/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.omega_r.libs.omegarecyclerview">
-
-</manifest>
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/SectionIndexer.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/SectionIndexer.java
deleted file mode 100644
index 2420adb..0000000
--- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/fast_scroll/SectionIndexer.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.omega_r.libs.omegarecyclerview.fast_scroll;
-
-public interface SectionIndexer {
-
-    String getSectionText(int position);
-
-}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 4a913a2..026e718 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':omegarecyclerviewlibs'
+include ':app', ':omegarecyclerview', ':omegarecyclerview_fastscroll'

From ce63f3af2daae58fd71295a87accb43d7171e079 Mon Sep 17 00:00:00 2001
From: R12rus <roman.tc@omega-r.com>
Date: Mon, 4 Feb 2019 14:50:44 +0300
Subject: [PATCH 04/32] fixed review 2

---
 .../fastscroll_example/FastScrollAdapter.java        |  5 ++---
 omegarecyclerview/src/main/res/values/attrs.xml      | 10 ----------
 .../FastScrollAdapter.java                           |  7 +++++++
 .../OmegaFastScrollRecyclerView.java                 | 10 +++++-----
 .../OmegaFastScrollerLayout.java                     | 12 ++++++------
 .../omegarecyclerview_fastscroll/SectionAdapter.java |  7 -------
 6 files changed, 20 insertions(+), 31 deletions(-)
 create mode 100644 omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollAdapter.java
 delete mode 100644 omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/SectionAdapter.java

diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java
index 30c14c7..f93473a 100644
--- a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java
@@ -5,12 +5,11 @@
 
 import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
 
-import com.omega_r.libs.omegarecyclerview_fastscroll.SectionAdapter;
 import com.omega_r.omegarecyclerview.R;
 
 import androidx.annotation.NonNull;
 
-public class FastScrollAdapter extends OmegaRecyclerView.Adapter<FastScrollAdapter.ViewHolder> implements SectionAdapter {
+public class FastScrollAdapter extends OmegaRecyclerView.Adapter<FastScrollAdapter.ViewHolder> implements com.omega_r.libs.omegarecyclerview_fastscroll.FastScrollAdapter {
 
     @NonNull
     @Override
@@ -29,7 +28,7 @@ public int getItemCount() {
     }
 
     @Override
-    public String getSectionText(int position) {
+    public String getFastScrollSection(int position) {
         return String.valueOf(position);
     }
 
diff --git a/omegarecyclerview/src/main/res/values/attrs.xml b/omegarecyclerview/src/main/res/values/attrs.xml
index 8278c11..1746493 100644
--- a/omegarecyclerview/src/main/res/values/attrs.xml
+++ b/omegarecyclerview/src/main/res/values/attrs.xml
@@ -73,14 +73,4 @@
         <attr name="backgrounds" format="reference" />
     </declare-styleable>
 
-    <declare-styleable name="OmegaFastScrollerLayout">
-        <attr name="hideScrollbar" format="boolean" />
-        <attr name="showBubble" format="boolean" />
-        <attr name="showTrack" format="boolean" />
-        <attr name="trackColor" format="color" />
-        <attr name="handleColor" format="color" />
-        <attr name="bubbleColor" format="color" />
-        <attr name="bubbleTextColor" format="color" />
-    </declare-styleable>
-
 </resources>
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollAdapter.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollAdapter.java
new file mode 100644
index 0000000..3615b8a
--- /dev/null
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollAdapter.java
@@ -0,0 +1,7 @@
+package com.omega_r.libs.omegarecyclerview_fastscroll;
+
+public interface FastScrollAdapter {
+
+    String getFastScrollSection(int position);
+
+}
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
index a39671f..5b99269 100644
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
@@ -38,8 +38,8 @@ private void init(@NonNull Context context, @Nullable AttributeSet attrs) {
     @Override
     public final void setAdapter(RecyclerView.Adapter adapter) {
         super.setAdapter(adapter);
-        if (adapter instanceof SectionAdapter) {
-            setSectionIndexer((SectionAdapter) adapter);
+        if (adapter instanceof FastScrollAdapter) {
+            setSectionIndexer((FastScrollAdapter) adapter);
         } else if (adapter == null) {
             setSectionIndexer(null);
         }
@@ -52,11 +52,11 @@ public final void setVisibility(int visibility) {
     }
 
     /**
-     * Set the [SectionAdapter] for the [FastScroller].
+     * Set the [FastScrollAdapter] for the [FastScroller].
      *
-     * @param indexer The SectionAdapter that provides section text for the FastScroller
+     * @param indexer The FastScrollAdapter that provides section text for the FastScroller
      */
-    public final void setSectionIndexer(SectionAdapter indexer) {
+    public final void setSectionIndexer(FastScrollAdapter indexer) {
         mFastScrollerLayout.setSectionIndexer(indexer);
     }
 
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollerLayout.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollerLayout.java
index 706f37c..b897cdc 100644
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollerLayout.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollerLayout.java
@@ -61,7 +61,7 @@ public class OmegaFastScrollerLayout extends LinearLayout {
     private int mViewHeight;
     private boolean mHideScrollbar;
     private boolean mShowBubble;
-    private SectionAdapter mSectionAdapter;
+    private FastScrollAdapter mFastScrollAdapter;
     private ViewPropertyAnimator mScrollbarAnimator;
     private ViewPropertyAnimator mBubbleAnimator;
     private FastScrollStateChangeListener mFastScrollStateChangeListener;
@@ -255,8 +255,8 @@ private void updateViewHeights() {
         mHandleHeight = mHandleImageView.getMeasuredHeight();
     }
 
-    public final void setSectionIndexer(@Nullable SectionAdapter sectionAdapter) {
-        mSectionAdapter = sectionAdapter;
+    public final void setSectionIndexer(@Nullable FastScrollAdapter fastScrollAdapter) {
+        mFastScrollAdapter = fastScrollAdapter;
     }
 
     public final void attachRecyclerView(RecyclerView recyclerView) {
@@ -353,7 +353,7 @@ public boolean onTouchEvent(MotionEvent event) {
                 if (!isViewVisible(mScrollbarContainer)) {
                     showScrollbar();
                 }
-                if (mShowBubble && mSectionAdapter != null) {
+                if (mShowBubble && mFastScrollAdapter != null) {
                     showBubble();
                 }
                 if (mFastScrollStateChangeListener != null) {
@@ -414,8 +414,8 @@ private void setRecyclerViewPosition(float positionY) {
         int targetPos = getValueInRange(itemCount - 1, scrolledItemCount);
         layoutManager.scrollToPosition(targetPos);
 
-        if (mShowBubble && mSectionAdapter != null) {
-            mBubbleTextView.setText(mSectionAdapter.getSectionText(targetPos));
+        if (mShowBubble && mFastScrollAdapter != null) {
+            mBubbleTextView.setText(mFastScrollAdapter.getFastScrollSection(targetPos));
         }
     }
 
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/SectionAdapter.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/SectionAdapter.java
deleted file mode 100644
index 6910e4a..0000000
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/SectionAdapter.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.omega_r.libs.omegarecyclerview_fastscroll;
-
-public interface SectionAdapter {
-
-    String getSectionText(int position);
-
-}
\ No newline at end of file

From 4e932661e21862cb4916afab31fa501e1910dbed Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Wed, 14 Aug 2019 10:29:10 +0300
Subject: [PATCH 05/32] Refactoring FastScroll recyclerview

---
 .../FastScrollActivity.java                   |  33 +-
 .../fastscroll_example/FastScrollAdapter.java |   6 +
 .../FastScrollOriginalActivity.java           |  34 +
 .../main/res/layout/activity_fastscroll.xml   |  10 +-
 .../layout/activity_fastscroll_original.xml   |  12 +
 build.gradle                                  |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 .../DrawableUtils.java                        |  25 +
 .../FastScrollAutoHide.java                   |  10 +
 .../FastScrollStateChangeListener.java        |  15 -
 .../FastScrollVisibility.java                 |  10 +
 .../OmegaFastScrollRecyclerView.java          | 697 +++++++++++++++---
 .../OmegaFastScrollerLayout.java              | 520 -------------
 .../Position.java                             |   8 +
 .../src/main/res/drawable/ic_bubble_up.xml    |   2 +-
 .../src/main/res/drawable/ic_track.xml        |  12 +-
 .../src/main/res/values/attrs.xml             |  56 +-
 .../src/main/res/values/dimens.xml            |   5 +
 18 files changed, 770 insertions(+), 691 deletions(-)
 create mode 100644 app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollOriginalActivity.java
 create mode 100644 app/src/main/res/layout/activity_fastscroll_original.xml
 create mode 100644 omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/DrawableUtils.java
 create mode 100644 omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollAutoHide.java
 delete mode 100644 omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollStateChangeListener.java
 create mode 100644 omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollVisibility.java
 delete mode 100644 omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollerLayout.java
 create mode 100644 omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/Position.java

diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java
index 55bef45..c4a03c7 100644
--- a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java
@@ -1,17 +1,14 @@
 package com.omega_r.omegarecyclerview.fastscroll_example;
 
 import android.os.Bundle;
-import android.util.Log;
-
-import com.omega_r.libs.omegarecyclerview_fastscroll.FastScrollStateChangeListener;
-import com.omega_r.libs.omegarecyclerview_fastscroll.OmegaFastScrollRecyclerView;
-import com.omega_r.libs.omegarecyclerview_fastscroll.OmegaFastScrollerLayout;
-import com.omega_r.omegarecyclerview.R;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.RecyclerView;
 
-public class FastScrollActivity extends AppCompatActivity implements FastScrollStateChangeListener {
+import com.omega_r.omegarecyclerview.R;
+
+public class FastScrollActivity extends AppCompatActivity {
 
     private static final String TAG = FastScrollActivity.class.getSimpleName();
 
@@ -19,19 +16,19 @@ public class FastScrollActivity extends AppCompatActivity implements FastScrollS
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_fastscroll);
-        OmegaFastScrollRecyclerView recyclerView = findViewById(R.id.recyclerview);
+        RecyclerView recyclerView = findViewById(R.id.recyclerview);
         recyclerView.setAdapter(new FastScrollAdapter());
-        recyclerView.setFastScrollStateChangeListener(this);
+//        recyclerView.setFastScrollStateChangeListener(this);
     }
 
-    @Override
-    public void onFastScrollStart(OmegaFastScrollerLayout fastScrollerLayout) {
-        Log.d(TAG, "onFastScrollStart");
-    }
-
-    @Override
-    public void onFastScrollStop(OmegaFastScrollerLayout fastScrollerLayout) {
-        Log.d(TAG, "onFastScrollStop");
-    }
+//    @Override
+//    public void onFastScrollStart(OmegaFastScrollerLayout fastScrollerLayout) {
+//        Log.d(TAG, "onFastScrollStart");
+//    }
+//
+//    @Override
+//    public void onFastScrollStop(OmegaFastScrollerLayout fastScrollerLayout) {
+//        Log.d(TAG, "onFastScrollStop");
+//    }
 
 }
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java
index f93473a..2e99f6c 100644
--- a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java
@@ -1,5 +1,6 @@
 package com.omega_r.omegarecyclerview.fastscroll_example;
 
+import android.graphics.Color;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
@@ -19,6 +20,7 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+        holder.bind();
         holder.textView.setText(String.valueOf(position));
     }
 
@@ -41,6 +43,10 @@ class ViewHolder extends OmegaRecyclerView.ViewHolder {
             textView = findViewById(R.id.text_item);
         }
 
+        void bind() {
+//            itemView.setBackgroundColor(getAdapterPosition() % 2 == 0 ? Color.WHITE : Color.BLUE);
+        }
+
     }
 
 }
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollOriginalActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollOriginalActivity.java
new file mode 100644
index 0000000..e154aa2
--- /dev/null
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollOriginalActivity.java
@@ -0,0 +1,34 @@
+package com.omega_r.omegarecyclerview.fastscroll_example;
+
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.omega_r.omegarecyclerview.R;
+
+public class FastScrollOriginalActivity extends AppCompatActivity  {
+
+    private static final String TAG = FastScrollOriginalActivity.class.getSimpleName();
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_fastscroll_original);
+        RecyclerView recyclerView = findViewById(R.id.recyclerview);
+        recyclerView.setAdapter(new FastScrollAdapter());
+//        recyclerView.setFastScrollStateChangeListener(this);
+    }
+
+//    @Override
+//    public void onFastScrollStart(OmegaFastScrollerLayout fastScrollerLayout) {
+//        Log.d(TAG, "onFastScrollStart");
+//    }
+//
+//    @Override
+//    public void onFastScrollStop(OmegaFastScrollerLayout fastScrollerLayout) {
+//        Log.d(TAG, "onFastScrollStop");
+//    }
+
+}
diff --git a/app/src/main/res/layout/activity_fastscroll.xml b/app/src/main/res/layout/activity_fastscroll.xml
index c1c7bc9..c595516 100644
--- a/app/src/main/res/layout/activity_fastscroll.xml
+++ b/app/src/main/res/layout/activity_fastscroll.xml
@@ -2,11 +2,19 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <com.omega_r.libs.omegarecyclerview_fastscroll.OmegaFastScrollRecyclerView
         android:id="@+id/recyclerview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        app:fastScrollVisibility="scrollbar|track|bubble"
+        app:fastScrollbarColor="@color/colorAccent"
+        app:fastScrollbarWidth="10dp"/>
+
+    <!--app:showScrollbar="true"-->
+    <!--app:scrollbarColor="@color/colorAccent"-->
+    <!--app:scrollbarWidth="10dp"-->
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_fastscroll_original.xml b/app/src/main/res/layout/activity_fastscroll_original.xml
new file mode 100644
index 0000000..47f2ca1
--- /dev/null
+++ b/app/src/main/res/layout/activity_fastscroll_original.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <!--<com.omega_r.libs.omegarecyclerview_fastscroll.OmegaFastScrollRecyclerView-->
+        <!--android:id="@+id/recyclerview"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="match_parent" />-->
+
+</FrameLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 23f4317..8dedb03 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 932dee8..89138c8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 06 12:09:01 MSK 2019
+#Mon Aug 12 09:37:50 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/DrawableUtils.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/DrawableUtils.java
new file mode 100644
index 0000000..d389cd1
--- /dev/null
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/DrawableUtils.java
@@ -0,0 +1,25 @@
+package com.omega_r.libs.omegarecyclerview_fastscroll;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+
+@SuppressWarnings("WeakerAccess")
+public class DrawableUtils {
+
+    public static Drawable getTintedDrawable(Context context, @NonNull Drawable drawable, @ColorRes int color) {
+        return getTintedDrawable(drawable, ContextCompat.getColor(context, color));
+    }
+
+    public static Drawable getTintedDrawable(@NonNull Drawable drawable, @ColorInt int color) {
+        Drawable mutate = DrawableCompat.wrap(drawable).mutate();
+        DrawableCompat.setTint(mutate, color);
+        return mutate;
+    }
+
+}
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollAutoHide.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollAutoHide.java
new file mode 100644
index 0000000..76681bf
--- /dev/null
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollAutoHide.java
@@ -0,0 +1,10 @@
+package com.omega_r.libs.omegarecyclerview_fastscroll;
+
+public interface FastScrollAutoHide {
+
+    int NONE = 0;
+    int SCROLLBAR = 1;
+    int TRACK = 2;
+    int BUBBLE = 4;
+
+}
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollStateChangeListener.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollStateChangeListener.java
deleted file mode 100644
index 85b539f..0000000
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollStateChangeListener.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.omega_r.libs.omegarecyclerview_fastscroll;
-
-public interface FastScrollStateChangeListener {
-
-    /**
-     * Called when fast scrolling begins
-     */
-    void onFastScrollStart(OmegaFastScrollerLayout fastScrollerLayout);
-
-    /**
-     * Called when fast scrolling ends
-     */
-    void onFastScrollStop(OmegaFastScrollerLayout fastScrollerLayout);
-
-}
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollVisibility.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollVisibility.java
new file mode 100644
index 0000000..7136f62
--- /dev/null
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollVisibility.java
@@ -0,0 +1,10 @@
+package com.omega_r.libs.omegarecyclerview_fastscroll;
+
+interface FastScrollVisibility {
+
+    int NONE = 0;
+    int SCROLLBAR = 1;
+    int TRACK = 2;
+    int BUBBLE = 4;
+
+}
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
index 5b99269..c66d4a9 100644
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
@@ -1,42 +1,280 @@
 package com.omega_r.libs.omegarecyclerview_fastscroll;
 
+import android.animation.Animator;
+import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
-import android.view.ViewGroup;
-import android.view.ViewParent;
+import android.view.MotionEvent;
 
-import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
-
-import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
+
+import static com.omega_r.libs.omegarecyclerview_fastscroll.DrawableUtils.getTintedDrawable;
+import static com.omega_r.libs.omegarecyclerview_fastscroll.Position.LEFT;
+import static com.omega_r.libs.omegarecyclerview_fastscroll.Position.RIGHT;
+
 public class OmegaFastScrollRecyclerView extends OmegaRecyclerView {
 
-    private OmegaFastScrollerLayout mFastScrollerLayout;
+    private static final String TAG = OmegaFastScrollRecyclerView.class.getSimpleName();
+    private static final long ANIM_DURATION_IN_MILLIS = 300;
+    private static final long TRACK_HIDE_DELAY_IN_MILLIS = 1000;
+
+    private final OnScrollListener mScrollListener = new OnScrollListener() {
+
+        private boolean isFirstScroll = true;
+
+        @Override
+        public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+            if (!isEnabled() || mFastScrollAdapter == null) return;
+            OmegaFastScrollRecyclerView.this.onScrollScreenStateChanged(newState);
+        }
+
+        @Override
+        public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+            if (isFirstScroll) {
+                isFirstScroll = false;
+                return;
+            }
+            if (!isEnabled() || mFastScrollAdapter == null) return;
+            OmegaFastScrollRecyclerView.this.onScrolled();
+        }
+    };
+
+    private Runnable mHiderRunnable = new Runnable() {
+        @Override
+        public void run() {
+            cancelAllAnimations();
+            if (isShowTrack() && isAutoHideTrack()) hideTrack();
+            if (isShowScrollbar() && isAutoHideScrollbar()) hideScrollbar();
+        }
+    };
+
+    @Nullable
+    private FastScrollAdapter mFastScrollAdapter;
+    private Drawable mTrackDrawable;
+    private Drawable mBubbleUpDrawable;
+    private Drawable mBubbleDownDrawable;
+    @Nullable
+    private Drawable mBubbleDrawable;
+
+    private final Paint mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    private final Rect mTextBounds = new Rect();
+    private String mSectionText;
+
+    private Position mPosition = RIGHT;
 
-    public OmegaFastScrollRecyclerView(@NonNull Context context) {
+    private int mTrackPaddingLeft;
+    private int mTrackPaddingTop;
+    private int mTrackPaddingRight;
+    private int mTrackPaddingBottom;
+
+    private final Rect mScrollbarBounds = new Rect();
+    private final Paint mScrollbarPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+    private final ValueAnimator mShowTrackAnimator = ValueAnimator.ofInt().setDuration(ANIM_DURATION_IN_MILLIS);
+    private final ValueAnimator mHideTrackAnimator = ValueAnimator.ofInt().setDuration(ANIM_DURATION_IN_MILLIS);
+    private final ValueAnimator mShowScrollbarAnimator = ValueAnimator.ofInt().setDuration(ANIM_DURATION_IN_MILLIS);
+    private final ValueAnimator mHideScrollbarAnimator = ValueAnimator.ofInt().setDuration(ANIM_DURATION_IN_MILLIS);
+
+    private int mElementsVisibility = FastScrollVisibility.NONE;
+    private int mAutoHide = FastScrollAutoHide.NONE;
+
+    private boolean mIsScrollbarVisible;
+    private boolean mIsTrackVisible;
+    private boolean mIsTrackTouched;
+
+    private float mActionDownYDiff;
+
+    public OmegaFastScrollRecyclerView(Context context) {
         super(context);
-        init(context, null);
+        init(context, null, 0);
     }
 
-    public OmegaFastScrollRecyclerView(@NonNull Context context, @Nullable AttributeSet attrs) {
+    public OmegaFastScrollRecyclerView(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
-        init(context, attrs);
+        init(context, attrs, 0);
     }
 
-    public OmegaFastScrollRecyclerView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyle) {
+    public OmegaFastScrollRecyclerView(Context context, @Nullable AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-        init(context, attrs);
+        init(context, attrs, defStyle);
+    }
+
+    private void init(Context context, @Nullable AttributeSet attrs, int defStyle) {
+        mPosition = ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL ? LEFT : RIGHT;
+        mTrackDrawable = ContextCompat.getDrawable(context, R.drawable.ic_track);
+        mBubbleUpDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_up);
+        mBubbleDownDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_down);
+
+        mTrackPaddingLeft = getResources().getDimensionPixelSize(R.dimen.omega_track_padding_left);
+        mTrackPaddingTop = getResources().getDimensionPixelSize(R.dimen.omega_track_padding_top);
+        mTrackPaddingRight = getResources().getDimensionPixelSize(R.dimen.omega_track_padding_right);
+        mTrackPaddingBottom = getResources().getDimensionPixelSize(R.dimen.omega_track_padding_bottom);
+
+        mScrollbarPaint.setStyle(Paint.Style.FILL);
+
+        mTextPaint.setColor(Color.WHITE);
+        mTextPaint.setTextSize(90);
+        mTextPaint.setTextAlign(Paint.Align.CENTER);
+
+        if (attrs != null) {
+            TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.OmegaFastScrollRecyclerView);
+            initAttrs(typedArray);
+            typedArray.recycle();
+        }
+
+        if (isShowScrollbar() && !isAutoHideScrollbar()) mIsScrollbarVisible = true;
+        if (isShowTrack() && !isAutoHideTrack()) mIsTrackVisible = true;
+
+        initAnimators();
+        addOnScrollListener(mScrollListener);
+        setWillNotDraw(false);
     }
 
-    private void init(@NonNull Context context, @Nullable AttributeSet attrs) {
-        mFastScrollerLayout = new OmegaFastScrollerLayout(context, attrs);
+    private void initAttrs(@NonNull TypedArray typedArray) {
+        Drawable trackDrawable = typedArray.getDrawable(R.styleable.OmegaFastScrollRecyclerView_trackDrawable);
+        if (trackDrawable != null) mTrackDrawable = trackDrawable;
+        int trackColor = typedArray.getColor(R.styleable.OmegaFastScrollRecyclerView_omega_trackColor, Color.TRANSPARENT);
+        if (trackColor != Color.TRANSPARENT) mTrackDrawable = getTintedDrawable(mTrackDrawable, trackColor);
+
+        Drawable bubbleUp = typedArray.getDrawable(R.styleable.OmegaFastScrollRecyclerView_bubbleUpDrawable);
+        if (bubbleUp != null) mBubbleUpDrawable = bubbleUp;
+        int bubbleUpColor = typedArray.getColor(R.styleable.OmegaFastScrollRecyclerView_bubbleUpColor, Color.TRANSPARENT);
+        if (bubbleUpColor != Color.TRANSPARENT) mBubbleUpDrawable = getTintedDrawable(mBubbleUpDrawable, bubbleUpColor);
+
+        Drawable bubbleDown = typedArray.getDrawable(R.styleable.OmegaFastScrollRecyclerView_bubbleDownDrawable);
+        if (bubbleDown != null) mBubbleDownDrawable = bubbleDown;
+        int bubbleDownColor = typedArray.getColor(R.styleable.OmegaFastScrollRecyclerView_bubbleDownColor, Color.TRANSPARENT);
+        if (bubbleUpColor != Color.TRANSPARENT) mBubbleDownDrawable = getTintedDrawable(mBubbleDownDrawable, bubbleDownColor);
+
+        int position = typedArray.getInt(R.styleable.OmegaFastScrollRecyclerView_position, 0);
+        if (position == 0) {
+            mPosition = ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL ? LEFT : RIGHT;
+        } else {
+            mPosition = Position.values()[position];
+        }
+
+        int trackPadding = typedArray.getDimensionPixelSize(R.styleable.OmegaFastScrollRecyclerView_fastScrollTrackPadding, -1);
+        if (trackPadding != -1) {
+            mTrackPaddingLeft = trackPadding;
+            mTrackPaddingTop = trackPadding;
+            mTrackPaddingRight = trackPadding;
+            mTrackPaddingBottom = trackPadding;
+        }
+
+        mTrackPaddingLeft = typedArray.getDimensionPixelSize(
+                R.styleable.OmegaFastScrollRecyclerView_fastScrollTrackPaddingLeft,
+                mTrackPaddingLeft
+        );
+        mTrackPaddingTop = typedArray.getDimensionPixelSize(
+                R.styleable.OmegaFastScrollRecyclerView_fastScrollTrackPaddingTop,
+                mTrackPaddingTop
+        );
+        mTrackPaddingRight = typedArray.getDimensionPixelSize(
+                R.styleable.OmegaFastScrollRecyclerView_fastScrollTrackPaddingRight,
+                mTrackPaddingRight
+        );
+        mTrackPaddingBottom = typedArray.getDimensionPixelSize(
+                R.styleable.OmegaFastScrollRecyclerView_fastScrollTrackPaddingBottom,
+                mTrackPaddingBottom
+        );
+
+        mElementsVisibility = typedArray.getInt(R.styleable.OmegaFastScrollRecyclerView_fastScrollVisibility, FastScrollVisibility.NONE);
+        mAutoHide = typedArray.getInt(R.styleable.OmegaFastScrollRecyclerView_fastScrollAutoHide, FastScrollAutoHide.NONE);
+
+        int scrollbarColor = typedArray.getColor(R.styleable.OmegaFastScrollRecyclerView_fastScrollbarColor, Color.TRANSPARENT);
+        if (scrollbarColor != Color.TRANSPARENT) mScrollbarPaint.setColor(scrollbarColor);
+        int scrollbarWidth = typedArray.getDimensionPixelSize(R.styleable.OmegaFastScrollRecyclerView_fastScrollbarWidth, 0);
+        if (scrollbarWidth >= 0) mScrollbarPaint.setStrokeWidth(scrollbarWidth);
+    }
+
+    private void initAnimators() {
+        ValueAnimator.AnimatorUpdateListener scrollbarAnimator = new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                int left = (int) animation.getAnimatedValue();
+                int right = (int) (left + mScrollbarPaint.getStrokeWidth());
+                mScrollbarBounds.set(left, mScrollbarBounds.top, right, mScrollbarBounds.bottom);
+                invalidate();
+            }
+        };
+        mShowScrollbarAnimator.addUpdateListener(scrollbarAnimator);
+        mShowScrollbarAnimator.addListener(new AnimatorListener() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mIsScrollbarVisible = true;
+            }
+        });
+        mHideScrollbarAnimator.addUpdateListener(scrollbarAnimator);
+        mHideScrollbarAnimator.addListener(new AnimatorListener() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mIsScrollbarVisible = false;
+            }
+        });
+
+        ValueAnimator.AnimatorUpdateListener trackAnimator = new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                int left = (int) animation.getAnimatedValue();
+                int right = left + mTrackDrawable.getIntrinsicWidth();
+                Rect bounds = mTrackDrawable.getBounds();
+                mTrackDrawable.setBounds(left, bounds.top, right, bounds.bottom);
+                invalidate();
+            }
+        };
+        mShowTrackAnimator.addUpdateListener(trackAnimator);
+        mShowTrackAnimator.addListener(new AnimatorListener() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mIsTrackVisible = true;
+            }
+        });
+        mHideTrackAnimator.addUpdateListener(trackAnimator);
+        mHideTrackAnimator.addListener(new AnimatorListener() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mIsTrackVisible = false;
+            }
+        });
     }
 
     @Override
-    public final void setAdapter(RecyclerView.Adapter adapter) {
+    protected void onSizeChanged(int width, int height, int oldw, int oldh) {
+        super.onSizeChanged(width, height, oldw, oldh);
+        if (isShowScrollbar()) {
+            boolean isAutoHideScrollbar = isAutoHideScrollbar();
+            if (isAutoHideScrollbar) {
+                mScrollbarBounds.set(mScrollbarBounds.left, 0, mScrollbarBounds.right, height);
+                return;
+            }
+
+            int scrollbarWidth = (int) mScrollbarPaint.getStrokeWidth();
+            int left = 0;
+            int right = scrollbarWidth;
+            if (mPosition == RIGHT) {
+                right = getWidth();
+                left = right - scrollbarWidth;
+            }
+            mScrollbarBounds.set(left, 0, right, height);
+        }
+    }
+
+    @Override
+    public void setAdapter(RecyclerView.Adapter adapter) {
         super.setAdapter(adapter);
         if (adapter instanceof FastScrollAdapter) {
             setSectionIndexer((FastScrollAdapter) adapter);
@@ -46,119 +284,338 @@ public final void setAdapter(RecyclerView.Adapter adapter) {
     }
 
     @Override
-    public final void setVisibility(int visibility) {
-        super.setVisibility(visibility);
-        mFastScrollerLayout.setVisibility(visibility);
-    }
-
-    /**
-     * Set the [FastScrollAdapter] for the [FastScroller].
-     *
-     * @param indexer The FastScrollAdapter that provides section text for the FastScroller
-     */
-    public final void setSectionIndexer(FastScrollAdapter indexer) {
-        mFastScrollerLayout.setSectionIndexer(indexer);
-    }
-
-    /**
-     * Set the enabled state of fast scrolling.
-     *
-     * @param enabled True to enable fast scrolling, false otherwise
-     */
-    public final void setFastScrollEnabled(boolean enabled) {
-        mFastScrollerLayout.setEnabled(enabled);
-    }
-
-    /**
-     * Hide the scrollbar when not scrolling.
-     *
-     * @param hide True to hide the scrollbar, false to show
-     */
-    public final void setHideScrollbar(boolean hide) {
-        mFastScrollerLayout.setHideScrollbar(hide);
-    }
-
-
-    /**
-     * Display a scroll track while scrolling.
-     *
-     * @param visible True to show scroll track, false to hide
-     */
-    public final void setTrackVisible(boolean visible) {
-        mFastScrollerLayout.setTrackVisible(visible);
-    }
-
-    /**
-     * Set the color of the scroll track.
-     *
-     * @param color The color for the scroll track
-     */
-    public final void setTrackColor(@ColorInt int color) {
-        mFastScrollerLayout.setTrackColor(color);
-    }
-
-    /**
-     * Set the color for the scroll handle.
-     *
-     * @param color The color for the scroll handle
-     */
-    public final void setHandleColor(@ColorInt int color) {
-        mFastScrollerLayout.setHandleColor(color);
-    }
-
-    /**
-     * Show the section bubble while scrolling.
-     *
-     * @param visible True to show the bubble, false to hide
-     */
-    public final void setBubbleVisible(boolean visible) {
-        mFastScrollerLayout.setBubbleVisible(visible);
-    }
-
-    /**
-     * Set the background color of the index bubble.
-     *
-     * @param color The background color for the index bubble
-     */
-    public final void setBubbleColor(@ColorInt int color) {
-        mFastScrollerLayout.setBubbleColor(color);
-    }
-
-    /**
-     * Set the text color of the index bubble.
-     *
-     * @param color The text color for the index bubble
-     */
-    public final void setBubbleTextColor(@ColorInt int color) {
-        mFastScrollerLayout.setBubbleTextColor(color);
-    }
-
-    /**
-     * Set the fast scroll state change listener.
-     *
-     * @param listener The interface that will listen to fastscroll state change events
-     */
-    public final void setFastScrollStateChangeListener(FastScrollStateChangeListener listener) {
-        mFastScrollerLayout.setFastScrollStateChangeListener(listener);
+    @SuppressLint("ClickableViewAccessibility")
+    public boolean onTouchEvent(MotionEvent event) {
+        if (!isEnabled() || getVisibility() != VISIBLE) return super.onTouchEvent(event);
+
+        int action = event.getAction();
+        float eventX = event.getX();
+        float eventY = event.getY();
+
+        switch (action) {
+            case MotionEvent.ACTION_DOWN:
+                boolean isScrollbarTouched = isScrollbarTouched(eventX);
+                boolean isTrackTouched = isTrackTouched(eventX, eventY);
+                if (isShowScrollbar() || isShowTrack()) {
+                    mIsTrackTouched = isTrackTouched || isScrollbarTouched;
+                    if (mIsTrackTouched) {
+                        mActionDownYDiff = isTrackTouched ? mTrackDrawable.getBounds().top - eventY : 0;
+                        requestDisallowInterceptTouchEvent(true);
+                        if (!isTrackTouched) {
+                            removeOnScrollListener(mScrollListener);
+                            int halfHeight = mTrackDrawable.getIntrinsicHeight() / 2;
+                            updateRecyclerViewPosition(eventY - halfHeight);
+                            onScrolled(eventY - halfHeight);
+                        }
+                        return true;
+                    }
+                }
+            case MotionEvent.ACTION_MOVE:
+                if (mIsTrackTouched) {
+                    removeOnScrollListener(mScrollListener);
+                    float y = Math.min(getHeight(), Math.max(0, eventY + mActionDownYDiff));
+                    updateRecyclerViewPosition(y);
+                    onScrolled(y);
+                    return true;
+                }
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+                if (mIsTrackTouched) {
+                    postDelayed(mHiderRunnable, TRACK_HIDE_DELAY_IN_MILLIS);
+                    requestDisallowInterceptTouchEvent(false);
+                    mIsTrackTouched = false;
+                    invalidate();
+                    addOnScrollListener(mScrollListener);
+                    return true;
+                }
+        }
+        return super.onTouchEvent(event);
     }
 
-    @Override
-    protected final void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        mFastScrollerLayout.attachRecyclerView(this);
+    private boolean isTrackTouched(float eventX, float eventY) {
+        Rect bounds = mTrackDrawable.getBounds();
+        int left = bounds.left - mTrackPaddingLeft;
+        int right = bounds.right + mTrackPaddingRight;
+        int top = bounds.top + mTrackPaddingTop;
+        int bottom = bounds.bottom + mTrackPaddingBottom;
+        return left <= eventX && eventX <= right && top <= eventY && eventY <= bottom;
+    }
+
+    private boolean isScrollbarTouched(float eventX) {
+        return eventX >= mScrollbarBounds.left && eventX <= mScrollbarBounds.right;
+    }
+
+    private void updateRecyclerViewPosition(float eventY) {
+        RecyclerView.LayoutManager layoutManager = getLayoutManager();
+        RecyclerView.Adapter adapter = getAdapter();
+        if (layoutManager == null || adapter == null) return;
+
+        int itemCount = adapter.getItemCount();
+        float positionPercent = (eventY * 100) / getHeight();
+        int newPosition = (int) ((itemCount * positionPercent) / 100);
+
+        if (layoutManager instanceof LinearLayoutManager) {
+            ((LinearLayoutManager) layoutManager).scrollToPositionWithOffset(newPosition, 0);
+        } else {
+            layoutManager.scrollToPosition(newPosition);
+        }
+    }
+
+    private boolean isTrackVisible() {
+        return mIsTrackVisible || mShowTrackAnimator.isRunning();
+    }
 
-        ViewParent parent = getParent();
+    private boolean isScrollbarVisible() {
+        return mIsScrollbarVisible || mShowScrollbarAnimator.isRunning();
+    }
+
+    public final void setSectionIndexer(FastScrollAdapter adapter) {
+        mFastScrollAdapter = adapter;
+        invalidate();
+    }
+
+    private void onScrollScreenStateChanged(int newState) {
+        switch (newState) {
+            case RecyclerView.SCROLL_STATE_DRAGGING:
+                removeCallbacks(mHiderRunnable);
+                cancelAllAnimations();
+                if (isShowScrollbar() && isAutoHideScrollbar() && !isScrollbarVisible()) showScrollbar();
+                if (isShowTrack() && isAutoHideTrack() && !isTrackVisible()) showTrack();
+                break;
+            case RecyclerView.SCROLL_STATE_IDLE:
+                postDelayed(mHiderRunnable, TRACK_HIDE_DELAY_IN_MILLIS);
+                break;
+        }
+    }
+
+    private void cancelAllAnimations() {
+        cancelAnimation(mShowTrackAnimator, mHideTrackAnimator, mShowScrollbarAnimator, mHideScrollbarAnimator);
+    }
+
+    private void cancelAnimation(Animator... animators) {
+        for (Animator animator : animators) animator.cancel();
+    }
+
+    private void showTrack() {
+        Rect bounds = mTrackDrawable.getBounds();
+        int trackWidth = mTrackDrawable.getIntrinsicWidth();
+        int from = 0;
+        int to = 0;
+        switch (mPosition) {
+            case LEFT:
+                from = bounds.left == 0 ? -trackWidth : bounds.left;
+                to = mTrackPaddingLeft;
+                break;
+            case RIGHT:
+                from = bounds.right == 0 ? getWidth() : bounds.left;
+                to = getWidth() - mTrackPaddingRight - trackWidth;
+                break;
+        }
+        mShowTrackAnimator.setIntValues(from, to);
+        mShowTrackAnimator.start();
+    }
+
+    private void hideTrack() {
+        Rect bounds = mTrackDrawable.getBounds();
+        int from = 0;
+        int to = 0;
+        switch (mPosition) {
+            case LEFT:
+                from = bounds.left;
+                to = -mTrackDrawable.getIntrinsicWidth();
+                break;
+            case RIGHT:
+                from = bounds.left;
+                to = getWidth();
+                break;
+        }
+        mHideTrackAnimator.setIntValues(from, to);
+        mHideTrackAnimator.start();
+    }
+
+    private void showScrollbar() {
+        int scrollbarWidth = (int) mScrollbarPaint.getStrokeWidth();
+        Rect bounds = mScrollbarBounds;
+        int from = 0;
+        int to = 0;
+        switch (mPosition) {
+            case LEFT:
+                from = bounds.left == 0 ? -scrollbarWidth : bounds.left;
+                to = 0;
+                break;
+            case RIGHT:
+                from = bounds.right == 0 ? getWidth() : bounds.right;
+                to = getWidth() - scrollbarWidth;
+                break;
+        }
+        mShowScrollbarAnimator.setIntValues(from, to);
+        mShowScrollbarAnimator.start();
+    }
+
+    private void hideScrollbar() {
+        Rect bounds = mScrollbarBounds;
+        int from = 0;
+        int to = 0;
+        switch (mPosition) {
+            case LEFT:
+                from = bounds.left;
+                to = (int) -mScrollbarPaint.getStrokeWidth();
+                break;
+            case RIGHT:
+                from = bounds.left;
+                to = getWidth();
+                break;
+        }
+        mHideScrollbarAnimator.setIntValues(from, to);
+        mHideScrollbarAnimator.start();
+    }
+
+    private void onScrolled() {
+        int width = getWidth();
+        int height = getHeight();
+
+        int scrollPosition = getScrollPosition();
+        updateTrackPosition(height, width, scrollPosition);
+        updateBubblePosition(height, width, scrollPosition);
+        invalidate();
+    }
+
+    private int getScrollPosition() {
+        int height = getHeight();
+        int scrollRange = computeVerticalScrollRange() - height;
+        int scrollOffset = computeVerticalScrollOffset();
+        double scrollPercents = (scrollOffset == 0) ? 0 : (scrollOffset * 100.0 / scrollRange);
+        height = height - mTrackPaddingTop - mTrackPaddingBottom - mTrackDrawable.getIntrinsicHeight();
+
+        return (int) (mTrackPaddingTop + ((height * scrollPercents) / 100));
+    }
+
+    private void onScrolled(float eventY) {
+        int width = getWidth();
+        int height = getHeight();
+        int scrollPosition = (int) eventY;
+        updateTrackPosition(height, width, scrollPosition);
+        updateBubblePosition(height, width, scrollPosition);
+        invalidate();
+    }
+
+    private void updateTrackPosition(int screenHeight, int screenWidth, int scrollPosition) {
+        boolean isAnimationRunning = mShowTrackAnimator != null && mShowTrackAnimator.isRunning() ||
+                mHideTrackAnimator != null && mHideTrackAnimator.isRunning();
 
-        if (parent instanceof ViewGroup) {
-            ((ViewGroup) parent).addView(mFastScrollerLayout);
-            mFastScrollerLayout.setLayoutParams((ViewGroup) parent);
+        Rect bounds = mTrackDrawable.getBounds();
+        int trackWidth = mTrackDrawable.getIntrinsicWidth();
+        int trackHeight = mTrackDrawable.getIntrinsicHeight();
+
+        int formattedTop = scrollPosition < mTrackPaddingTop ? mTrackPaddingTop : scrollPosition;
+        if (formattedTop + trackHeight + mTrackPaddingBottom >= screenHeight) {
+            formattedTop = screenHeight - trackHeight - mTrackPaddingBottom;
+        }
+        int bottom = formattedTop + trackHeight;
+
+        int left = 0;
+        int right = 0;
+        switch (mPosition) {
+            case LEFT:
+                left = isAnimationRunning ? bounds.left : mTrackPaddingLeft;
+                right = isAnimationRunning ? bounds.right : mTrackPaddingLeft + trackWidth;
+                break;
+            case RIGHT:
+                left = isAnimationRunning ? bounds.left : (screenWidth - mTrackPaddingRight - trackWidth);
+                right = isAnimationRunning ? bounds.right : (screenWidth - mTrackPaddingRight);
+                break;
+        }
+        mTrackDrawable.setBounds(left, formattedTop, right, bottom);
+    }
+
+    private void updateBubblePosition(int screenHeight, int screenWidth, int scrollPosition) {
+        int halfScreenHeight = screenHeight / 2;
+        boolean isHalfScrolled = scrollPosition + (mTrackDrawable.getIntrinsicHeight() / 2) >= halfScreenHeight;
+        mBubbleDrawable = isHalfScrolled ? mBubbleDownDrawable : mBubbleUpDrawable;
+
+        int intrinsicWidth = mBubbleDrawable.getIntrinsicWidth();
+        int intrinsicHeight = mBubbleDrawable.getIntrinsicHeight();
+        int trackCenterY = mTrackDrawable.getBounds().centerY();
+        int trackWidth = mTrackDrawable.getIntrinsicWidth() + mTrackPaddingLeft + mTrackPaddingRight;
+
+        int top = isHalfScrolled ? trackCenterY - intrinsicHeight : trackCenterY;
+        int bottom = top + intrinsicHeight;
+        switch (mPosition) {
+            case LEFT:
+                mBubbleDrawable.setBounds(trackWidth, top, trackWidth + intrinsicWidth, bottom);
+                break;
+            case RIGHT:
+                mBubbleDrawable.setBounds(screenWidth - trackWidth - intrinsicWidth, top, screenWidth - trackWidth, bottom);
+                break;
         }
     }
 
+    private void updateSectionText(int adapterPosition) {
+        if (mFastScrollAdapter == null || mBubbleDrawable == null || adapterPosition < 0) return;
+        mSectionText = "T";
+        mFastScrollAdapter.getFastScrollSection(adapterPosition);
+        if (mSectionText == null) return;
+        Rect mBubbleBounds = mBubbleDrawable.getBounds();
+        int centerY = mBubbleBounds.centerY();
+        int centerX = mBubbleBounds.centerX();
+        mTextPaint.getTextBounds(mSectionText, 0, mSectionText.length() - 1, mTextBounds);
+        int halfTextWidth = mTextBounds.width() / 2;
+        int halfTextHeight = mTextBounds.height() / 2;
+        mTextBounds.set(centerX - halfTextWidth, centerY - halfTextHeight, centerX + halfTextWidth, centerY + halfTextHeight);
+    }
+
+    private boolean isShowScrollbar() {
+        return (mElementsVisibility & FastScrollVisibility.SCROLLBAR) == FastScrollVisibility.SCROLLBAR;
+    }
+
+    private boolean isShowTrack() {
+        return (mElementsVisibility & FastScrollVisibility.TRACK) == FastScrollVisibility.TRACK;
+    }
+
+    private boolean isShowBubble() {
+        return (mElementsVisibility & FastScrollVisibility.BUBBLE) == FastScrollVisibility.BUBBLE;
+    }
+
+    private boolean isAutoHideScrollbar() {
+        return (mAutoHide & FastScrollAutoHide.SCROLLBAR) == FastScrollAutoHide.SCROLLBAR;
+    }
+
+    private boolean isAutoHideTrack() {
+        return (mAutoHide & FastScrollAutoHide.TRACK) == FastScrollAutoHide.TRACK;
+    }
+
+    private boolean isAutoHideBubble() {
+        return (mAutoHide & FastScrollAutoHide.BUBBLE) == FastScrollAutoHide.BUBBLE;
+    }
+
     @Override
-    protected final void onDetachedFromWindow() {
-        mFastScrollerLayout.detachRecyclerView();
-        super.onDetachedFromWindow();
+    public void draw(Canvas canvas) {
+        super.draw(canvas);
+        RecyclerView.Adapter adapter = getAdapter();
+        if (adapter == null || adapter.getItemCount() == 0) return;
+
+        if (isShowScrollbar()) {
+            canvas.drawRect(mScrollbarBounds, mScrollbarPaint);
+        }
+        if (isShowTrack()) {
+            mTrackDrawable.draw(canvas);
+        }
+        if (isShowBubble() && mBubbleDrawable != null) {
+            mBubbleDrawable.draw(canvas);
+            drawText(canvas);
+        }
+    }
+
+    private void drawText(Canvas canvas) {
+        LayoutManager layoutManager = getLayoutManager();
+        if (!(layoutManager instanceof LinearLayoutManager)) return;
+        if (mFastScrollAdapter == null) return;
+        int position = ((LinearLayoutManager) layoutManager).findFirstVisibleItemPosition();
+        if (position == RecyclerView.NO_POSITION) return;
+
+        mFastScrollAdapter.getFastScrollSection(position);
+
+
     }
 
 }
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollerLayout.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollerLayout.java
deleted file mode 100644
index b897cdc..0000000
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollerLayout.java
+++ /dev/null
@@ -1,520 +0,0 @@
-package com.omega_r.libs.omegarecyclerview_fastscroll;
-
-import android.animation.Animator;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import androidx.annotation.ColorInt;
-import androidx.annotation.IdRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.constraintlayout.widget.ConstraintSet;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.core.view.GravityCompat;
-import androidx.core.view.ViewCompat;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.StaggeredGridLayoutManager;
-
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewPropertyAnimator;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-public class OmegaFastScrollerLayout extends LinearLayout {
-
-    private static final AnimatorListener sDefaultAnimatorListener = new AnimatorListener();
-    private static final long BUBBLE_ANIM_DURATION_IN_MILLIS = 100;
-    private static final long SCROLLBAR_ANIM_DURATION_IN_MILLIS = 300;
-    private static final long SCROLLBAR_HIDE_DELAY_IN_MILLIS = 1000;
-    private static final long TRACK_SNAP_RANGE = 5;
-
-    private RecyclerView mRecyclerView;
-    private TextView mBubbleTextView;
-    private ImageView mHandleImageView;
-    private ImageView mTrackImageView;
-    private View mScrollbarContainer;
-    private Drawable mBubbleImageUpDrawable;
-    private Drawable mBubbleImageDownDrawable;
-    private Drawable mHandleImageDrawable;
-    private Drawable mTrackImageDrawable;
-
-    @ColorInt
-    private int mBubbleColor;
-    @ColorInt
-    private int mHandleColor;
-    private int mBubbleHeight;
-    private int mHandleHeight;
-    private int mViewHeight;
-    private boolean mHideScrollbar;
-    private boolean mShowBubble;
-    private FastScrollAdapter mFastScrollAdapter;
-    private ViewPropertyAnimator mScrollbarAnimator;
-    private ViewPropertyAnimator mBubbleAnimator;
-    private FastScrollStateChangeListener mFastScrollStateChangeListener;
-    private final Runnable mScrollbarHider = new Runnable() {
-        @Override
-        public void run() {
-            hideScrollbar();
-        }
-    };
-    private RecyclerView.OnScrollListener mScrollListener = new RecyclerView.OnScrollListener() {
-
-        @Override
-        public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-            if (!mHandleImageView.isSelected() && isEnabled()) {
-                setViewPositions(getScrollProportion(recyclerView));
-            }
-        }
-
-        @Override
-        public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
-            super.onScrollStateChanged(recyclerView, newState);
-            if (!isEnabled()) return;
-            switch (newState) {
-                case RecyclerView.SCROLL_STATE_DRAGGING:
-                    getHandler().removeCallbacks(mScrollbarHider);
-                    cancelAnimation(mScrollbarAnimator);
-                    if (!isViewVisible(mScrollbarContainer)) showScrollbar();
-                    break;
-                case RecyclerView.SCROLL_STATE_IDLE:
-                    if (mHideScrollbar && !mHandleImageView.isSelected()) {
-                        getHandler().postDelayed(mScrollbarHider, SCROLLBAR_HIDE_DELAY_IN_MILLIS);
-                    }
-                    break;
-            }
-        }
-    };
-    private int mScrollbarPaddingEnd;
-    private Animator.AnimatorListener mHideScrollbarListener = new AnimatorListener() {
-        @Override
-        public void onAnimationEnd(Animator animation) {
-            onAnimationCancel(animation);
-        }
-
-        @Override
-        public void onAnimationCancel(Animator animation) {
-            mScrollbarContainer.setVisibility(View.GONE);
-            mScrollbarAnimator = null;
-        }
-    };
-    private Animator.AnimatorListener mHideBubbleListener = new AnimatorListener() {
-        @Override
-        public void onAnimationEnd(Animator animation) {
-            onAnimationCancel(animation);
-        }
-
-        @Override
-        public void onAnimationCancel(Animator animation) {
-            mBubbleTextView.setVisibility(View.GONE);
-            mBubbleAnimator = null;
-        }
-    };
-
-    public OmegaFastScrollerLayout(Context context) {
-        super(context);
-        init(context, null);
-    }
-
-    public OmegaFastScrollerLayout(Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        init(context, attrs);
-    }
-
-    public OmegaFastScrollerLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init(context, attrs);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    public OmegaFastScrollerLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        init(context, attrs);
-    }
-
-    private void init(Context context, @Nullable AttributeSet attrs) {
-        inflate(context, R.layout.view_fastscroller, this);
-        setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT));
-        setClipChildren(false);
-        setOrientation(HORIZONTAL);
-
-        mScrollbarPaddingEnd = getResources().getDimensionPixelSize(R.dimen.fastscroll_scrollbar_padding_end);
-        mBubbleTextView = findViewById(R.id.textview_bubble);
-        mHandleImageView = findViewById(R.id.imageview_handle);
-        mTrackImageView = findViewById(R.id.imageview_track);
-        mScrollbarContainer = findViewById(R.id.scrollbar_container);
-
-        @ColorInt int bubbleColor = Color.GRAY;
-        @ColorInt int handleColor = Color.DKGRAY;
-        @ColorInt int trackColor = Color.LTGRAY;
-        @ColorInt int textColor = Color.WHITE;
-
-        boolean hideScrollbar = true;
-        boolean showBubble = true;
-        boolean showTrack = false;
-
-        if (attrs != null) {
-            TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.OmegaFastScrollerLayout, 0, 0);
-
-            bubbleColor = typedArray.getColor(R.styleable.OmegaFastScrollerLayout_bubbleColor, bubbleColor);
-            handleColor = typedArray.getColor(R.styleable.OmegaFastScrollerLayout_handleColor, handleColor);
-            trackColor = typedArray.getColor(R.styleable.OmegaFastScrollerLayout_trackColor, trackColor);
-            textColor = typedArray.getColor(R.styleable.OmegaFastScrollerLayout_bubbleTextColor, textColor);
-            hideScrollbar = typedArray.getBoolean(R.styleable.OmegaFastScrollerLayout_hideScrollbar, hideScrollbar);
-            showBubble = typedArray.getBoolean(R.styleable.OmegaFastScrollerLayout_showBubble, showBubble);
-            showTrack = typedArray.getBoolean(R.styleable.OmegaFastScrollerLayout_showTrack, showTrack);
-            typedArray.recycle();
-        }
-        mTrackImageDrawable = ContextCompat.getDrawable(context, R.drawable.ic_track);
-        mHandleImageDrawable = ContextCompat.getDrawable(context, R.drawable.ic_handle);
-        mBubbleImageUpDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_up);
-        mBubbleImageDownDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_down);
-
-        setTrackColor(trackColor);
-        setHandleColor(handleColor);
-        setBubbleColor(bubbleColor);
-        setBubbleTextColor(textColor);
-        setHideScrollbar(hideScrollbar);
-        setBubbleVisible(showBubble);
-        setTrackVisible(showTrack);
-    }
-
-    @Override
-    public void setLayoutParams(ViewGroup.LayoutParams params) {
-        params.width = LayoutParams.WRAP_CONTENT;
-        super.setLayoutParams(params);
-    }
-
-    final void setLayoutParams(ViewGroup viewGroup) {
-        @IdRes int recyclerViewId = mRecyclerView == null ? View.NO_ID : mRecyclerView.getId();
-
-        if (recyclerViewId == View.NO_ID) {
-            throw new IllegalArgumentException("RecyclerView must have a view ID");
-        }
-
-        int marginTop = getResources().getDimensionPixelSize(R.dimen.fastscroll_scrollbar_margin_top);
-        int marginBottom = getResources().getDimensionPixelSize(R.dimen.fastscroll_scrollbar_margin_bottom);
-
-        if (viewGroup instanceof ConstraintLayout) {
-            ConstraintSet constraintSet = new ConstraintSet();
-            int id = getId();
-            constraintSet.clone((ConstraintLayout) viewGroup);
-            constraintSet.connect(id, ConstraintSet.TOP, recyclerViewId, ConstraintSet.TOP);
-            constraintSet.connect(id, ConstraintSet.BOTTOM, recyclerViewId, ConstraintSet.BOTTOM);
-            constraintSet.connect(id, ConstraintSet.END, recyclerViewId, ConstraintSet.END);
-            constraintSet.applyTo((ConstraintLayout) viewGroup);
-            ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) getLayoutParams();
-            layoutParams.setMargins(0, marginTop, 0, marginBottom);
-            setLayoutParams(layoutParams);
-        } else if (viewGroup instanceof CoordinatorLayout) {
-            CoordinatorLayout.LayoutParams layoutParams = (CoordinatorLayout.LayoutParams) getLayoutParams();
-            layoutParams.setAnchorId(recyclerViewId);
-            layoutParams.anchorGravity = GravityCompat.END;
-            layoutParams.setMargins(0, marginTop, 0, marginBottom);
-            setLayoutParams(layoutParams);
-        } else if (viewGroup instanceof FrameLayout) {
-            FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) getLayoutParams();
-            layoutParams.gravity = GravityCompat.END;
-            layoutParams.setMargins(0, marginTop, 0, marginBottom);
-            setLayoutParams(layoutParams);
-        } else if (viewGroup instanceof RelativeLayout) {
-            RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
-            int endRule = Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 ?
-                    RelativeLayout.ALIGN_END : RelativeLayout.ALIGN_RIGHT;
-
-            layoutParams.addRule(RelativeLayout.ALIGN_TOP, recyclerViewId);
-            layoutParams.addRule(RelativeLayout.ALIGN_BOTTOM, recyclerViewId);
-            layoutParams.addRule(endRule, recyclerViewId);
-            layoutParams.setMargins(0, marginTop, 0, marginBottom);
-            setLayoutParams(layoutParams);
-        } else {
-            throw new IllegalArgumentException("Parent ViewGroup must be a ConstraintLayout, " +
-                    "CoordinatorLayout, FrameLayout, or RelativeLayout");
-        }
-        updateViewHeights();
-    }
-
-    private void updateViewHeights() {
-        int measureSpec = MeasureSpec.makeMeasureSpec(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
-        mBubbleTextView.measure(measureSpec, measureSpec);
-        mBubbleHeight = mBubbleTextView.getMeasuredHeight();
-        mHandleImageView.measure(measureSpec, measureSpec);
-        mHandleHeight = mHandleImageView.getMeasuredHeight();
-    }
-
-    public final void setSectionIndexer(@Nullable FastScrollAdapter fastScrollAdapter) {
-        mFastScrollAdapter = fastScrollAdapter;
-    }
-
-    public final void attachRecyclerView(RecyclerView recyclerView) {
-        detachRecyclerView();
-        this.mRecyclerView = recyclerView;
-        if (this.mRecyclerView != null) {
-            this.mRecyclerView.addOnScrollListener(mScrollListener);
-            post(new Runnable() {
-                @Override
-                public void run() {
-                    // set initial positions for bubble and handle
-                    setViewPositions(getScrollProportion(OmegaFastScrollerLayout.this.mRecyclerView));
-                }
-            });
-        }
-    }
-
-    public final void detachRecyclerView() {
-        if (mRecyclerView != null) {
-            mRecyclerView.removeOnScrollListener(mScrollListener);
-            mRecyclerView = null;
-        }
-    }
-
-    public final void setHideScrollbar(boolean hideScrollbar) {
-        this.mHideScrollbar = hideScrollbar;
-        mScrollbarContainer.setVisibility(hideScrollbar ? View.GONE : View.VISIBLE);
-    }
-
-    public final void setBubbleVisible(boolean visible) {
-        mShowBubble = visible;
-    }
-
-    public final void setTrackVisible(boolean visible) {
-        mTrackImageView.setVisibility(visible ? View.VISIBLE : View.GONE);
-    }
-
-    public final void setTrackColor(@ColorInt int color) {
-        DrawableCompat.setTint(mTrackImageDrawable, color);
-        mTrackImageView.setImageDrawable(mTrackImageDrawable);
-    }
-
-    public final void setHandleColor(@ColorInt int color) {
-        mHandleColor = color;
-        DrawableCompat.setTint(mHandleImageDrawable, mHandleColor);
-        mHandleImageView.setImageDrawable(mHandleImageDrawable);
-    }
-
-    public final void setBubbleColor(@ColorInt int color) {
-        mBubbleColor = color;
-
-        DrawableCompat.setTint(mBubbleImageUpDrawable, mBubbleColor);
-        DrawableCompat.setTint(mBubbleImageDownDrawable, mBubbleColor);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            mBubbleTextView.setBackground(mBubbleImageUpDrawable);
-        } else {
-            mBubbleTextView.setBackgroundDrawable(mBubbleImageUpDrawable);
-        }
-    }
-
-    public final void setBubbleTextColor(@ColorInt int color) {
-        mBubbleTextView.setTextColor(color);
-    }
-
-    public final void setFastScrollStateChangeListener(@Nullable FastScrollStateChangeListener listener) {
-        mFastScrollStateChangeListener = listener;
-    }
-
-    @Override
-    public void setEnabled(boolean enabled) {
-        super.setEnabled(enabled);
-        setVisibility(enabled ? VISIBLE : GONE);
-    }
-
-    @Override
-    @SuppressLint("ClickableViewAccessibility")
-    public boolean onTouchEvent(MotionEvent event) {
-        float y = event.getY();
-
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-                if (event.getX() < mHandleImageView.getX() - ViewCompat.getPaddingStart(mHandleImageView)) {
-                    return false;
-                }
-
-                requestDisallowInterceptTouchEvent(true);
-                setHandleSelected(true);
-                getHandler().removeCallbacks(mScrollbarHider);
-
-                cancelAnimation(mScrollbarAnimator);
-                cancelAnimation(mBubbleAnimator);
-
-                if (!isViewVisible(mScrollbarContainer)) {
-                    showScrollbar();
-                }
-                if (mShowBubble && mFastScrollAdapter != null) {
-                    showBubble();
-                }
-                if (mFastScrollStateChangeListener != null) {
-                    mFastScrollStateChangeListener.onFastScrollStart(this);
-                }
-                setViewPositions(y);
-                setRecyclerViewPosition(y);
-                return true;
-            case MotionEvent.ACTION_MOVE:
-                setViewPositions(y);
-                setRecyclerViewPosition(y);
-                return true;
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_CANCEL:
-                requestDisallowInterceptTouchEvent(false);
-                setHandleSelected(false);
-                if (mHideScrollbar) {
-                    getHandler().postDelayed(mScrollbarHider, SCROLLBAR_HIDE_DELAY_IN_MILLIS);
-                }
-                hideBubble();
-                if (mFastScrollStateChangeListener != null) {
-                    mFastScrollStateChangeListener.onFastScrollStop(this);
-                }
-
-                return true;
-        }
-
-        return super.onTouchEvent(event);
-    }
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-        mViewHeight = h;
-    }
-
-    private void setRecyclerViewPosition(float positionY) {
-        if (mRecyclerView == null) return;
-        RecyclerView.LayoutManager layoutManager = mRecyclerView.getLayoutManager();
-        if (layoutManager == null) return;
-        RecyclerView.Adapter adapter = mRecyclerView.getAdapter();
-        if (adapter == null) return;
-
-        int itemCount = adapter.getItemCount();
-        float proportion;
-        if (mHandleImageView.getY() == 0f) {
-            proportion = 0f;
-        } else if (mHandleImageView.getY() + mHandleHeight >= mViewHeight - TRACK_SNAP_RANGE) {
-            proportion = 1f;
-        } else {
-            proportion = positionY / mViewHeight;
-        }
-        int scrolledItemCount = Math.round(proportion * itemCount);
-
-        if (isLayoutReversed(layoutManager)) {
-            scrolledItemCount = itemCount - scrolledItemCount;
-        }
-        int targetPos = getValueInRange(itemCount - 1, scrolledItemCount);
-        layoutManager.scrollToPosition(targetPos);
-
-        if (mShowBubble && mFastScrollAdapter != null) {
-            mBubbleTextView.setText(mFastScrollAdapter.getFastScrollSection(targetPos));
-        }
-    }
-
-    private float getScrollProportion(@Nullable RecyclerView recyclerView) {
-        if (recyclerView == null) return 0f;
-
-        int verticalScrollOffset = recyclerView.computeVerticalScrollOffset();
-        int verticalScrollRange = recyclerView.computeVerticalScrollRange();
-        float rangeDiff = verticalScrollRange - mViewHeight;
-        float proportion = verticalScrollOffset / (rangeDiff > 0 ? rangeDiff : 1f);
-
-        return mViewHeight * proportion;
-    }
-
-    private void setViewPositions(float y) {
-        mBubbleHeight = mBubbleTextView.getHeight();
-        mHandleHeight = mHandleImageView.getHeight();
-
-        int bubbleY = getValueInRange(mViewHeight - mBubbleHeight, (int) y);
-        if (y > mViewHeight / 2) {
-            bubbleY = getValueInRange(mViewHeight - mBubbleHeight - mHandleHeight / 2, (int) (y - mBubbleHeight));
-            Drawable background = mBubbleTextView.getBackground();
-            if (background != null && background != mBubbleImageDownDrawable) {
-                ViewCompat.setBackground(mBubbleTextView, mBubbleImageDownDrawable);
-            }
-        } else {
-            Drawable background = mBubbleTextView.getBackground();
-            if (background != null && background != mBubbleImageUpDrawable) {
-                ViewCompat.setBackground(mBubbleTextView, mBubbleImageUpDrawable);
-            }
-        }
-        int handleY = getValueInRange(mViewHeight - mHandleHeight, (int) (y - mHandleHeight / 2));
-        if (mShowBubble) mBubbleTextView.setY(bubbleY);
-        mHandleImageView.setY(handleY);
-    }
-
-    private int getValueInRange(int max, int value) {
-        return Math.min(Math.max(0, value), max);
-    }
-
-    private boolean isLayoutReversed(RecyclerView.LayoutManager layoutManager) {
-        if (layoutManager instanceof LinearLayoutManager) {
-            return ((LinearLayoutManager) layoutManager).getReverseLayout();
-        } else if (layoutManager instanceof StaggeredGridLayoutManager) {
-            return ((StaggeredGridLayoutManager) layoutManager).getReverseLayout();
-        }
-        return false;
-    }
-
-    private boolean isViewVisible(@Nullable View view) {
-        return view != null && view.getVisibility() == View.VISIBLE;
-    }
-
-    private void cancelAnimation(@Nullable ViewPropertyAnimator animator) {
-        if (animator != null) animator.cancel();
-    }
-
-    private void showBubble() {
-        if (!isViewVisible(mBubbleTextView)) {
-            mBubbleTextView.setVisibility(View.VISIBLE);
-            mBubbleAnimator = mBubbleTextView.animate()
-                    .alpha(1f)
-                    .setDuration(BUBBLE_ANIM_DURATION_IN_MILLIS)
-                    .setListener(sDefaultAnimatorListener);
-        }
-    }
-
-    private void hideBubble() {
-        if (isViewVisible(mBubbleTextView)) {
-            mBubbleAnimator = mBubbleTextView.animate()
-                    .alpha(0f)
-                    .setDuration(BUBBLE_ANIM_DURATION_IN_MILLIS)
-                    .setListener(mHideBubbleListener);
-        }
-    }
-
-    private void showScrollbar() {
-        if (mRecyclerView != null && mRecyclerView.computeVerticalScrollRange() - mViewHeight > 0) {
-            mScrollbarContainer.setTranslationX(mScrollbarPaddingEnd);
-            mScrollbarContainer.setVisibility(View.VISIBLE);
-            mScrollbarAnimator = mScrollbarContainer.animate()
-                    .alpha(1f)
-                    .translationX(0f)
-                    .setDuration(SCROLLBAR_ANIM_DURATION_IN_MILLIS)
-                    .setListener(sDefaultAnimatorListener);
-        }
-    }
-
-    private void hideScrollbar() {
-        mScrollbarAnimator = mScrollbarContainer.animate()
-                .alpha(0f)
-                .translationX(mScrollbarPaddingEnd)
-                .setDuration(SCROLLBAR_ANIM_DURATION_IN_MILLIS)
-                .setListener(mHideScrollbarListener);
-    }
-
-    private void setHandleSelected(boolean selected) {
-        mHandleImageView.setSelected(selected);
-        DrawableCompat.setTint(mHandleImageDrawable, selected ? mBubbleColor : mHandleColor);
-    }
-
-}
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/Position.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/Position.java
new file mode 100644
index 0000000..748f223
--- /dev/null
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/Position.java
@@ -0,0 +1,8 @@
+package com.omega_r.libs.omegarecyclerview_fastscroll;
+
+enum Position {
+
+    LEFT,
+    RIGHT
+
+}
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up.xml b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up.xml
index d29183b..9bd12fe 100644
--- a/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up.xml
+++ b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:shape="rectangle">
 
-    <tools:solid android:color="#777777" />
+    <solid android:color="#777777" />
 
     <corners
         android:topLeftRadius="@dimen/fastscroll_bubble_radius"
diff --git a/omegarecyclerview_fastscroll/src/main/res/drawable/ic_track.xml b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_track.xml
index 7302d8c..1de78ec 100644
--- a/omegarecyclerview_fastscroll/src/main/res/drawable/ic_track.xml
+++ b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_track.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <tools:solid android:color="#CCCCCC" />
+    <solid android:color="@color/cardview_dark_background" />
 
-    <size android:width="@dimen/fastscroll_track_width" />
+    <size
+        android:width="10dp"
+        android:height="32dp" />
+
+    <corners android:radius="6dp"/>
 
 </shape>
diff --git a/omegarecyclerview_fastscroll/src/main/res/values/attrs.xml b/omegarecyclerview_fastscroll/src/main/res/values/attrs.xml
index b92bf06..94c6678 100644
--- a/omegarecyclerview_fastscroll/src/main/res/values/attrs.xml
+++ b/omegarecyclerview_fastscroll/src/main/res/values/attrs.xml
@@ -1,14 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <declare-styleable name="OmegaFastScrollerLayout">
-        <attr name="hideScrollbar" format="boolean" />
-        <attr name="showBubble" format="boolean" />
-        <attr name="showTrack" format="boolean" />
-        <attr name="trackColor" format="color" />
-        <attr name="handleColor" format="color" />
-        <attr name="bubbleColor" format="color" />
-        <attr name="bubbleTextColor" format="color" />
+    <!--<declare-styleable name="OmegaFastScrollerLayout">-->
+        <!--<attr name="hideScrollbar" format="boolean" />-->
+        <!--<attr name="showBubble" format="boolean" />-->
+        <!--<attr name="showTrack" format="boolean" />-->
+        <!--<attr name="trackColor" format="color" />-->
+        <!--<attr name="handleColor" format="color" />-->
+        <!--<attr name="bubbleColor" format="color" />-->
+        <!--<attr name="bubbleTextColor" format="color" />-->
+    <!--</declare-styleable>-->
+
+    <declare-styleable name="OmegaFastScrollRecyclerView">
+        <attr name="trackDrawable" format="reference"/>
+        <attr name="omega_trackColor" format="color"/>
+
+        <attr name="bubbleUpDrawable" format="reference"/>
+        <attr name="bubbleUpColor" format="color"/>
+        <attr name="bubbleDownDrawable" format="reference"/>
+        <attr name="bubbleDownColor" format="color"/>
+
+        <attr name="position" format="enum">
+            <enum name="auto" value="0"/>
+            <enum name="left" value="1"/>
+            <enum name="right" value="2"/>
+        </attr>
+
+        <attr name="fastScrollbarColor" format="color"/>
+        <attr name="fastScrollbarWidth" format="dimension"/>
+
+        <attr name="fastScrollTrackPadding" format="dimension"/>
+        <attr name="fastScrollTrackPaddingLeft" format="dimension"/>
+        <attr name="fastScrollTrackPaddingTop" format="dimension"/>
+        <attr name="fastScrollTrackPaddingRight" format="dimension"/>
+        <attr name="fastScrollTrackPaddingBottom" format="dimension"/>
+
+        <attr name="fastScrollVisibility" format="flags">
+            <flag name="none" value="0"/>
+            <flag name="scrollbar" value="1"/>
+            <flag name="track" value="2"/>
+            <flag name="bubble" value="4"/>
+        </attr>
+
+        <attr name="fastScrollAutoHide" format="flags">
+            <flag name="none" value="0"/>
+            <flag name="scrollbar" value="1"/>
+            <flag name="track" value="2"/>
+            <flag name="bubble" value="4"/>
+        </attr>
+
     </declare-styleable>
 
 </resources>
diff --git a/omegarecyclerview_fastscroll/src/main/res/values/dimens.xml b/omegarecyclerview_fastscroll/src/main/res/values/dimens.xml
index ff2da8c..679094f 100644
--- a/omegarecyclerview_fastscroll/src/main/res/values/dimens.xml
+++ b/omegarecyclerview_fastscroll/src/main/res/values/dimens.xml
@@ -17,4 +17,9 @@
     <dimen name="fastscroll_scrollbar_padding_start">8dp</dimen>
     <dimen name="fastscroll_scrollbar_padding_end">8dp</dimen>
 
+    <dimen name="omega_track_padding_right">0dp</dimen>
+    <dimen name="omega_track_padding_left">8dp</dimen>
+    <dimen name="omega_track_padding_top">0dp</dimen>
+    <dimen name="omega_track_padding_bottom">0dp</dimen>
+
 </resources>
\ No newline at end of file

From 25dbdad18f177b5b2d08bec20e1a7e55350bffb3 Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Wed, 14 Aug 2019 18:03:02 +0300
Subject: [PATCH 06/32] Bubble animation added

---
 .../main/res/layout/activity_fastscroll.xml   |   7 +-
 .../OmegaFastScrollRecyclerView.java          | 248 ++++++++++++------
 .../main/res/drawable/ic_bubble_down_left.xml |  21 ++
 ...bble_down.xml => ic_bubble_down_right.xml} |   8 +-
 .../main/res/drawable/ic_bubble_up_left.xml   |  21 ++
 ...c_bubble_up.xml => ic_bubble_up_right.xml} |   6 +-
 .../src/main/res/drawable/ic_handle.xml       |  15 --
 .../src/main/res/drawable/ic_track.xml        |   4 +-
 .../src/main/res/layout/view_fastscroller.xml |  49 ----
 .../src/main/res/values/attrs.xml             |   4 +
 .../src/main/res/values/colors.xml            |   6 +
 11 files changed, 229 insertions(+), 160 deletions(-)
 create mode 100644 omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_down_left.xml
 rename omegarecyclerview_fastscroll/src/main/res/drawable/{ic_bubble_down.xml => ic_bubble_down_right.xml} (76%)
 create mode 100644 omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up_left.xml
 rename omegarecyclerview_fastscroll/src/main/res/drawable/{ic_bubble_up.xml => ic_bubble_up_right.xml} (78%)
 delete mode 100644 omegarecyclerview_fastscroll/src/main/res/drawable/ic_handle.xml
 delete mode 100644 omegarecyclerview_fastscroll/src/main/res/layout/view_fastscroller.xml
 create mode 100644 omegarecyclerview_fastscroll/src/main/res/values/colors.xml

diff --git a/app/src/main/res/layout/activity_fastscroll.xml b/app/src/main/res/layout/activity_fastscroll.xml
index c595516..f4eccbf 100644
--- a/app/src/main/res/layout/activity_fastscroll.xml
+++ b/app/src/main/res/layout/activity_fastscroll.xml
@@ -10,11 +10,10 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:fastScrollVisibility="scrollbar|track|bubble"
+
         app:fastScrollbarColor="@color/colorAccent"
-        app:fastScrollbarWidth="10dp"/>
+        app:fastScrollbarWidth="30dp"/>
 
-    <!--app:showScrollbar="true"-->
-    <!--app:scrollbarColor="@color/colorAccent"-->
-    <!--app:scrollbarWidth="10dp"-->
+    <!--app:fastScrollAutoHide="scrollbar|track|bubble"-->
 
 </FrameLayout>
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
index c66d4a9..56eba3e 100644
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
@@ -16,6 +16,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -28,9 +29,11 @@
 
 public class OmegaFastScrollRecyclerView extends OmegaRecyclerView {
 
-    private static final String TAG = OmegaFastScrollRecyclerView.class.getSimpleName();
     private static final long ANIM_DURATION_IN_MILLIS = 300;
+    private static final long BUBBLE_ANIM_DURATION_IN_MILLIS = 100;
     private static final long TRACK_HIDE_DELAY_IN_MILLIS = 1000;
+    private static final int MAX_ALPHA = 255;
+    private static final int MIN_ALPHA = 0;
 
     private final OnScrollListener mScrollListener = new OnScrollListener() {
 
@@ -53,29 +56,34 @@ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
         }
     };
 
-    private Runnable mHiderRunnable = new Runnable() {
+    private final ValueAnimator mShowTrackAnimator = ValueAnimator.ofInt();
+    private final ValueAnimator mHideTrackAnimator = ValueAnimator.ofInt();
+    private final ValueAnimator mShowScrollbarAnimator = ValueAnimator.ofInt();
+    private final ValueAnimator mHideScrollbarAnimator = ValueAnimator.ofInt();
+    private final ValueAnimator mShowBubbleAnimator = ValueAnimator.ofInt();
+    private final ValueAnimator mHideBubbleAnimator = ValueAnimator.ofInt();
+
+    private final Runnable mHiderRunnable = new Runnable() {
         @Override
         public void run() {
-            cancelAllAnimations();
             if (isShowTrack() && isAutoHideTrack()) hideTrack();
             if (isShowScrollbar() && isAutoHideScrollbar()) hideScrollbar();
+            if (isShowBubble() && isAutoHideBubble()) hideBubble();
         }
     };
 
+    private final Paint mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    private final Rect mTextBounds = new Rect();
+
     @Nullable
     private FastScrollAdapter mFastScrollAdapter;
-    private Drawable mTrackDrawable;
+
     private Drawable mBubbleUpDrawable;
     private Drawable mBubbleDownDrawable;
     @Nullable
     private Drawable mBubbleDrawable;
 
-    private final Paint mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-    private final Rect mTextBounds = new Rect();
-    private String mSectionText;
-
-    private Position mPosition = RIGHT;
-
+    private Drawable mTrackDrawable;
     private int mTrackPaddingLeft;
     private int mTrackPaddingTop;
     private int mTrackPaddingRight;
@@ -84,17 +92,20 @@ public void run() {
     private final Rect mScrollbarBounds = new Rect();
     private final Paint mScrollbarPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
 
-    private final ValueAnimator mShowTrackAnimator = ValueAnimator.ofInt().setDuration(ANIM_DURATION_IN_MILLIS);
-    private final ValueAnimator mHideTrackAnimator = ValueAnimator.ofInt().setDuration(ANIM_DURATION_IN_MILLIS);
-    private final ValueAnimator mShowScrollbarAnimator = ValueAnimator.ofInt().setDuration(ANIM_DURATION_IN_MILLIS);
-    private final ValueAnimator mHideScrollbarAnimator = ValueAnimator.ofInt().setDuration(ANIM_DURATION_IN_MILLIS);
-
+    private Position mPosition = RIGHT;
     private int mElementsVisibility = FastScrollVisibility.NONE;
     private int mAutoHide = FastScrollAutoHide.NONE;
 
     private boolean mIsScrollbarVisible;
+    private boolean mIsScrollbarTouched;
     private boolean mIsTrackVisible;
     private boolean mIsTrackTouched;
+    private boolean mIsBubbleVisible;
+    private boolean mIsBubbleTouched;
+
+    private long mAnimDuration = ANIM_DURATION_IN_MILLIS;
+    private long mBubbleAnimDuration = BUBBLE_ANIM_DURATION_IN_MILLIS;
+    private long mHideTrackDelay = TRACK_HIDE_DELAY_IN_MILLIS;
 
     private float mActionDownYDiff;
 
@@ -116,8 +127,16 @@ public OmegaFastScrollRecyclerView(Context context, @Nullable AttributeSet attrs
     private void init(Context context, @Nullable AttributeSet attrs, int defStyle) {
         mPosition = ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL ? LEFT : RIGHT;
         mTrackDrawable = ContextCompat.getDrawable(context, R.drawable.ic_track);
-        mBubbleUpDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_up);
-        mBubbleDownDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_down);
+        switch (mPosition) {
+            case LEFT:
+                mBubbleUpDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_up_left);
+                mBubbleDownDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_down_left);
+                break;
+            case RIGHT:
+                mBubbleUpDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_up_right);
+                mBubbleDownDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_down_right);
+                break;
+        }
 
         mTrackPaddingLeft = getResources().getDimensionPixelSize(R.dimen.omega_track_padding_left);
         mTrackPaddingTop = getResources().getDimensionPixelSize(R.dimen.omega_track_padding_top);
@@ -138,6 +157,7 @@ private void init(Context context, @Nullable AttributeSet attrs, int defStyle) {
 
         if (isShowScrollbar() && !isAutoHideScrollbar()) mIsScrollbarVisible = true;
         if (isShowTrack() && !isAutoHideTrack()) mIsTrackVisible = true;
+        if (isShowTrack() && !isAutoHideBubble()) mIsBubbleVisible = true;
 
         initAnimators();
         addOnScrollListener(mScrollListener);
@@ -145,6 +165,13 @@ private void init(Context context, @Nullable AttributeSet attrs, int defStyle) {
     }
 
     private void initAttrs(@NonNull TypedArray typedArray) {
+        int position = typedArray.getInt(R.styleable.OmegaFastScrollRecyclerView_position, 0);
+        if (position == 0) {
+            mPosition = ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL ? LEFT : RIGHT;
+        } else {
+            mPosition = Position.values()[position];
+        }
+
         Drawable trackDrawable = typedArray.getDrawable(R.styleable.OmegaFastScrollRecyclerView_trackDrawable);
         if (trackDrawable != null) mTrackDrawable = trackDrawable;
         int trackColor = typedArray.getColor(R.styleable.OmegaFastScrollRecyclerView_omega_trackColor, Color.TRANSPARENT);
@@ -160,12 +187,6 @@ private void initAttrs(@NonNull TypedArray typedArray) {
         int bubbleDownColor = typedArray.getColor(R.styleable.OmegaFastScrollRecyclerView_bubbleDownColor, Color.TRANSPARENT);
         if (bubbleUpColor != Color.TRANSPARENT) mBubbleDownDrawable = getTintedDrawable(mBubbleDownDrawable, bubbleDownColor);
 
-        int position = typedArray.getInt(R.styleable.OmegaFastScrollRecyclerView_position, 0);
-        if (position == 0) {
-            mPosition = ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL ? LEFT : RIGHT;
-        } else {
-            mPosition = Position.values()[position];
-        }
 
         int trackPadding = typedArray.getDimensionPixelSize(R.styleable.OmegaFastScrollRecyclerView_fastScrollTrackPadding, -1);
         if (trackPadding != -1) {
@@ -199,6 +220,15 @@ private void initAttrs(@NonNull TypedArray typedArray) {
         if (scrollbarColor != Color.TRANSPARENT) mScrollbarPaint.setColor(scrollbarColor);
         int scrollbarWidth = typedArray.getDimensionPixelSize(R.styleable.OmegaFastScrollRecyclerView_fastScrollbarWidth, 0);
         if (scrollbarWidth >= 0) mScrollbarPaint.setStrokeWidth(scrollbarWidth);
+
+        mAnimDuration = typedArray.getInt(R.styleable.OmegaFastScrollRecyclerView_fastScrollAnimDuration, (int) mAnimDuration);
+        mBubbleAnimDuration = typedArray.getInt(R.styleable.OmegaFastScrollRecyclerView_fastScrollBubbleAnimDuration, (int) mBubbleAnimDuration);
+        mHideTrackDelay = typedArray.getInt(R.styleable.OmegaFastScrollRecyclerView_fastScrollHideTrackDelay, (int) mHideTrackDelay);
+
+        if (isShowBubble() && isAutoHideBubble()) {
+            mBubbleUpDrawable.setAlpha(MIN_ALPHA);
+            mBubbleDownDrawable.setAlpha(MIN_ALPHA);
+        }
     }
 
     private void initAnimators() {
@@ -211,6 +241,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 invalidate();
             }
         };
+        mShowScrollbarAnimator.setDuration(mAnimDuration);
         mShowScrollbarAnimator.addUpdateListener(scrollbarAnimator);
         mShowScrollbarAnimator.addListener(new AnimatorListener() {
             @Override
@@ -218,6 +249,7 @@ public void onAnimationEnd(Animator animation) {
                 mIsScrollbarVisible = true;
             }
         });
+        mHideScrollbarAnimator.setDuration(mAnimDuration);
         mHideScrollbarAnimator.addUpdateListener(scrollbarAnimator);
         mHideScrollbarAnimator.addListener(new AnimatorListener() {
             @Override
@@ -236,6 +268,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
                 invalidate();
             }
         };
+        mShowTrackAnimator.setDuration(mAnimDuration);
         mShowTrackAnimator.addUpdateListener(trackAnimator);
         mShowTrackAnimator.addListener(new AnimatorListener() {
             @Override
@@ -243,6 +276,7 @@ public void onAnimationEnd(Animator animation) {
                 mIsTrackVisible = true;
             }
         });
+        mHideTrackAnimator.setDuration(mAnimDuration);
         mHideTrackAnimator.addUpdateListener(trackAnimator);
         mHideTrackAnimator.addListener(new AnimatorListener() {
             @Override
@@ -250,6 +284,32 @@ public void onAnimationEnd(Animator animation) {
                 mIsTrackVisible = false;
             }
         });
+
+        ValueAnimator.AnimatorUpdateListener bubbleAnimator = new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                int alpha = (int) animation.getAnimatedValue();
+                mBubbleUpDrawable.setAlpha(alpha);
+                mBubbleDownDrawable.setAlpha(alpha);
+                invalidate();
+            }
+        };
+        mShowBubbleAnimator.setDuration(mBubbleAnimDuration);
+        mShowBubbleAnimator.addUpdateListener(bubbleAnimator);
+        mShowBubbleAnimator.addListener(new AnimatorListener() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mIsBubbleVisible = true;
+            }
+        });
+        mHideBubbleAnimator.setDuration(mBubbleAnimDuration);
+        mHideBubbleAnimator.addUpdateListener(bubbleAnimator);
+        mHideBubbleAnimator.addListener(new AnimatorListener() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mIsBubbleVisible = false;
+            }
+        });
     }
 
     @Override
@@ -294,38 +354,46 @@ public boolean onTouchEvent(MotionEvent event) {
 
         switch (action) {
             case MotionEvent.ACTION_DOWN:
-                boolean isScrollbarTouched = isScrollbarTouched(eventX);
-                boolean isTrackTouched = isTrackTouched(eventX, eventY);
-                if (isShowScrollbar() || isShowTrack()) {
-                    mIsTrackTouched = isTrackTouched || isScrollbarTouched;
-                    if (mIsTrackTouched) {
-                        mActionDownYDiff = isTrackTouched ? mTrackDrawable.getBounds().top - eventY : 0;
+                mIsScrollbarTouched = isScrollbarTouched(eventX);
+                mIsTrackTouched = isTrackTouched(eventX, eventY);
+                mIsBubbleTouched = isBubbleTouched(eventX, eventY);
+
+                if (isShowScrollbar() || isShowTrack() || isShowBubble()) {
+                    if (mIsTrackTouched || mIsScrollbarTouched || mIsBubbleTouched) {
+                        mActionDownYDiff = (mIsTrackTouched || mIsBubbleTouched) ? mTrackDrawable.getBounds().top - eventY : 0;
                         requestDisallowInterceptTouchEvent(true);
-                        if (!isTrackTouched) {
-                            removeOnScrollListener(mScrollListener);
-                            int halfHeight = mTrackDrawable.getIntrinsicHeight() / 2;
-                            updateRecyclerViewPosition(eventY - halfHeight);
-                            onScrolled(eventY - halfHeight);
+                        removeOnScrollListener(mScrollListener);
+                        removeCallbacks(mHiderRunnable);
+
+                        if (mIsTrackTouched) {
+                            showBubble();
+                        } else if (!mIsBubbleTouched) {
+                            updateRecyclerViewPosition(eventY);
+                            onScrolled(eventY);
                         }
+                        showScrollbar();
+                        showTrack();
                         return true;
                     }
                 }
             case MotionEvent.ACTION_MOVE:
-                if (mIsTrackTouched) {
-                    removeOnScrollListener(mScrollListener);
+                if (mIsTrackTouched || mIsScrollbarTouched || mIsBubbleTouched) {
                     float y = Math.min(getHeight(), Math.max(0, eventY + mActionDownYDiff));
                     updateRecyclerViewPosition(y);
                     onScrolled(y);
                     return true;
                 }
             case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_CANCEL:
-                if (mIsTrackTouched) {
-                    postDelayed(mHiderRunnable, TRACK_HIDE_DELAY_IN_MILLIS);
+                if (mIsTrackTouched || mIsScrollbarTouched || mIsBubbleTouched) {
+                    mActionDownYDiff = 0;
+                    postDelayed(mHiderRunnable, mHideTrackDelay);
                     requestDisallowInterceptTouchEvent(false);
-                    mIsTrackTouched = false;
+                    mIsTrackTouched = isShowTrack() && !isAutoHideTrack();
+                    mIsScrollbarTouched = isShowScrollbar() && !isAutoHideScrollbar();
+                    mIsBubbleTouched = isShowBubble() && !isAutoHideBubble();
                     invalidate();
                     addOnScrollListener(mScrollListener);
+                    hideBubble();
                     return true;
                 }
         }
@@ -345,6 +413,12 @@ private boolean isScrollbarTouched(float eventX) {
         return eventX >= mScrollbarBounds.left && eventX <= mScrollbarBounds.right;
     }
 
+    private boolean isBubbleTouched(float eventX, float eventY) {
+        if (mBubbleDrawable == null) return false;
+        Rect bounds = mBubbleDrawable.getBounds();
+        return bounds.left <= eventX && eventX <= bounds.right && bounds.top <= eventY && eventY <= bounds.bottom;
+    }
+
     private void updateRecyclerViewPosition(float eventY) {
         RecyclerView.LayoutManager layoutManager = getLayoutManager();
         RecyclerView.Adapter adapter = getAdapter();
@@ -361,14 +435,6 @@ private void updateRecyclerViewPosition(float eventY) {
         }
     }
 
-    private boolean isTrackVisible() {
-        return mIsTrackVisible || mShowTrackAnimator.isRunning();
-    }
-
-    private boolean isScrollbarVisible() {
-        return mIsScrollbarVisible || mShowScrollbarAnimator.isRunning();
-    }
-
     public final void setSectionIndexer(FastScrollAdapter adapter) {
         mFastScrollAdapter = adapter;
         invalidate();
@@ -378,25 +444,18 @@ private void onScrollScreenStateChanged(int newState) {
         switch (newState) {
             case RecyclerView.SCROLL_STATE_DRAGGING:
                 removeCallbacks(mHiderRunnable);
-                cancelAllAnimations();
-                if (isShowScrollbar() && isAutoHideScrollbar() && !isScrollbarVisible()) showScrollbar();
-                if (isShowTrack() && isAutoHideTrack() && !isTrackVisible()) showTrack();
+                showScrollbar();
+                showTrack();
+                showBubble();
                 break;
             case RecyclerView.SCROLL_STATE_IDLE:
-                postDelayed(mHiderRunnable, TRACK_HIDE_DELAY_IN_MILLIS);
+                postDelayed(mHiderRunnable, mHideTrackDelay);
                 break;
         }
     }
 
-    private void cancelAllAnimations() {
-        cancelAnimation(mShowTrackAnimator, mHideTrackAnimator, mShowScrollbarAnimator, mHideScrollbarAnimator);
-    }
-
-    private void cancelAnimation(Animator... animators) {
-        for (Animator animator : animators) animator.cancel();
-    }
-
     private void showTrack() {
+        if (!isShowTrack() || !isAutoHideTrack()) return;
         Rect bounds = mTrackDrawable.getBounds();
         int trackWidth = mTrackDrawable.getIntrinsicWidth();
         int from = 0;
@@ -411,11 +470,14 @@ private void showTrack() {
                 to = getWidth() - mTrackPaddingRight - trackWidth;
                 break;
         }
+        mHideTrackAnimator.cancel();
+        mShowTrackAnimator.cancel();
         mShowTrackAnimator.setIntValues(from, to);
         mShowTrackAnimator.start();
     }
 
     private void hideTrack() {
+        if (!isShowTrack() || !isAutoHideTrack()) return;
         Rect bounds = mTrackDrawable.getBounds();
         int from = 0;
         int to = 0;
@@ -429,11 +491,14 @@ private void hideTrack() {
                 to = getWidth();
                 break;
         }
+        mShowTrackAnimator.cancel();
+        mHideTrackAnimator.cancel();
         mHideTrackAnimator.setIntValues(from, to);
         mHideTrackAnimator.start();
     }
 
     private void showScrollbar() {
+        if (!isShowScrollbar() || !isAutoHideScrollbar()) return;
         int scrollbarWidth = (int) mScrollbarPaint.getStrokeWidth();
         Rect bounds = mScrollbarBounds;
         int from = 0;
@@ -444,15 +509,18 @@ private void showScrollbar() {
                 to = 0;
                 break;
             case RIGHT:
-                from = bounds.right == 0 ? getWidth() : bounds.right;
+                from = bounds.right == 0 ? getWidth() : bounds.left;
                 to = getWidth() - scrollbarWidth;
                 break;
         }
+        mHideScrollbarAnimator.cancel();
+        mShowScrollbarAnimator.cancel();
         mShowScrollbarAnimator.setIntValues(from, to);
         mShowScrollbarAnimator.start();
     }
 
     private void hideScrollbar() {
+        if (!isShowScrollbar() || !isAutoHideScrollbar()) return;
         Rect bounds = mScrollbarBounds;
         int from = 0;
         int to = 0;
@@ -466,10 +534,32 @@ private void hideScrollbar() {
                 to = getWidth();
                 break;
         }
+        mShowScrollbarAnimator.cancel();
+        mHideScrollbarAnimator.cancel();
         mHideScrollbarAnimator.setIntValues(from, to);
         mHideScrollbarAnimator.start();
     }
 
+    private void showBubble() {
+        if (mBubbleDrawable == null) return;
+        if (!isShowBubble() || !isAutoHideBubble() || mIsBubbleVisible || !mIsTrackTouched) return;
+        int startAlpha = DrawableCompat.getAlpha(mBubbleDrawable);
+        if (startAlpha == MAX_ALPHA) startAlpha = MIN_ALPHA;
+        mHideBubbleAnimator.cancel();
+        mShowBubbleAnimator.cancel();
+        mShowBubbleAnimator.setIntValues(startAlpha, MAX_ALPHA);
+        mShowBubbleAnimator.start();
+    }
+
+    private void hideBubble() {
+        if (mBubbleDrawable == null) return;
+        if (!isShowBubble() || !isAutoHideBubble() || !mIsBubbleVisible) return;
+        mShowBubbleAnimator.cancel();
+        mHideBubbleAnimator.cancel();
+        mHideBubbleAnimator.setIntValues(DrawableCompat.getAlpha(mBubbleDrawable), MIN_ALPHA);
+        mHideBubbleAnimator.start();
+    }
+
     private void onScrolled() {
         int width = getWidth();
         int height = getHeight();
@@ -550,20 +640,6 @@ private void updateBubblePosition(int screenHeight, int screenWidth, int scrollP
         }
     }
 
-    private void updateSectionText(int adapterPosition) {
-        if (mFastScrollAdapter == null || mBubbleDrawable == null || adapterPosition < 0) return;
-        mSectionText = "T";
-        mFastScrollAdapter.getFastScrollSection(adapterPosition);
-        if (mSectionText == null) return;
-        Rect mBubbleBounds = mBubbleDrawable.getBounds();
-        int centerY = mBubbleBounds.centerY();
-        int centerX = mBubbleBounds.centerX();
-        mTextPaint.getTextBounds(mSectionText, 0, mSectionText.length() - 1, mTextBounds);
-        int halfTextWidth = mTextBounds.width() / 2;
-        int halfTextHeight = mTextBounds.height() / 2;
-        mTextBounds.set(centerX - halfTextWidth, centerY - halfTextHeight, centerX + halfTextWidth, centerY + halfTextHeight);
-    }
-
     private boolean isShowScrollbar() {
         return (mElementsVisibility & FastScrollVisibility.SCROLLBAR) == FastScrollVisibility.SCROLLBAR;
     }
@@ -594,12 +670,8 @@ public void draw(Canvas canvas) {
         RecyclerView.Adapter adapter = getAdapter();
         if (adapter == null || adapter.getItemCount() == 0) return;
 
-        if (isShowScrollbar()) {
-            canvas.drawRect(mScrollbarBounds, mScrollbarPaint);
-        }
-        if (isShowTrack()) {
-            mTrackDrawable.draw(canvas);
-        }
+        if (isShowScrollbar()) canvas.drawRect(mScrollbarBounds, mScrollbarPaint);
+        if (isShowTrack()) mTrackDrawable.draw(canvas);
         if (isShowBubble() && mBubbleDrawable != null) {
             mBubbleDrawable.draw(canvas);
             drawText(canvas);
@@ -618,4 +690,18 @@ private void drawText(Canvas canvas) {
 
     }
 
+    private void updateSectionText(int adapterPosition) {
+        if (mFastScrollAdapter == null || mBubbleDrawable == null || adapterPosition < 0) return;
+//        mSectionText = "T";
+//        mFastScrollAdapter.getFastScrollSection(adapterPosition);
+//        if (mSectionText == null) return;
+//        Rect mBubbleBounds = mBubbleDrawable.getBounds();
+//        int centerY = mBubbleBounds.centerY();
+//        int centerX = mBubbleBounds.centerX();
+//        mTextPaint.getTextBounds(mSectionText, 0, mSectionText.length() - 1, mTextBounds);
+//        int halfTextWidth = mTextBounds.width() / 2;
+//        int halfTextHeight = mTextBounds.height() / 2;
+//        mTextBounds.set(centerX - halfTextWidth, centerY - halfTextHeight, centerX + halfTextWidth, centerY + halfTextHeight);
+    }
+
 }
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_down_left.xml b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_down_left.xml
new file mode 100644
index 0000000..56e029c
--- /dev/null
+++ b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_down_left.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/omega_bubble_color" />
+
+    <corners
+        android:topLeftRadius="@dimen/fastscroll_bubble_radius"
+        android:topRightRadius="@dimen/fastscroll_bubble_radius"
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="@dimen/fastscroll_bubble_radius" />
+
+    <size
+        android:height="@dimen/fastscroll_bubble_size"
+        android:width="@dimen/fastscroll_bubble_size" />
+
+    <padding
+        android:left="@dimen/fastscroll_bubble_padding"
+        android:right="@dimen/fastscroll_bubble_padding" />
+
+</shape>
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_down.xml b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_down_right.xml
similarity index 76%
rename from omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_down.xml
rename to omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_down_right.xml
index e3970ff..d23d12d 100644
--- a/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_down.xml
+++ b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_down_right.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <tools:solid android:color="#777777" />
+    <solid android:color="@color/omega_bubble_color" />
 
     <corners
         android:topLeftRadius="@dimen/fastscroll_bubble_radius"
@@ -20,4 +18,4 @@
         android:left="@dimen/fastscroll_bubble_padding"
         android:right="@dimen/fastscroll_bubble_padding" />
 
-</shape>
+</shape>
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up_left.xml b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up_left.xml
new file mode 100644
index 0000000..d717a3f
--- /dev/null
+++ b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up_left.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/omega_bubble_color" />
+
+    <corners
+        android:topLeftRadius="0dp"
+        android:topRightRadius="@dimen/fastscroll_bubble_radius"
+        android:bottomLeftRadius="@dimen/fastscroll_bubble_radius"
+        android:bottomRightRadius="@dimen/fastscroll_bubble_radius" />
+
+    <size
+        android:height="@dimen/fastscroll_bubble_size"
+        android:width="@dimen/fastscroll_bubble_size" />
+
+    <padding
+        android:left="@dimen/fastscroll_bubble_padding"
+        android:right="@dimen/fastscroll_bubble_padding" />
+
+</shape>
diff --git a/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up.xml b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up_right.xml
similarity index 78%
rename from omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up.xml
rename to omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up_right.xml
index 9bd12fe..7de4aab 100644
--- a/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up.xml
+++ b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_bubble_up_right.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="#777777" />
+    <solid android:color="@color/omega_bubble_color" />
 
     <corners
         android:topLeftRadius="@dimen/fastscroll_bubble_radius"
diff --git a/omegarecyclerview_fastscroll/src/main/res/drawable/ic_handle.xml b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_handle.xml
deleted file mode 100644
index 3fc198e..0000000
--- a/omegarecyclerview_fastscroll/src/main/res/drawable/ic_handle.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:shape="rectangle">
-
-    <tools:solid android:color="#555555" />
-
-    <corners android:radius="@dimen/fastscroll_handle_radius" />
-
-    <size
-        android:height="@dimen/fastscroll_handle_height"
-        android:width="@dimen/fastscroll_handle_width" />
-
-</shape>
diff --git a/omegarecyclerview_fastscroll/src/main/res/drawable/ic_track.xml b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_track.xml
index 1de78ec..89bc1cd 100644
--- a/omegarecyclerview_fastscroll/src/main/res/drawable/ic_track.xml
+++ b/omegarecyclerview_fastscroll/src/main/res/drawable/ic_track.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/cardview_dark_background" />
+    <solid android:color="#000000" />
 
     <size
         android:width="10dp"
@@ -10,4 +10,4 @@
 
     <corners android:radius="6dp"/>
 
-</shape>
+</shape>
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/res/layout/view_fastscroller.xml b/omegarecyclerview_fastscroll/src/main/res/layout/view_fastscroller.xml
deleted file mode 100644
index 4d75911..0000000
--- a/omegarecyclerview_fastscroll/src/main/res/layout/view_fastscroller.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <TextView
-        android:id="@+id/textview_bubble"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:textSize="36sp"
-        android:visibility="gone"
-        tools:background="@drawable/ic_bubble_up"
-        tools:text="A"
-        tools:textColor="#ffffff"
-        tools:visibility="visible" />
-
-    <FrameLayout
-        android:id="@+id/scrollbar_container"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:paddingEnd="@dimen/fastscroll_scrollbar_padding_end"
-        android:paddingLeft="@dimen/fastscroll_scrollbar_padding_start"
-        android:paddingRight="@dimen/fastscroll_scrollbar_padding_end"
-        android:paddingStart="@dimen/fastscroll_scrollbar_padding_start"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <ImageView
-            android:id="@+id/imageview_track"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_horizontal"
-            tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_track" />
-
-        <ImageView
-            android:id="@+id/imageview_handle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_handle" />
-
-    </FrameLayout>
-
-</merge>
diff --git a/omegarecyclerview_fastscroll/src/main/res/values/attrs.xml b/omegarecyclerview_fastscroll/src/main/res/values/attrs.xml
index 94c6678..b40f125 100644
--- a/omegarecyclerview_fastscroll/src/main/res/values/attrs.xml
+++ b/omegarecyclerview_fastscroll/src/main/res/values/attrs.xml
@@ -49,6 +49,10 @@
             <flag name="bubble" value="4"/>
         </attr>
 
+        <attr name="fastScrollAnimDuration" format="integer"/>
+        <attr name="fastScrollBubbleAnimDuration" format="integer"/>
+        <attr name="fastScrollHideTrackDelay" format="integer"/>
+
     </declare-styleable>
 
 </resources>
diff --git a/omegarecyclerview_fastscroll/src/main/res/values/colors.xml b/omegarecyclerview_fastscroll/src/main/res/values/colors.xml
new file mode 100644
index 0000000..0bc2c14
--- /dev/null
+++ b/omegarecyclerview_fastscroll/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="omega_bubble_color">#777777</color>
+
+</resources>
\ No newline at end of file

From 4f81ef4c1f977b4d5c215eb040e37f6bbe82a1fd Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Thu, 15 Aug 2019 14:17:58 +0300
Subject: [PATCH 07/32] FastScroll Adapter logic splitted on Text and
 VIewHolder types.

---
 .../FastScrollActivity.java                   |  15 +-
 .../fastscroll_example/FastScrollAdapter.java |  21 +--
 .../FastScrollOriginalActivity.java           |  34 ----
 .../main/res/layout/activity_fastscroll.xml   |   6 +-
 .../layout/activity_fastscroll_original.xml   |  12 --
 .../DrawableUtils.java                        |  25 +++
 .../FastScrollAdapter.java                    |  20 +-
 .../OmegaFastScrollRecyclerView.java          | 175 ++++++++++++------
 .../src/main/res/values/attrs.xml             |  13 +-
 .../src/main/res/values/dimens.xml            |  10 +-
 10 files changed, 189 insertions(+), 142 deletions(-)
 delete mode 100644 app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollOriginalActivity.java
 delete mode 100644 app/src/main/res/layout/activity_fastscroll_original.xml

diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java
index c4a03c7..af94b8c 100644
--- a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollActivity.java
@@ -10,25 +10,12 @@
 
 public class FastScrollActivity extends AppCompatActivity {
 
-    private static final String TAG = FastScrollActivity.class.getSimpleName();
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_fastscroll);
         RecyclerView recyclerView = findViewById(R.id.recyclerview);
         recyclerView.setAdapter(new FastScrollAdapter());
-//        recyclerView.setFastScrollStateChangeListener(this);
     }
 
-//    @Override
-//    public void onFastScrollStart(OmegaFastScrollerLayout fastScrollerLayout) {
-//        Log.d(TAG, "onFastScrollStart");
-//    }
-//
-//    @Override
-//    public void onFastScrollStop(OmegaFastScrollerLayout fastScrollerLayout) {
-//        Log.d(TAG, "onFastScrollStop");
-//    }
-
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java
index 2e99f6c..83d62d1 100644
--- a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollAdapter.java
@@ -1,16 +1,15 @@
 package com.omega_r.omegarecyclerview.fastscroll_example;
 
-import android.graphics.Color;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
+import androidx.annotation.NonNull;
 
+import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
 import com.omega_r.omegarecyclerview.R;
 
-import androidx.annotation.NonNull;
-
-public class FastScrollAdapter extends OmegaRecyclerView.Adapter<FastScrollAdapter.ViewHolder> implements com.omega_r.libs.omegarecyclerview_fastscroll.FastScrollAdapter {
+public class FastScrollAdapter extends OmegaRecyclerView.Adapter<FastScrollAdapter.ViewHolder> implements
+        com.omega_r.libs.omegarecyclerview_fastscroll.FastScrollAdapter.Text {
 
     @NonNull
     @Override
@@ -20,7 +19,6 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        holder.bind();
         holder.textView.setText(String.valueOf(position));
     }
 
@@ -30,10 +28,15 @@ public int getItemCount() {
     }
 
     @Override
-    public String getFastScrollSection(int position) {
+    public String getText(int position) {
         return String.valueOf(position);
     }
 
+    @Override
+    public long getFastScrollGroupId(int position) {
+        return position;
+    }
+
     class ViewHolder extends OmegaRecyclerView.ViewHolder {
 
         final TextView textView;
@@ -43,10 +46,6 @@ class ViewHolder extends OmegaRecyclerView.ViewHolder {
             textView = findViewById(R.id.text_item);
         }
 
-        void bind() {
-//            itemView.setBackgroundColor(getAdapterPosition() % 2 == 0 ? Color.WHITE : Color.BLUE);
-        }
-
     }
 
 }
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollOriginalActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollOriginalActivity.java
deleted file mode 100644
index e154aa2..0000000
--- a/app/src/main/java/com/omega_r/omegarecyclerview/fastscroll_example/FastScrollOriginalActivity.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.omega_r.omegarecyclerview.fastscroll_example;
-
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.omega_r.omegarecyclerview.R;
-
-public class FastScrollOriginalActivity extends AppCompatActivity  {
-
-    private static final String TAG = FastScrollOriginalActivity.class.getSimpleName();
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_fastscroll_original);
-        RecyclerView recyclerView = findViewById(R.id.recyclerview);
-        recyclerView.setAdapter(new FastScrollAdapter());
-//        recyclerView.setFastScrollStateChangeListener(this);
-    }
-
-//    @Override
-//    public void onFastScrollStart(OmegaFastScrollerLayout fastScrollerLayout) {
-//        Log.d(TAG, "onFastScrollStart");
-//    }
-//
-//    @Override
-//    public void onFastScrollStop(OmegaFastScrollerLayout fastScrollerLayout) {
-//        Log.d(TAG, "onFastScrollStop");
-//    }
-
-}
diff --git a/app/src/main/res/layout/activity_fastscroll.xml b/app/src/main/res/layout/activity_fastscroll.xml
index f4eccbf..30ef33e 100644
--- a/app/src/main/res/layout/activity_fastscroll.xml
+++ b/app/src/main/res/layout/activity_fastscroll.xml
@@ -10,10 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:fastScrollVisibility="scrollbar|track|bubble"
-
+        app:fastScrollAutoHide="scrollbar|track|bubble"
         app:fastScrollbarColor="@color/colorAccent"
-        app:fastScrollbarWidth="30dp"/>
-
-    <!--app:fastScrollAutoHide="scrollbar|track|bubble"-->
+        app:fastScrollbarWidth="10dp"/>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_fastscroll_original.xml b/app/src/main/res/layout/activity_fastscroll_original.xml
deleted file mode 100644
index 47f2ca1..0000000
--- a/app/src/main/res/layout/activity_fastscroll_original.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <!--<com.omega_r.libs.omegarecyclerview_fastscroll.OmegaFastScrollRecyclerView-->
-        <!--android:id="@+id/recyclerview"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="match_parent" />-->
-
-</FrameLayout>
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/DrawableUtils.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/DrawableUtils.java
index d389cd1..d585cb7 100644
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/DrawableUtils.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/DrawableUtils.java
@@ -1,7 +1,11 @@
 package com.omega_r.libs.omegarecyclerview_fastscroll;
 
 import android.content.Context;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.RotateDrawable;
+import android.graphics.drawable.ScaleDrawable;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
@@ -9,6 +13,9 @@
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 
+import static android.os.Build.VERSION.SDK_INT;
+import static android.os.Build.VERSION_CODES.KITKAT;
+
 @SuppressWarnings("WeakerAccess")
 public class DrawableUtils {
 
@@ -22,4 +29,22 @@ public static Drawable getTintedDrawable(@NonNull Drawable drawable, @ColorInt i
         return mutate;
     }
 
+    public static int getAlpha(@NonNull Drawable drawable) {
+        if (SDK_INT >= KITKAT) return drawable.getAlpha();
+
+        if( drawable instanceof ColorDrawable) {
+            return ((ColorDrawable) drawable).getColor() >>> 24;
+        } else if( drawable instanceof BitmapDrawable) {
+            return ((BitmapDrawable) drawable).getPaint().getAlpha();
+        } else if(drawable instanceof RotateDrawable) {
+            Drawable rotateDrawable = ((RotateDrawable) drawable).getDrawable();
+            if (rotateDrawable != null) return getAlpha(rotateDrawable);
+        } else if( drawable instanceof ScaleDrawable) {
+            Drawable scaleDrawable = ((ScaleDrawable) drawable).getDrawable();
+            if (scaleDrawable != null) return getAlpha(scaleDrawable);
+        }
+
+        return DrawableCompat.getAlpha(drawable);
+    }
+
 }
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollAdapter.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollAdapter.java
index 3615b8a..8a0644c 100644
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollAdapter.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/FastScrollAdapter.java
@@ -1,7 +1,25 @@
 package com.omega_r.libs.omegarecyclerview_fastscroll;
 
+import android.view.ViewGroup;
+
+import androidx.recyclerview.widget.RecyclerView;
+
 public interface FastScrollAdapter {
 
-    String getFastScrollSection(int position);
+    long getFastScrollGroupId(int position);
+
+    interface Text extends FastScrollAdapter {
+
+        String getText(int position);
+
+    }
+
+    interface ViewHolder<T extends RecyclerView.ViewHolder> extends FastScrollAdapter {
+
+        T onCreateFastScrollViewHolder(ViewGroup parent);
+
+        void onBindFastScrollViewHolder(T viewHolder, int position);
+
+    }
 
 }
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
index 56eba3e..1d6b5eb 100644
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
@@ -11,18 +11,20 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
+import android.util.SparseArray;
 import android.view.MotionEvent;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
 
+import static android.view.View.MeasureSpec.EXACTLY;
 import static com.omega_r.libs.omegarecyclerview_fastscroll.DrawableUtils.getTintedDrawable;
 import static com.omega_r.libs.omegarecyclerview_fastscroll.Position.LEFT;
 import static com.omega_r.libs.omegarecyclerview_fastscroll.Position.RIGHT;
@@ -30,7 +32,7 @@
 public class OmegaFastScrollRecyclerView extends OmegaRecyclerView {
 
     private static final long ANIM_DURATION_IN_MILLIS = 300;
-    private static final long BUBBLE_ANIM_DURATION_IN_MILLIS = 100;
+    private static final long BUBBLE_ANIM_DURATION_IN_MILLIS = 1000;
     private static final long TRACK_HIDE_DELAY_IN_MILLIS = 1000;
     private static final int MAX_ALPHA = 255;
     private static final int MIN_ALPHA = 0;
@@ -72,6 +74,7 @@ public void run() {
         }
     };
 
+    private final SparseArray<RecyclerView.ViewHolder> mHolderSparseArray = new SparseArray<>();
     private final Paint mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
     private final Rect mTextBounds = new Rect();
 
@@ -92,7 +95,7 @@ public void run() {
     private final Rect mScrollbarBounds = new Rect();
     private final Paint mScrollbarPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
 
-    private Position mPosition = RIGHT;
+    private Position mPosition;
     private int mElementsVisibility = FastScrollVisibility.NONE;
     private int mAutoHide = FastScrollAutoHide.NONE;
 
@@ -127,21 +130,12 @@ public OmegaFastScrollRecyclerView(Context context, @Nullable AttributeSet attrs
     private void init(Context context, @Nullable AttributeSet attrs, int defStyle) {
         mPosition = ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL ? LEFT : RIGHT;
         mTrackDrawable = ContextCompat.getDrawable(context, R.drawable.ic_track);
-        switch (mPosition) {
-            case LEFT:
-                mBubbleUpDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_up_left);
-                mBubbleDownDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_down_left);
-                break;
-            case RIGHT:
-                mBubbleUpDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_up_right);
-                mBubbleDownDrawable = ContextCompat.getDrawable(context, R.drawable.ic_bubble_down_right);
-                break;
-        }
+        initBubbleDrawables(mPosition);
 
-        mTrackPaddingLeft = getResources().getDimensionPixelSize(R.dimen.omega_track_padding_left);
-        mTrackPaddingTop = getResources().getDimensionPixelSize(R.dimen.omega_track_padding_top);
-        mTrackPaddingRight = getResources().getDimensionPixelSize(R.dimen.omega_track_padding_right);
-        mTrackPaddingBottom = getResources().getDimensionPixelSize(R.dimen.omega_track_padding_bottom);
+        mTrackPaddingLeft = getResources().getDimensionPixelSize(R.dimen.fastscroll_track_padding_left);
+        mTrackPaddingTop = getResources().getDimensionPixelSize(R.dimen.fastscroll_track_padding_top);
+        mTrackPaddingRight = getResources().getDimensionPixelSize(R.dimen.fastscroll_track_padding_right);
+        mTrackPaddingBottom = getResources().getDimensionPixelSize(R.dimen.fastscroll_track_padding_bottom);
 
         mScrollbarPaint.setStyle(Paint.Style.FILL);
 
@@ -166,26 +160,34 @@ private void init(Context context, @Nullable AttributeSet attrs, int defStyle) {
 
     private void initAttrs(@NonNull TypedArray typedArray) {
         int position = typedArray.getInt(R.styleable.OmegaFastScrollRecyclerView_position, 0);
+        Position newPosition;
         if (position == 0) {
-            mPosition = ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL ? LEFT : RIGHT;
+            newPosition = ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL ? LEFT : RIGHT;
         } else {
-            mPosition = Position.values()[position];
+            newPosition = Position.values()[position - 1];
+        }
+        if (newPosition != mPosition) {
+            mPosition = newPosition;
+            initBubbleDrawables(mPosition);
         }
 
         Drawable trackDrawable = typedArray.getDrawable(R.styleable.OmegaFastScrollRecyclerView_trackDrawable);
         if (trackDrawable != null) mTrackDrawable = trackDrawable;
         int trackColor = typedArray.getColor(R.styleable.OmegaFastScrollRecyclerView_omega_trackColor, Color.TRANSPARENT);
-        if (trackColor != Color.TRANSPARENT) mTrackDrawable = getTintedDrawable(mTrackDrawable, trackColor);
+        if (trackColor != Color.TRANSPARENT)
+            mTrackDrawable = getTintedDrawable(mTrackDrawable, trackColor);
 
         Drawable bubbleUp = typedArray.getDrawable(R.styleable.OmegaFastScrollRecyclerView_bubbleUpDrawable);
         if (bubbleUp != null) mBubbleUpDrawable = bubbleUp;
         int bubbleUpColor = typedArray.getColor(R.styleable.OmegaFastScrollRecyclerView_bubbleUpColor, Color.TRANSPARENT);
-        if (bubbleUpColor != Color.TRANSPARENT) mBubbleUpDrawable = getTintedDrawable(mBubbleUpDrawable, bubbleUpColor);
+        if (bubbleUpColor != Color.TRANSPARENT)
+            mBubbleUpDrawable = getTintedDrawable(mBubbleUpDrawable, bubbleUpColor);
 
         Drawable bubbleDown = typedArray.getDrawable(R.styleable.OmegaFastScrollRecyclerView_bubbleDownDrawable);
         if (bubbleDown != null) mBubbleDownDrawable = bubbleDown;
         int bubbleDownColor = typedArray.getColor(R.styleable.OmegaFastScrollRecyclerView_bubbleDownColor, Color.TRANSPARENT);
-        if (bubbleUpColor != Color.TRANSPARENT) mBubbleDownDrawable = getTintedDrawable(mBubbleDownDrawable, bubbleDownColor);
+        if (bubbleUpColor != Color.TRANSPARENT)
+            mBubbleDownDrawable = getTintedDrawable(mBubbleDownDrawable, bubbleDownColor);
 
 
         int trackPadding = typedArray.getDimensionPixelSize(R.styleable.OmegaFastScrollRecyclerView_fastScrollTrackPadding, -1);
@@ -229,6 +231,24 @@ private void initAttrs(@NonNull TypedArray typedArray) {
             mBubbleUpDrawable.setAlpha(MIN_ALPHA);
             mBubbleDownDrawable.setAlpha(MIN_ALPHA);
         }
+
+        mTextPaint.setColor(typedArray.getColor(R.styleable.OmegaFastScrollRecyclerView_fastScrollTextColor, Color.WHITE));
+        int textSize = typedArray.getDimensionPixelSize(R.styleable.OmegaFastScrollRecyclerView_fastScrollTextSize,
+                getResources().getDimensionPixelSize(R.dimen.fastscroll_text_size));
+        mTextPaint.setTextSize(textSize);
+    }
+
+    private void initBubbleDrawables(Position position) {
+        switch (position) {
+            case LEFT:
+                mBubbleUpDrawable = ContextCompat.getDrawable(getContext(), R.drawable.ic_bubble_up_left);
+                mBubbleDownDrawable = ContextCompat.getDrawable(getContext(), R.drawable.ic_bubble_down_left);
+                break;
+            case RIGHT:
+                mBubbleUpDrawable = ContextCompat.getDrawable(getContext(), R.drawable.ic_bubble_up_right);
+                mBubbleDownDrawable = ContextCompat.getDrawable(getContext(), R.drawable.ic_bubble_down_right);
+                break;
+        }
     }
 
     private void initAnimators() {
@@ -331,15 +351,35 @@ protected void onSizeChanged(int width, int height, int oldw, int oldh) {
             }
             mScrollbarBounds.set(left, 0, right, height);
         }
+        if (isShowTrack() && !isAutoHideTrack()) {
+            Rect bounds = mTrackDrawable.getBounds();
+            int trackWidth = mTrackDrawable.getIntrinsicWidth();
+
+            int left = 0;
+            int right = 0;
+            switch (mPosition) {
+                case LEFT:
+                    left = mTrackPaddingLeft;
+                    right = left + trackWidth;
+                    break;
+                case RIGHT:
+                    left = width - mTrackPaddingRight - trackWidth;
+                    right = left + trackWidth;
+                    break;
+            }
+            mTrackDrawable.setBounds(left, bounds.top, right, bounds.bottom);
+            onScrolled();
+        }
+        if (isShowBubble() && (!isShowTrack() || !isAutoHideTrack())) onScrolled();
     }
 
     @Override
     public void setAdapter(RecyclerView.Adapter adapter) {
         super.setAdapter(adapter);
         if (adapter instanceof FastScrollAdapter) {
-            setSectionIndexer((FastScrollAdapter) adapter);
+            mFastScrollAdapter = (FastScrollAdapter) adapter;
         } else if (adapter == null) {
-            setSectionIndexer(null);
+            mFastScrollAdapter = null;
         }
     }
 
@@ -435,11 +475,6 @@ private void updateRecyclerViewPosition(float eventY) {
         }
     }
 
-    public final void setSectionIndexer(FastScrollAdapter adapter) {
-        mFastScrollAdapter = adapter;
-        invalidate();
-    }
-
     private void onScrollScreenStateChanged(int newState) {
         switch (newState) {
             case RecyclerView.SCROLL_STATE_DRAGGING:
@@ -462,7 +497,7 @@ private void showTrack() {
         int to = 0;
         switch (mPosition) {
             case LEFT:
-                from = bounds.left == 0 ? -trackWidth : bounds.left;
+                from = bounds.right == 0 ? -trackWidth : bounds.left;
                 to = mTrackPaddingLeft;
                 break;
             case RIGHT:
@@ -505,7 +540,7 @@ private void showScrollbar() {
         int to = 0;
         switch (mPosition) {
             case LEFT:
-                from = bounds.left == 0 ? -scrollbarWidth : bounds.left;
+                from = bounds.right == 0 ? -scrollbarWidth : bounds.left;
                 to = 0;
                 break;
             case RIGHT:
@@ -543,7 +578,7 @@ private void hideScrollbar() {
     private void showBubble() {
         if (mBubbleDrawable == null) return;
         if (!isShowBubble() || !isAutoHideBubble() || mIsBubbleVisible || !mIsTrackTouched) return;
-        int startAlpha = DrawableCompat.getAlpha(mBubbleDrawable);
+        int startAlpha = DrawableUtils.getAlpha(mBubbleDrawable);
         if (startAlpha == MAX_ALPHA) startAlpha = MIN_ALPHA;
         mHideBubbleAnimator.cancel();
         mShowBubbleAnimator.cancel();
@@ -556,7 +591,7 @@ private void hideBubble() {
         if (!isShowBubble() || !isAutoHideBubble() || !mIsBubbleVisible) return;
         mShowBubbleAnimator.cancel();
         mHideBubbleAnimator.cancel();
-        mHideBubbleAnimator.setIntValues(DrawableCompat.getAlpha(mBubbleDrawable), MIN_ALPHA);
+        mHideBubbleAnimator.setIntValues(DrawableUtils.getAlpha(mBubbleDrawable), MIN_ALPHA);
         mHideBubbleAnimator.start();
     }
 
@@ -590,8 +625,7 @@ private void onScrolled(float eventY) {
     }
 
     private void updateTrackPosition(int screenHeight, int screenWidth, int scrollPosition) {
-        boolean isAnimationRunning = mShowTrackAnimator != null && mShowTrackAnimator.isRunning() ||
-                mHideTrackAnimator != null && mHideTrackAnimator.isRunning();
+        boolean isAnimationRunning = mShowTrackAnimator.isRunning() || mHideTrackAnimator.isRunning();
 
         Rect bounds = mTrackDrawable.getBounds();
         int trackWidth = mTrackDrawable.getIntrinsicWidth();
@@ -674,34 +708,71 @@ public void draw(Canvas canvas) {
         if (isShowTrack()) mTrackDrawable.draw(canvas);
         if (isShowBubble() && mBubbleDrawable != null) {
             mBubbleDrawable.draw(canvas);
-            drawText(canvas);
+            if (mIsBubbleVisible || mShowBubbleAnimator.isRunning() || mHideBubbleAnimator.isRunning()) {
+                drawBubbleContent(canvas);
+            }
         }
     }
 
-    private void drawText(Canvas canvas) {
+    private void drawBubbleContent(Canvas canvas) {
+        if (mFastScrollAdapter == null) return;
         LayoutManager layoutManager = getLayoutManager();
         if (!(layoutManager instanceof LinearLayoutManager)) return;
-        if (mFastScrollAdapter == null) return;
         int position = ((LinearLayoutManager) layoutManager).findFirstVisibleItemPosition();
         if (position == RecyclerView.NO_POSITION) return;
 
-        mFastScrollAdapter.getFastScrollSection(position);
-
+        if (mFastScrollAdapter instanceof FastScrollAdapter.Text) {
+            drawText(canvas, ((FastScrollAdapter.Text) mFastScrollAdapter).getText(position));
+        } else if (mFastScrollAdapter instanceof FastScrollAdapter.ViewHolder) {
+            drawGroupViewHolder(canvas, (FastScrollAdapter.ViewHolder) mFastScrollAdapter, position);
+        }
+    }
 
+    private void drawText(Canvas canvas, @Nullable String text) {
+        if (text == null || mBubbleDrawable == null) return;
+        Rect bubbleBounds = mBubbleDrawable.getBounds();
+        int centerY = bubbleBounds.centerY();
+        int centerX = bubbleBounds.centerX();
+        mTextPaint.getTextBounds(text, 0, text.length(), mTextBounds);
+        mTextPaint.setAlpha(DrawableUtils.getAlpha(mBubbleDrawable));
+        canvas.drawText(text, centerX, centerY + (mTextBounds.height() / 2F), mTextPaint);
     }
 
-    private void updateSectionText(int adapterPosition) {
-        if (mFastScrollAdapter == null || mBubbleDrawable == null || adapterPosition < 0) return;
-//        mSectionText = "T";
-//        mFastScrollAdapter.getFastScrollSection(adapterPosition);
-//        if (mSectionText == null) return;
-//        Rect mBubbleBounds = mBubbleDrawable.getBounds();
-//        int centerY = mBubbleBounds.centerY();
-//        int centerX = mBubbleBounds.centerX();
-//        mTextPaint.getTextBounds(mSectionText, 0, mSectionText.length() - 1, mTextBounds);
-//        int halfTextWidth = mTextBounds.width() / 2;
-//        int halfTextHeight = mTextBounds.height() / 2;
-//        mTextBounds.set(centerX - halfTextWidth, centerY - halfTextHeight, centerX + halfTextWidth, centerY + halfTextHeight);
+    @SuppressWarnings("unchecked")
+    private void drawGroupViewHolder(Canvas canvas, FastScrollAdapter.ViewHolder adapter, int position) {
+        if (mBubbleDrawable == null) return;
+        Rect bounds = mBubbleDrawable.getBounds();
+
+        assert mFastScrollAdapter != null;
+        long groupId = adapter.getFastScrollGroupId(position);
+        RecyclerView.ViewHolder viewHolder = mHolderSparseArray.get((int) groupId);
+        if (viewHolder == null) {
+            viewHolder = adapter.onCreateFastScrollViewHolder(this);
+            if (viewHolder == null) return;
+
+            mHolderSparseArray.put((int) groupId, viewHolder);
+            View itemView = viewHolder.itemView;
+
+            int width = mBubbleDrawable.getIntrinsicWidth();
+            int height = mBubbleUpDrawable.getIntrinsicHeight();
+
+            int widthSpec = View.MeasureSpec.makeMeasureSpec(width, EXACTLY);
+            int heightSpec = View.MeasureSpec.makeMeasureSpec(height, EXACTLY);
+
+            itemView.measure(widthSpec, heightSpec);
+            itemView.layout(0, 0, width, height);
+        }
+        adapter.onBindFastScrollViewHolder(viewHolder, position);
+        View itemView = viewHolder.itemView;
+        Drawable backgroundDrawable = itemView.getBackground();
+        if (backgroundDrawable != null) backgroundDrawable.setAlpha(DrawableUtils.getAlpha(mBubbleDrawable));
+
+        canvas.save();
+        canvas.translate(bounds.left, bounds.top);
+        itemView.setTranslationX(bounds.left);
+        itemView.setTranslationY(bounds.top);
+        itemView.draw(canvas);
+        canvas.restore();
     }
 
 }
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/res/values/attrs.xml b/omegarecyclerview_fastscroll/src/main/res/values/attrs.xml
index b40f125..1709fb4 100644
--- a/omegarecyclerview_fastscroll/src/main/res/values/attrs.xml
+++ b/omegarecyclerview_fastscroll/src/main/res/values/attrs.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!--<declare-styleable name="OmegaFastScrollerLayout">-->
-        <!--<attr name="hideScrollbar" format="boolean" />-->
-        <!--<attr name="showBubble" format="boolean" />-->
-        <!--<attr name="showTrack" format="boolean" />-->
-        <!--<attr name="trackColor" format="color" />-->
-        <!--<attr name="handleColor" format="color" />-->
-        <!--<attr name="bubbleColor" format="color" />-->
-        <!--<attr name="bubbleTextColor" format="color" />-->
-    <!--</declare-styleable>-->
-
     <declare-styleable name="OmegaFastScrollRecyclerView">
         <attr name="trackDrawable" format="reference"/>
         <attr name="omega_trackColor" format="color"/>
@@ -53,6 +43,9 @@
         <attr name="fastScrollBubbleAnimDuration" format="integer"/>
         <attr name="fastScrollHideTrackDelay" format="integer"/>
 
+        <attr name="fastScrollTextSize" format="dimension"/>
+        <attr name="fastScrollTextColor" format="color"/>
+
     </declare-styleable>
 
 </resources>
diff --git a/omegarecyclerview_fastscroll/src/main/res/values/dimens.xml b/omegarecyclerview_fastscroll/src/main/res/values/dimens.xml
index 679094f..40d6812 100644
--- a/omegarecyclerview_fastscroll/src/main/res/values/dimens.xml
+++ b/omegarecyclerview_fastscroll/src/main/res/values/dimens.xml
@@ -17,9 +17,11 @@
     <dimen name="fastscroll_scrollbar_padding_start">8dp</dimen>
     <dimen name="fastscroll_scrollbar_padding_end">8dp</dimen>
 
-    <dimen name="omega_track_padding_right">0dp</dimen>
-    <dimen name="omega_track_padding_left">8dp</dimen>
-    <dimen name="omega_track_padding_top">0dp</dimen>
-    <dimen name="omega_track_padding_bottom">0dp</dimen>
+    <dimen name="fastscroll_track_padding_right">0dp</dimen>
+    <dimen name="fastscroll_track_padding_left">4dp</dimen>
+    <dimen name="fastscroll_track_padding_top">0dp</dimen>
+    <dimen name="fastscroll_track_padding_bottom">0dp</dimen>
+
+    <dimen name="fastscroll_text_size">40sp</dimen>
 
 </resources>
\ No newline at end of file

From 61dff2211d1e7e0dc9c21c3006f9d5891db9a716 Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Fri, 16 Aug 2019 16:01:16 +0300
Subject: [PATCH 08/32] FastScroll reverse functional added

---
 .../main/res/layout/activity_fastscroll.xml   |  7 +-
 .../OmegaFastScrollRecyclerView.java          | 70 +++++++++++--------
 2 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/app/src/main/res/layout/activity_fastscroll.xml b/app/src/main/res/layout/activity_fastscroll.xml
index 30ef33e..84e51ea 100644
--- a/app/src/main/res/layout/activity_fastscroll.xml
+++ b/app/src/main/res/layout/activity_fastscroll.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <com.omega_r.libs.omegarecyclerview_fastscroll.OmegaFastScrollRecyclerView
         android:id="@+id/recyclerview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:fastScrollVisibility="scrollbar|track|bubble"
         app:fastScrollAutoHide="scrollbar|track|bubble"
+        app:fastScrollVisibility="scrollbar|track|bubble"
         app:fastScrollbarColor="@color/colorAccent"
-        app:fastScrollbarWidth="10dp"/>
+        app:fastScrollbarWidth="10dp"
+        app:reverseLayout="false" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
index 1d6b5eb..bd7dd6f 100644
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
@@ -10,6 +10,7 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.util.SparseArray;
 import android.view.MotionEvent;
@@ -25,6 +26,7 @@
 import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
 
 import static android.view.View.MeasureSpec.EXACTLY;
+import static com.omega_r.libs.omegarecyclerview.utils.ViewUtils.isReverseLayout;
 import static com.omega_r.libs.omegarecyclerview_fastscroll.DrawableUtils.getTintedDrawable;
 import static com.omega_r.libs.omegarecyclerview_fastscroll.Position.LEFT;
 import static com.omega_r.libs.omegarecyclerview_fastscroll.Position.RIGHT;
@@ -32,8 +34,8 @@
 public class OmegaFastScrollRecyclerView extends OmegaRecyclerView {
 
     private static final long ANIM_DURATION_IN_MILLIS = 300;
-    private static final long BUBBLE_ANIM_DURATION_IN_MILLIS = 1000;
-    private static final long TRACK_HIDE_DELAY_IN_MILLIS = 1000;
+    private static final long BUBBLE_ANIM_DURATION_IN_MILLIS = 100;
+    private static final long TRACK_HIDE_DELAY_IN_MILLIS = 1500;
     private static final int MAX_ALPHA = 255;
     private static final int MIN_ALPHA = 0;
 
@@ -110,7 +112,7 @@ public void run() {
     private long mBubbleAnimDuration = BUBBLE_ANIM_DURATION_IN_MILLIS;
     private long mHideTrackDelay = TRACK_HIDE_DELAY_IN_MILLIS;
 
-    private float mActionDownYDiff;
+    private float mLastEventY;
 
     public OmegaFastScrollRecyclerView(Context context) {
         super(context);
@@ -387,6 +389,7 @@ public void setAdapter(RecyclerView.Adapter adapter) {
     @SuppressLint("ClickableViewAccessibility")
     public boolean onTouchEvent(MotionEvent event) {
         if (!isEnabled() || getVisibility() != VISIBLE) return super.onTouchEvent(event);
+        if (!isShowScrollbar() && !isShowTrack() && !isShowBubble()) return super.onTouchEvent(event);
 
         int action = event.getAction();
         float eventX = event.getX();
@@ -397,35 +400,35 @@ public boolean onTouchEvent(MotionEvent event) {
                 mIsScrollbarTouched = isScrollbarTouched(eventX);
                 mIsTrackTouched = isTrackTouched(eventX, eventY);
                 mIsBubbleTouched = isBubbleTouched(eventX, eventY);
-
-                if (isShowScrollbar() || isShowTrack() || isShowBubble()) {
-                    if (mIsTrackTouched || mIsScrollbarTouched || mIsBubbleTouched) {
-                        mActionDownYDiff = (mIsTrackTouched || mIsBubbleTouched) ? mTrackDrawable.getBounds().top - eventY : 0;
-                        requestDisallowInterceptTouchEvent(true);
-                        removeOnScrollListener(mScrollListener);
-                        removeCallbacks(mHiderRunnable);
-
-                        if (mIsTrackTouched) {
-                            showBubble();
-                        } else if (!mIsBubbleTouched) {
-                            updateRecyclerViewPosition(eventY);
-                            onScrolled(eventY);
-                        }
-                        showScrollbar();
-                        showTrack();
-                        return true;
+                if (mIsTrackTouched || mIsScrollbarTouched || mIsBubbleTouched) {
+                    mLastEventY = eventY;
+                    requestDisallowInterceptTouchEvent(true);
+                    removeOnScrollListener(mScrollListener);
+                    removeCallbacks(mHiderRunnable);
+
+                    if (mIsTrackTouched) {
+                        showBubble();
+                    } else if (!mIsBubbleTouched) {
+                        updateRecyclerViewPosition(eventY);
+                        onScrolled(eventY);
                     }
+                    showScrollbar();
+                    showTrack();
+                    return true;
                 }
             case MotionEvent.ACTION_MOVE:
                 if (mIsTrackTouched || mIsScrollbarTouched || mIsBubbleTouched) {
-                    float y = Math.min(getHeight(), Math.max(0, eventY + mActionDownYDiff));
-                    updateRecyclerViewPosition(y);
+                    float diff = eventY - mLastEventY;
+                    Rect bounds = mTrackDrawable.getBounds();
+                    float y = bounds.top + diff;
+                    mLastEventY = eventY;
+                    y = Math.min(getHeight(), Math.max(0, y));
+                    updateRecyclerViewPosition(isReverseLayout(this) ? y + bounds.height() : y);
                     onScrolled(y);
                     return true;
                 }
             case MotionEvent.ACTION_UP:
                 if (mIsTrackTouched || mIsScrollbarTouched || mIsBubbleTouched) {
-                    mActionDownYDiff = 0;
                     postDelayed(mHiderRunnable, mHideTrackDelay);
                     requestDisallowInterceptTouchEvent(false);
                     mIsTrackTouched = isShowTrack() && !isAutoHideTrack();
@@ -466,7 +469,8 @@ private void updateRecyclerViewPosition(float eventY) {
 
         int itemCount = adapter.getItemCount();
         float positionPercent = (eventY * 100) / getHeight();
-        int newPosition = (int) ((itemCount * positionPercent) / 100);
+        int newPosition = Math.round((itemCount * positionPercent) / 100);
+        if (isReverseLayout(this)) newPosition = itemCount - newPosition;
 
         if (layoutManager instanceof LinearLayoutManager) {
             ((LinearLayoutManager) layoutManager).scrollToPositionWithOffset(newPosition, 0);
@@ -478,6 +482,7 @@ private void updateRecyclerViewPosition(float eventY) {
     private void onScrollScreenStateChanged(int newState) {
         switch (newState) {
             case RecyclerView.SCROLL_STATE_DRAGGING:
+            case RecyclerView.SCROLL_STATE_SETTLING:
                 removeCallbacks(mHiderRunnable);
                 showScrollbar();
                 showTrack();
@@ -611,7 +616,7 @@ private int getScrollPosition() {
         int scrollOffset = computeVerticalScrollOffset();
         double scrollPercents = (scrollOffset == 0) ? 0 : (scrollOffset * 100.0 / scrollRange);
         height = height - mTrackPaddingTop - mTrackPaddingBottom - mTrackDrawable.getIntrinsicHeight();
-
+        if (isReverseLayout(this) && scrollRange < 0) return height;
         return (int) (mTrackPaddingTop + ((height * scrollPercents) / 100));
     }
 
@@ -755,19 +760,22 @@ private void drawGroupViewHolder(Canvas canvas, FastScrollAdapter.ViewHolder ada
 
             int width = mBubbleDrawable.getIntrinsicWidth();
             int height = mBubbleUpDrawable.getIntrinsicHeight();
-
-            int widthSpec = View.MeasureSpec.makeMeasureSpec(width, EXACTLY);
-            int heightSpec = View.MeasureSpec.makeMeasureSpec(height, EXACTLY);
-
+            int widthSpec = MeasureSpec.makeMeasureSpec(width, EXACTLY);
+            int heightSpec = MeasureSpec.makeMeasureSpec(height, EXACTLY);
             itemView.measure(widthSpec, heightSpec);
             itemView.layout(0, 0, width, height);
         }
         adapter.onBindFastScrollViewHolder(viewHolder, position);
         View itemView = viewHolder.itemView;
-        Drawable backgroundDrawable = itemView.getBackground();
-        if (backgroundDrawable != null) backgroundDrawable.setAlpha(DrawableUtils.getAlpha(mBubbleDrawable));
 
         canvas.save();
+        int alpha = DrawableUtils.getAlpha(mBubbleDrawable);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            canvas.saveLayerAlpha(bounds.left, bounds.top, bounds.right, bounds.bottom, alpha);
+        } else {
+            Drawable backgroundDrawable = itemView.getBackground();
+            if (backgroundDrawable != null) backgroundDrawable.setAlpha(alpha);
+        }
         canvas.translate(bounds.left, bounds.top);
         itemView.setTranslationX(bounds.left);
         itemView.setTranslationY(bounds.top);

From dc616f3d4de0bb9aa89cd3a1c3bb04ed89a06e9f Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Fri, 16 Aug 2019 16:05:51 +0300
Subject: [PATCH 09/32] onDetachedFromWindow overrided

---
 .../OmegaFastScrollRecyclerView.java                  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
index bd7dd6f..0931b9f 100644
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
@@ -385,6 +385,17 @@ public void setAdapter(RecyclerView.Adapter adapter) {
         }
     }
 
+    @Override
+    protected void onDetachedFromWindow() {
+        mShowBubbleAnimator.cancel();
+        mShowScrollbarAnimator.cancel();
+        mShowTrackAnimator.cancel();
+        mHideBubbleAnimator.cancel();
+        mHideScrollbarAnimator.cancel();
+        mHideTrackAnimator.cancel();
+        super.onDetachedFromWindow();
+    }
+
     @Override
     @SuppressLint("ClickableViewAccessibility")
     public boolean onTouchEvent(MotionEvent event) {

From 06f5c061a1c0b5fb089cc92bd79811bb71d99e54 Mon Sep 17 00:00:00 2001
From: Nikita Ivanov <nikita.ivanov@omega-r.com>
Date: Mon, 26 Aug 2019 09:56:12 +0300
Subject: [PATCH 10/32] ExpandableRecyclerView moved to external module

---
 .idea/modules.xml                             |  1 +
 app/build.gradle                              |  1 +
 .../core/ExpandableActivity.java              | 10 ++---
 .../core/ExpandableAdapter.java               |  2 +-
 .../expandable_example/core/SimpleData.java   |  3 +-
 .../support_sticky/DefaultStickyAdapter.java  |  4 +-
 .../DefaultStickyExpandableActivity.java      |  2 +-
 .../main/res/layout/activity_expandable.xml   |  2 +-
 .../animation/OnAnimationEndListener.java     |  6 ---
 .../data/ExpandableType.java                  |  5 ---
 .../data/UniqueIdProvider.java                |  5 ---
 omegarecyclerview_expandable/.gitignore       |  1 +
 omegarecyclerview_expandable/build.gradle     | 27 ++++++++++++
 .../consumer-rules.pro                        |  0
 .../proguard-rules.pro                        | 21 +++++++++
 .../ExampleInstrumentedTest.java              | 27 ++++++++++++
 .../src/main/AndroidManifest.xml              |  2 +
 .../ChildClippingFrameLayout.java             | 15 ++++---
 .../ExpandableStickyDecoration.java           | 14 +++---
 .../OmegaExpandableRecyclerView.java          | 43 ++++++++++---------
 .../animation/AnimationHelper.java            |  4 +-
 .../animation/ExpandableItemAnimator.java     |  9 ++--
 .../animation/OnAnimationEndListener.java     |  6 +++
 .../DropDownItemAnimator.java                 | 13 +++---
 .../standard_animations/FadeItemAnimator.java |  6 +--
 .../data/ExpandableType.java                  |  5 +++
 .../data/ExpandableViewData.java              |  2 +-
 .../data/FlatGroupingList.java                |  3 +-
 .../data/GroupProvider.java                   |  2 +-
 .../data/PositionData.java                    |  2 +-
 .../data/Range.java                           |  2 +-
 .../data/UniqueIdProvider.java                |  5 +++
 .../ExpandableLayoutManager.java              | 12 +++---
 .../src/main/res/values/strings.xml           |  3 ++
 .../ExampleUnitTest.java                      | 17 ++++++++
 settings.gradle                               |  2 +-
 36 files changed, 194 insertions(+), 90 deletions(-)
 delete mode 100644 omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/OnAnimationEndListener.java
 delete mode 100644 omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableType.java
 delete mode 100644 omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/UniqueIdProvider.java
 create mode 100644 omegarecyclerview_expandable/.gitignore
 create mode 100644 omegarecyclerview_expandable/build.gradle
 create mode 100644 omegarecyclerview_expandable/consumer-rules.pro
 create mode 100644 omegarecyclerview_expandable/proguard-rules.pro
 create mode 100644 omegarecyclerview_expandable/src/androidTest/java/com/omega_r/libs/omegarecyclerview_expandable/ExampleInstrumentedTest.java
 create mode 100644 omegarecyclerview_expandable/src/main/AndroidManifest.xml
 rename {omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view => omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable}/ChildClippingFrameLayout.java (94%)
 rename {omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view => omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable}/ExpandableStickyDecoration.java (99%)
 rename {omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view => omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable}/OmegaExpandableRecyclerView.java (95%)
 rename {omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view => omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable}/animation/AnimationHelper.java (95%)
 rename {omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view => omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable}/animation/ExpandableItemAnimator.java (99%)
 create mode 100644 omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/OnAnimationEndListener.java
 rename {omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view => omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable}/animation/standard_animations/DropDownItemAnimator.java (94%)
 rename {omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view => omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable}/animation/standard_animations/FadeItemAnimator.java (86%)
 create mode 100644 omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/ExpandableType.java
 rename {omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view => omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable}/data/ExpandableViewData.java (96%)
 rename {omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view => omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable}/data/FlatGroupingList.java (98%)
 rename {omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view => omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable}/data/GroupProvider.java (73%)
 rename {omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view => omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable}/data/PositionData.java (86%)
 rename {omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view => omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable}/data/Range.java (94%)
 create mode 100644 omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/UniqueIdProvider.java
 rename {omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view => omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable}/layout_manager/ExpandableLayoutManager.java (91%)
 create mode 100644 omegarecyclerview_expandable/src/main/res/values/strings.xml
 create mode 100644 omegarecyclerview_expandable/src/test/java/com/omega_r/libs/omegarecyclerview_expandable/ExampleUnitTest.java

diff --git a/.idea/modules.xml b/.idea/modules.xml
index a8b3e35..71ccdd0 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,6 +5,7 @@
       <module fileurl="file://$PROJECT_DIR$/OmegaRecyclerView.iml" filepath="$PROJECT_DIR$/OmegaRecyclerView.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/omegarecyclerview/omegarecyclerview.iml" filepath="$PROJECT_DIR$/omegarecyclerview/omegarecyclerview.iml" />
+      <module fileurl="file://$PROJECT_DIR$/omegarecyclerview_expandable/omegarecyclerview_expandable.iml" filepath="$PROJECT_DIR$/omegarecyclerview_expandable/omegarecyclerview_expandable.iml" />
       <module fileurl="file://$PROJECT_DIR$/omegarecyclerview_fastscroll/omegarecyclerview_fastscroll.iml" filepath="$PROJECT_DIR$/omegarecyclerview_fastscroll/omegarecyclerview_fastscroll.iml" />
     </modules>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 01a63cf..e1949ba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,6 +33,7 @@ dependencies {
 
     implementation project(':omegarecyclerview')
     implementation project(':omegarecyclerview_fastscroll')
+    implementation project(':omegarecyclerview_expandable')
 
     androidTestImplementation('com.android.support.test.espresso:espresso-core:' + rootProject.espressoVersion, {
         exclude group: 'com.android.support', module: 'support-annotations'
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableActivity.java
index eea5621..baf519b 100644
--- a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableActivity.java
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableActivity.java
@@ -9,11 +9,11 @@
 import android.widget.CompoundButton;
 import android.widget.RadioButton;
 
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.OmegaExpandableRecyclerView;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation.ExpandableItemAnimator;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation.standard_animations.DropDownItemAnimator;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation.standard_animations.FadeItemAnimator;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data.GroupProvider;
+import com.omega_r.libs.omegarecyclerview_expandable.OmegaExpandableRecyclerView;
+import com.omega_r.libs.omegarecyclerview_expandable.animation.ExpandableItemAnimator;
+import com.omega_r.libs.omegarecyclerview_expandable.animation.standard_animations.DropDownItemAnimator;
+import com.omega_r.libs.omegarecyclerview_expandable.animation.standard_animations.FadeItemAnimator;
+import com.omega_r.libs.omegarecyclerview_expandable.data.GroupProvider;
 import com.omega_r.omegarecyclerview.R;
 
 import java.util.Arrays;
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableAdapter.java
index e687e74..4989389 100644
--- a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableAdapter.java
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableAdapter.java
@@ -4,7 +4,7 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.OmegaExpandableRecyclerView;
+import com.omega_r.libs.omegarecyclerview_expandable.OmegaExpandableRecyclerView;
 import com.omega_r.omegarecyclerview.R;
 
 public class ExpandableAdapter extends OmegaExpandableRecyclerView.Adapter<QuoteGlobalInfo, Quote> {
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/SimpleData.java b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/SimpleData.java
index fa40ca3..4b86d33 100644
--- a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/SimpleData.java
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/SimpleData.java
@@ -2,7 +2,8 @@
 
 import androidx.annotation.Nullable;
 
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data.GroupProvider;
+
+import com.omega_r.libs.omegarecyclerview_expandable.data.GroupProvider;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyAdapter.java
index 7bafeae..bd5a75c 100644
--- a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyAdapter.java
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyAdapter.java
@@ -6,10 +6,10 @@
 import android.widget.Toast;
 
 import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.OmegaExpandableRecyclerView;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data.ExpandableViewData;
 import com.omega_r.libs.omegarecyclerview.sticky_decoration.StickyAdapter;
 import com.omega_r.libs.omegarecyclerview.sticky_decoration.HeaderStickyDecoration;
+import com.omega_r.libs.omegarecyclerview_expandable.OmegaExpandableRecyclerView;
+import com.omega_r.libs.omegarecyclerview_expandable.data.ExpandableViewData;
 import com.omega_r.omegarecyclerview.R;
 import com.omega_r.omegarecyclerview.expandable_example.core.Quote;
 import com.omega_r.omegarecyclerview.expandable_example.core.QuoteGlobalInfo;
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyExpandableActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyExpandableActivity.java
index 6b0f672..5a203db 100644
--- a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyExpandableActivity.java
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyExpandableActivity.java
@@ -1,6 +1,6 @@
 package com.omega_r.omegarecyclerview.expandable_example.support_sticky;
 
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.OmegaExpandableRecyclerView;
+import com.omega_r.libs.omegarecyclerview_expandable.OmegaExpandableRecyclerView;
 import com.omega_r.omegarecyclerview.expandable_example.core.ExpandableActivity;
 
 import omega.com.annotations.OmegaActivity;
diff --git a/app/src/main/res/layout/activity_expandable.xml b/app/src/main/res/layout/activity_expandable.xml
index 2994287..08904be 100644
--- a/app/src/main/res/layout/activity_expandable.xml
+++ b/app/src/main/res/layout/activity_expandable.xml
@@ -60,7 +60,7 @@
 
     </RadioGroup>
 
-    <com.omega_r.libs.omegarecyclerview.expandable_recycler_view.OmegaExpandableRecyclerView
+    <com.omega_r.libs.omegarecyclerview_expandable.OmegaExpandableRecyclerView
         android:id="@+id/recyclerview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/OnAnimationEndListener.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/OnAnimationEndListener.java
deleted file mode 100644
index 4575b26..0000000
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/OnAnimationEndListener.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation;
-
-public interface OnAnimationEndListener {
-    void onAnimationEnd();
-}
-
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableType.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableType.java
deleted file mode 100644
index f9bd527..0000000
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableType.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data;
-
-public enum ExpandableType {
-    GROUP, CHILD
-}
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/UniqueIdProvider.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/UniqueIdProvider.java
deleted file mode 100644
index c1b08ee..0000000
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/UniqueIdProvider.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data;
-
-public interface UniqueIdProvider {
-    long provideUniqueId();
-}
diff --git a/omegarecyclerview_expandable/.gitignore b/omegarecyclerview_expandable/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/omegarecyclerview_expandable/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/omegarecyclerview_expandable/build.gradle b/omegarecyclerview_expandable/build.gradle
new file mode 100644
index 0000000..3522440
--- /dev/null
+++ b/omegarecyclerview_expandable/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+
+android {
+    compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':omegarecyclerview')
+    implementation 'androidx.appcompat:appcompat:' + rootProject.appcompatVersion
+    implementation 'com.google.android.material:material:' + rootProject.materialVersion
+}
+
diff --git a/omegarecyclerview_expandable/consumer-rules.pro b/omegarecyclerview_expandable/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/omegarecyclerview_expandable/proguard-rules.pro b/omegarecyclerview_expandable/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/omegarecyclerview_expandable/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/omegarecyclerview_expandable/src/androidTest/java/com/omega_r/libs/omegarecyclerview_expandable/ExampleInstrumentedTest.java b/omegarecyclerview_expandable/src/androidTest/java/com/omega_r/libs/omegarecyclerview_expandable/ExampleInstrumentedTest.java
new file mode 100644
index 0000000..7dd3dc2
--- /dev/null
+++ b/omegarecyclerview_expandable/src/androidTest/java/com/omega_r/libs/omegarecyclerview_expandable/ExampleInstrumentedTest.java
@@ -0,0 +1,27 @@
+package com.omega_r.libs.omegarecyclerview_expandable;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+        assertEquals("com.omega_r.libs.omegarecyclerview_expandable.test", appContext.getPackageName());
+    }
+}
diff --git a/omegarecyclerview_expandable/src/main/AndroidManifest.xml b/omegarecyclerview_expandable/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..ede94fd
--- /dev/null
+++ b/omegarecyclerview_expandable/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.omega_r.libs.omegarecyclerview_expandable" />
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ChildClippingFrameLayout.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/ChildClippingFrameLayout.java
similarity index 94%
rename from omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ChildClippingFrameLayout.java
rename to omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/ChildClippingFrameLayout.java
index 287df7c..5a4a4cd 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ChildClippingFrameLayout.java
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/ChildClippingFrameLayout.java
@@ -1,17 +1,18 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view;
+package com.omega_r.libs.omegarecyclerview_expandable;
 
 import android.animation.ValueAnimator;
 import android.graphics.Canvas;
 import android.graphics.Path;
 import android.graphics.RectF;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.List;
 
 public class ChildClippingFrameLayout extends FrameLayout {
@@ -32,9 +33,9 @@ public ChildClippingFrameLayout(View contentView) {
 
     private void setupLayoutParams(@NonNull View contentView) {
         MarginLayoutParams contentMarginLp = (MarginLayoutParams) contentView.getLayoutParams();
-        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT,
-                FrameLayout.LayoutParams.WRAP_CONTENT);
+        LayoutParams lp = new LayoutParams(
+                LayoutParams.MATCH_PARENT,
+                LayoutParams.WRAP_CONTENT);
 
         lp.topMargin = contentMarginLp.topMargin;
         lp.bottomMargin = contentMarginLp.bottomMargin;
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ExpandableStickyDecoration.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/ExpandableStickyDecoration.java
similarity index 99%
rename from omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ExpandableStickyDecoration.java
rename to omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/ExpandableStickyDecoration.java
index cbafe65..8004004 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ExpandableStickyDecoration.java
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/ExpandableStickyDecoration.java
@@ -1,4 +1,4 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view;
+package com.omega_r.libs.omegarecyclerview_expandable;
 
 import android.graphics.Canvas;
 import android.graphics.Rect;
@@ -6,8 +6,13 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.omega_r.libs.omegarecyclerview.sticky_decoration.StickyAdapter;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.util.Pair;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.omega_r.libs.omegarecyclerview.sticky_decoration.BaseStickyDecoration;
+import com.omega_r.libs.omegarecyclerview.sticky_decoration.StickyAdapter;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -16,11 +21,6 @@
 import java.util.List;
 import java.util.Map;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.util.Pair;
-import androidx.recyclerview.widget.RecyclerView;
-
 import static com.omega_r.libs.omegarecyclerview.utils.ViewUtils.isReverseLayout;
 
 public class ExpandableStickyDecoration extends BaseStickyDecoration {
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/OmegaExpandableRecyclerView.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/OmegaExpandableRecyclerView.java
similarity index 95%
rename from omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/OmegaExpandableRecyclerView.java
rename to omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/OmegaExpandableRecyclerView.java
index fefbce8..6f4e3ee 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/OmegaExpandableRecyclerView.java
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/OmegaExpandableRecyclerView.java
@@ -1,4 +1,4 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view;
+package com.omega_r.libs.omegarecyclerview_expandable;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -9,6 +9,13 @@
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.os.SystemClock;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+
 import androidx.annotation.CallSuper;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.IntDef;
@@ -17,28 +24,22 @@
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.RecyclerView;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
 
 import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
 import com.omega_r.libs.omegarecyclerview.R;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation.AnimationHelper;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation.ExpandableItemAnimator;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation.OnAnimationEndListener;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation.standard_animations.DropDownItemAnimator;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation.standard_animations.FadeItemAnimator;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data.ExpandableViewData;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data.FlatGroupingList;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data.GroupProvider;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data.Range;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data.UniqueIdProvider;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.layout_manager.ExpandableLayoutManager;
-import com.omega_r.libs.omegarecyclerview.sticky_decoration.StickyAdapter;
 import com.omega_r.libs.omegarecyclerview.sticky_decoration.BaseStickyDecoration;
+import com.omega_r.libs.omegarecyclerview.sticky_decoration.StickyAdapter;
+import com.omega_r.libs.omegarecyclerview_expandable.animation.AnimationHelper;
+import com.omega_r.libs.omegarecyclerview_expandable.animation.ExpandableItemAnimator;
+import com.omega_r.libs.omegarecyclerview_expandable.animation.OnAnimationEndListener;
+import com.omega_r.libs.omegarecyclerview_expandable.animation.standard_animations.DropDownItemAnimator;
+import com.omega_r.libs.omegarecyclerview_expandable.animation.standard_animations.FadeItemAnimator;
+import com.omega_r.libs.omegarecyclerview_expandable.data.ExpandableViewData;
+import com.omega_r.libs.omegarecyclerview_expandable.data.FlatGroupingList;
+import com.omega_r.libs.omegarecyclerview_expandable.data.GroupProvider;
+import com.omega_r.libs.omegarecyclerview_expandable.data.Range;
+import com.omega_r.libs.omegarecyclerview_expandable.data.UniqueIdProvider;
+import com.omega_r.libs.omegarecyclerview_expandable.layout_manager.ExpandableLayoutManager;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -104,7 +105,7 @@ public OmegaExpandableRecyclerView(Context context, @Nullable AttributeSet attrs
 
     private void init() {
         setItemAnimator(requestItemAnimator());
-        setChildDrawingOrderCallback(new RecyclerView.ChildDrawingOrderCallback() {
+        setChildDrawingOrderCallback(new ChildDrawingOrderCallback() {
             @Override
             public int onGetChildDrawingOrder(int childCount, int i) {
                 return childCount - i - 1;
@@ -654,7 +655,7 @@ private void bindWithBackground(CH item, @DrawableRes int backgroundsRes, int ba
     //endregion
 
     //region ViewHolders
-    static abstract class BaseViewHolder<T> extends OmegaRecyclerView.ViewHolder {
+    static abstract class BaseViewHolder<T> extends ViewHolder {
         private T item;
 
         BaseViewHolder(ViewGroup parent, @LayoutRes int res) {
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/AnimationHelper.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/AnimationHelper.java
similarity index 95%
rename from omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/AnimationHelper.java
rename to omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/AnimationHelper.java
index 599e710..29566dc 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/AnimationHelper.java
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/AnimationHelper.java
@@ -1,10 +1,10 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation;
+package com.omega_r.libs.omegarecyclerview_expandable.animation;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.OmegaExpandableRecyclerView;
+import com.omega_r.libs.omegarecyclerview_expandable.OmegaExpandableRecyclerView;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/ExpandableItemAnimator.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/ExpandableItemAnimator.java
similarity index 99%
rename from omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/ExpandableItemAnimator.java
rename to omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/ExpandableItemAnimator.java
index 94fadb3..51f82b7 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/ExpandableItemAnimator.java
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/ExpandableItemAnimator.java
@@ -1,7 +1,9 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation;
+package com.omega_r.libs.omegarecyclerview_expandable.animation;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
+import android.view.View;
+import android.view.ViewPropertyAnimator;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -10,10 +12,7 @@
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import androidx.recyclerview.widget.SimpleItemAnimator;
 
-import android.view.View;
-import android.view.ViewPropertyAnimator;
-
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.OmegaExpandableRecyclerView;
+import com.omega_r.libs.omegarecyclerview_expandable.OmegaExpandableRecyclerView;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/OnAnimationEndListener.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/OnAnimationEndListener.java
new file mode 100644
index 0000000..61322ee
--- /dev/null
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/OnAnimationEndListener.java
@@ -0,0 +1,6 @@
+package com.omega_r.libs.omegarecyclerview_expandable.animation;
+
+public interface OnAnimationEndListener {
+    void onAnimationEnd();
+}
+
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/DropDownItemAnimator.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/standard_animations/DropDownItemAnimator.java
similarity index 94%
rename from omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/DropDownItemAnimator.java
rename to omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/standard_animations/DropDownItemAnimator.java
index 1ad4c5a..a9e8eda 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/DropDownItemAnimator.java
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/standard_animations/DropDownItemAnimator.java
@@ -1,16 +1,17 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation.standard_animations;
+package com.omega_r.libs.omegarecyclerview_expandable.animation.standard_animations;
 
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.os.Build;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewPropertyAnimator;
 
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.ChildClippingFrameLayout;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.OmegaExpandableRecyclerView;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation.ExpandableItemAnimator;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.layout_manager.ExpandableLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.omega_r.libs.omegarecyclerview_expandable.ChildClippingFrameLayout;
+import com.omega_r.libs.omegarecyclerview_expandable.OmegaExpandableRecyclerView;
+import com.omega_r.libs.omegarecyclerview_expandable.animation.ExpandableItemAnimator;
+import com.omega_r.libs.omegarecyclerview_expandable.layout_manager.ExpandableLayoutManager;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/FadeItemAnimator.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/standard_animations/FadeItemAnimator.java
similarity index 86%
rename from omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/FadeItemAnimator.java
rename to omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/standard_animations/FadeItemAnimator.java
index a0d5564..99184a9 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/standard_animations/FadeItemAnimator.java
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/animation/standard_animations/FadeItemAnimator.java
@@ -1,9 +1,9 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation.standard_animations;
+package com.omega_r.libs.omegarecyclerview_expandable.animation.standard_animations;
 
 import android.view.ViewPropertyAnimator;
 
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.OmegaExpandableRecyclerView;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation.ExpandableItemAnimator;
+import com.omega_r.libs.omegarecyclerview_expandable.OmegaExpandableRecyclerView;
+import com.omega_r.libs.omegarecyclerview_expandable.animation.ExpandableItemAnimator;
 
 public final class FadeItemAnimator extends ExpandableItemAnimator {
     private static final int FADE_DURATION = 100;
diff --git a/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/ExpandableType.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/ExpandableType.java
new file mode 100644
index 0000000..c711f15
--- /dev/null
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/ExpandableType.java
@@ -0,0 +1,5 @@
+package com.omega_r.libs.omegarecyclerview_expandable.data;
+
+public enum ExpandableType {
+    GROUP, CHILD
+}
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableViewData.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/ExpandableViewData.java
similarity index 96%
rename from omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableViewData.java
rename to omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/ExpandableViewData.java
index 7be9c16..b9aa5d2 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/ExpandableViewData.java
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/ExpandableViewData.java
@@ -1,4 +1,4 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data;
+package com.omega_r.libs.omegarecyclerview_expandable.data;
 
 
 import androidx.annotation.NonNull;
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/FlatGroupingList.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/FlatGroupingList.java
similarity index 98%
rename from omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/FlatGroupingList.java
rename to omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/FlatGroupingList.java
index dedc0c5..ecddd47 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/FlatGroupingList.java
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/FlatGroupingList.java
@@ -1,7 +1,8 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data;
+package com.omega_r.libs.omegarecyclerview_expandable.data;
 
 import android.os.Bundle;
 import android.os.Parcelable;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/GroupProvider.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/GroupProvider.java
similarity index 73%
rename from omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/GroupProvider.java
rename to omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/GroupProvider.java
index e5727fc..de9af73 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/GroupProvider.java
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/GroupProvider.java
@@ -1,4 +1,4 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data;
+package com.omega_r.libs.omegarecyclerview_expandable.data;
 
 import androidx.annotation.Nullable;
 
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/PositionData.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/PositionData.java
similarity index 86%
rename from omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/PositionData.java
rename to omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/PositionData.java
index bb89333..c8a7aa6 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/PositionData.java
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/PositionData.java
@@ -1,4 +1,4 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data;
+package com.omega_r.libs.omegarecyclerview_expandable.data;
 
 public class PositionData {
     public static final int POSITION_NOT_FOUND = -1;
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/Range.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/Range.java
similarity index 94%
rename from omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/Range.java
rename to omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/Range.java
index 6c977c8..f6195bc 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/data/Range.java
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/Range.java
@@ -1,4 +1,4 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data;
+package com.omega_r.libs.omegarecyclerview_expandable.data;
 
 import androidx.annotation.NonNull;
 
diff --git a/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/UniqueIdProvider.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/UniqueIdProvider.java
new file mode 100644
index 0000000..2a9528d
--- /dev/null
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/data/UniqueIdProvider.java
@@ -0,0 +1,5 @@
+package com.omega_r.libs.omegarecyclerview_expandable.data;
+
+public interface UniqueIdProvider {
+    long provideUniqueId();
+}
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/layout_manager/ExpandableLayoutManager.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/layout_manager/ExpandableLayoutManager.java
similarity index 91%
rename from omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/layout_manager/ExpandableLayoutManager.java
rename to omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/layout_manager/ExpandableLayoutManager.java
index 30914fd..091f23a 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/layout_manager/ExpandableLayoutManager.java
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/layout_manager/ExpandableLayoutManager.java
@@ -1,19 +1,19 @@
-package com.omega_r.libs.omegarecyclerview.expandable_recycler_view.layout_manager;
+package com.omega_r.libs.omegarecyclerview_expandable.layout_manager;
 
 import android.content.Context;
 import android.os.Build;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.OmegaExpandableRecyclerView;
-import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data.Range;
-
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.ExpandedRecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.omega_r.libs.omegarecyclerview_expandable.OmegaExpandableRecyclerView;
+import com.omega_r.libs.omegarecyclerview_expandable.data.Range;
+
 public class ExpandableLayoutManager extends LinearLayoutManager {
 
     public static final float DEFAULT_CHILD_Z = -50f;
diff --git a/omegarecyclerview_expandable/src/main/res/values/strings.xml b/omegarecyclerview_expandable/src/main/res/values/strings.xml
new file mode 100644
index 0000000..4fcf74c
--- /dev/null
+++ b/omegarecyclerview_expandable/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">omegarecyclerview_expandable</string>
+</resources>
diff --git a/omegarecyclerview_expandable/src/test/java/com/omega_r/libs/omegarecyclerview_expandable/ExampleUnitTest.java b/omegarecyclerview_expandable/src/test/java/com/omega_r/libs/omegarecyclerview_expandable/ExampleUnitTest.java
new file mode 100644
index 0000000..8ff8e3e
--- /dev/null
+++ b/omegarecyclerview_expandable/src/test/java/com/omega_r/libs/omegarecyclerview_expandable/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.omega_r.libs.omegarecyclerview_expandable;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 026e718..03651e5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':omegarecyclerview', ':omegarecyclerview_fastscroll'
+include ':app', ':omegarecyclerview', ':omegarecyclerview_fastscroll', ':omegarecyclerview_expandable'

From 693fee4d84ffc7677e17be6dff3e3be4a388318f Mon Sep 17 00:00:00 2001
From: Nikita Ivanov <nikita.ivanov@omega-r.com>
Date: Mon, 26 Aug 2019 11:14:24 +0300
Subject: [PATCH 11/32] fixed bubble hiding

---
 .../AnimatorListener.java                     | 36 -------------------
 .../DrawableUtils.java                        |  2 +-
 .../OmegaFastScrollRecyclerView.java          | 13 +++----
 3 files changed, 8 insertions(+), 43 deletions(-)
 delete mode 100644 omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/AnimatorListener.java

diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/AnimatorListener.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/AnimatorListener.java
deleted file mode 100644
index ae30645..0000000
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/AnimatorListener.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.omega_r.libs.omegarecyclerview_fastscroll;
-
-import android.animation.Animator;
-
-class AnimatorListener implements Animator.AnimatorListener {
-
-    @Override
-    public void onAnimationStart(Animator animation, boolean isReverse) {
-        // nothing
-    }
-
-    @Override
-    public void onAnimationEnd(Animator animation, boolean isReverse) {
-        // nothing
-    }
-
-    @Override
-    public void onAnimationStart(Animator animation) {
-        // nothing
-    }
-
-    @Override
-    public void onAnimationEnd(Animator animation) {
-        // nothing
-    }
-
-    @Override
-    public void onAnimationCancel(Animator animation) {
-        // nothing
-    }
-
-    @Override
-    public void onAnimationRepeat(Animator animation) {
-        // nothing
-    }
-}
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/DrawableUtils.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/DrawableUtils.java
index d585cb7..a5418c2 100644
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/DrawableUtils.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/DrawableUtils.java
@@ -32,7 +32,7 @@ public static Drawable getTintedDrawable(@NonNull Drawable drawable, @ColorInt i
     public static int getAlpha(@NonNull Drawable drawable) {
         if (SDK_INT >= KITKAT) return drawable.getAlpha();
 
-        if( drawable instanceof ColorDrawable) {
+        if (drawable instanceof ColorDrawable) {
             return ((ColorDrawable) drawable).getColor() >>> 24;
         } else if( drawable instanceof BitmapDrawable) {
             return ((BitmapDrawable) drawable).getPaint().getAlpha();
diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
index 0931b9f..e9bc412 100644
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
@@ -1,6 +1,7 @@
 package com.omega_r.libs.omegarecyclerview_fastscroll;
 
 import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -265,7 +266,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
         };
         mShowScrollbarAnimator.setDuration(mAnimDuration);
         mShowScrollbarAnimator.addUpdateListener(scrollbarAnimator);
-        mShowScrollbarAnimator.addListener(new AnimatorListener() {
+        mShowScrollbarAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
                 mIsScrollbarVisible = true;
@@ -273,7 +274,7 @@ public void onAnimationEnd(Animator animation) {
         });
         mHideScrollbarAnimator.setDuration(mAnimDuration);
         mHideScrollbarAnimator.addUpdateListener(scrollbarAnimator);
-        mHideScrollbarAnimator.addListener(new AnimatorListener() {
+        mHideScrollbarAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
                 mIsScrollbarVisible = false;
@@ -292,7 +293,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
         };
         mShowTrackAnimator.setDuration(mAnimDuration);
         mShowTrackAnimator.addUpdateListener(trackAnimator);
-        mShowTrackAnimator.addListener(new AnimatorListener() {
+        mShowTrackAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
                 mIsTrackVisible = true;
@@ -300,7 +301,7 @@ public void onAnimationEnd(Animator animation) {
         });
         mHideTrackAnimator.setDuration(mAnimDuration);
         mHideTrackAnimator.addUpdateListener(trackAnimator);
-        mHideTrackAnimator.addListener(new AnimatorListener() {
+        mHideTrackAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
                 mIsTrackVisible = false;
@@ -318,7 +319,7 @@ public void onAnimationUpdate(ValueAnimator animation) {
         };
         mShowBubbleAnimator.setDuration(mBubbleAnimDuration);
         mShowBubbleAnimator.addUpdateListener(bubbleAnimator);
-        mShowBubbleAnimator.addListener(new AnimatorListener() {
+        mShowBubbleAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
                 mIsBubbleVisible = true;
@@ -326,7 +327,7 @@ public void onAnimationEnd(Animator animation) {
         });
         mHideBubbleAnimator.setDuration(mBubbleAnimDuration);
         mHideBubbleAnimator.addUpdateListener(bubbleAnimator);
-        mHideBubbleAnimator.addListener(new AnimatorListener() {
+        mHideBubbleAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
                 mIsBubbleVisible = false;

From 6cadeaeaa5f03bd8c754f05e7f4c448d694f124b Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Wed, 30 Oct 2019 09:37:04 +0300
Subject: [PATCH 12/32] Fixed review

---
 .../OmegaFastScrollRecyclerView.java          | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
index e9bc412..3fedc97 100644
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
@@ -46,7 +46,7 @@ public class OmegaFastScrollRecyclerView extends OmegaRecyclerView {
 
         @Override
         public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
-            if (!isEnabled() || mFastScrollAdapter == null) return;
+            if (!isEnabled() || getFastScrollAdapter() == null) return;
             OmegaFastScrollRecyclerView.this.onScrollScreenStateChanged(newState);
         }
 
@@ -56,7 +56,7 @@ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
                 isFirstScroll = false;
                 return;
             }
-            if (!isEnabled() || mFastScrollAdapter == null) return;
+            if (!isEnabled() || getFastScrollAdapter() == null) return;
             OmegaFastScrollRecyclerView.this.onScrolled();
         }
     };
@@ -81,9 +81,6 @@ public void run() {
     private final Paint mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
     private final Rect mTextBounds = new Rect();
 
-    @Nullable
-    private FastScrollAdapter mFastScrollAdapter;
-
     private Drawable mBubbleUpDrawable;
     private Drawable mBubbleDownDrawable;
     @Nullable
@@ -379,13 +376,17 @@ protected void onSizeChanged(int width, int height, int oldw, int oldh) {
     @Override
     public void setAdapter(RecyclerView.Adapter adapter) {
         super.setAdapter(adapter);
-        if (adapter instanceof FastScrollAdapter) {
-            mFastScrollAdapter = (FastScrollAdapter) adapter;
-        } else if (adapter == null) {
-            mFastScrollAdapter = null;
+        if (adapter != null && !(adapter instanceof FastScrollAdapter)) {
+            throw new IllegalArgumentException("RecyclerView.Adapter should be instanceof FastScrollAdapter");
         }
     }
 
+    @Nullable
+    private FastScrollAdapter getFastScrollAdapter() {
+        RecyclerView.Adapter adapter = getAdapter();
+        return adapter == null ? null : (FastScrollAdapter) adapter;
+    }
+
     @Override
     protected void onDetachedFromWindow() {
         mShowBubbleAnimator.cancel();
@@ -732,16 +733,17 @@ public void draw(Canvas canvas) {
     }
 
     private void drawBubbleContent(Canvas canvas) {
-        if (mFastScrollAdapter == null) return;
+        FastScrollAdapter adapter = getFastScrollAdapter();
+        if (adapter == null) return;
         LayoutManager layoutManager = getLayoutManager();
         if (!(layoutManager instanceof LinearLayoutManager)) return;
         int position = ((LinearLayoutManager) layoutManager).findFirstVisibleItemPosition();
         if (position == RecyclerView.NO_POSITION) return;
 
-        if (mFastScrollAdapter instanceof FastScrollAdapter.Text) {
-            drawText(canvas, ((FastScrollAdapter.Text) mFastScrollAdapter).getText(position));
-        } else if (mFastScrollAdapter instanceof FastScrollAdapter.ViewHolder) {
-            drawGroupViewHolder(canvas, (FastScrollAdapter.ViewHolder) mFastScrollAdapter, position);
+        if (adapter instanceof FastScrollAdapter.Text) {
+            drawText(canvas, ((FastScrollAdapter.Text) adapter).getText(position));
+        } else if (adapter instanceof FastScrollAdapter.ViewHolder) {
+            drawGroupViewHolder(canvas, (FastScrollAdapter.ViewHolder) adapter, position);
         }
     }
 
@@ -760,7 +762,6 @@ private void drawGroupViewHolder(Canvas canvas, FastScrollAdapter.ViewHolder ada
         if (mBubbleDrawable == null) return;
         Rect bounds = mBubbleDrawable.getBounds();
 
-        assert mFastScrollAdapter != null;
         long groupId = adapter.getFastScrollGroupId(position);
         RecyclerView.ViewHolder viewHolder = mHolderSparseArray.get((int) groupId);
         if (viewHolder == null) {

From 671652ac2213abeeaf95e346edc58d1e50256c9a Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Wed, 30 Oct 2019 11:07:12 +0300
Subject: [PATCH 13/32] Fixed review 2

---
 .../OmegaFastScrollRecyclerView.java          | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
index 3fedc97..9d78b97 100644
--- a/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
+++ b/omegarecyclerview_fastscroll/src/main/java/com/omega_r/libs/omegarecyclerview_fastscroll/OmegaFastScrollRecyclerView.java
@@ -28,7 +28,6 @@
 
 import static android.view.View.MeasureSpec.EXACTLY;
 import static com.omega_r.libs.omegarecyclerview.utils.ViewUtils.isReverseLayout;
-import static com.omega_r.libs.omegarecyclerview_fastscroll.DrawableUtils.getTintedDrawable;
 import static com.omega_r.libs.omegarecyclerview_fastscroll.Position.LEFT;
 import static com.omega_r.libs.omegarecyclerview_fastscroll.Position.RIGHT;
 
@@ -171,24 +170,12 @@ private void initAttrs(@NonNull TypedArray typedArray) {
             initBubbleDrawables(mPosition);
         }
 
-        Drawable trackDrawable = typedArray.getDrawable(R.styleable.OmegaFastScrollRecyclerView_trackDrawable);
-        if (trackDrawable != null) mTrackDrawable = trackDrawable;
-        int trackColor = typedArray.getColor(R.styleable.OmegaFastScrollRecyclerView_omega_trackColor, Color.TRANSPARENT);
-        if (trackColor != Color.TRANSPARENT)
-            mTrackDrawable = getTintedDrawable(mTrackDrawable, trackColor);
-
-        Drawable bubbleUp = typedArray.getDrawable(R.styleable.OmegaFastScrollRecyclerView_bubbleUpDrawable);
-        if (bubbleUp != null) mBubbleUpDrawable = bubbleUp;
-        int bubbleUpColor = typedArray.getColor(R.styleable.OmegaFastScrollRecyclerView_bubbleUpColor, Color.TRANSPARENT);
-        if (bubbleUpColor != Color.TRANSPARENT)
-            mBubbleUpDrawable = getTintedDrawable(mBubbleUpDrawable, bubbleUpColor);
-
-        Drawable bubbleDown = typedArray.getDrawable(R.styleable.OmegaFastScrollRecyclerView_bubbleDownDrawable);
-        if (bubbleDown != null) mBubbleDownDrawable = bubbleDown;
-        int bubbleDownColor = typedArray.getColor(R.styleable.OmegaFastScrollRecyclerView_bubbleDownColor, Color.TRANSPARENT);
-        if (bubbleUpColor != Color.TRANSPARENT)
-            mBubbleDownDrawable = getTintedDrawable(mBubbleDownDrawable, bubbleDownColor);
-
+        mTrackDrawable = getTintedDrawable(typedArray, mTrackDrawable,
+                R.styleable.OmegaFastScrollRecyclerView_trackDrawable, R.styleable.OmegaFastScrollRecyclerView_omega_trackColor);
+        mBubbleUpDrawable = getTintedDrawable(typedArray, mBubbleUpDrawable,
+                R.styleable.OmegaFastScrollRecyclerView_bubbleUpDrawable, R.styleable.OmegaFastScrollRecyclerView_bubbleUpColor);
+        mBubbleDownDrawable = getTintedDrawable(typedArray, mBubbleDownDrawable, R
+                .styleable.OmegaFastScrollRecyclerView_bubbleDownDrawable, R.styleable.OmegaFastScrollRecyclerView_bubbleDownColor);
 
         int trackPadding = typedArray.getDimensionPixelSize(R.styleable.OmegaFastScrollRecyclerView_fastScrollTrackPadding, -1);
         if (trackPadding != -1) {
@@ -238,6 +225,16 @@ private void initAttrs(@NonNull TypedArray typedArray) {
         mTextPaint.setTextSize(textSize);
     }
 
+    private Drawable getTintedDrawable(@NonNull TypedArray typedArray, Drawable defaultDrawable, int drawableIndex, int colorIndex) {
+        Drawable drawable = typedArray.getDrawable(drawableIndex);
+        int trackColor = typedArray.getColor(colorIndex, Color.TRANSPARENT);
+
+        if (drawable != null && trackColor != Color.TRANSPARENT) return DrawableUtils.getTintedDrawable(drawable, trackColor);
+        if (trackColor != Color.TRANSPARENT) return DrawableUtils.getTintedDrawable(defaultDrawable, trackColor);
+
+        return defaultDrawable;
+    }
+
     private void initBubbleDrawables(Position position) {
         switch (position) {
             case LEFT:
@@ -466,13 +463,14 @@ private boolean isTrackTouched(float eventX, float eventY) {
     }
 
     private boolean isScrollbarTouched(float eventX) {
-        return eventX >= mScrollbarBounds.left && eventX <= mScrollbarBounds.right;
+        return mScrollbarBounds.left <= eventX && eventX <= mScrollbarBounds.right;
     }
 
     private boolean isBubbleTouched(float eventX, float eventY) {
         if (mBubbleDrawable == null) return false;
         Rect bounds = mBubbleDrawable.getBounds();
-        return bounds.left <= eventX && eventX <= bounds.right && bounds.top <= eventY && eventY <= bounds.bottom;
+        return bounds.left <= eventX && eventX <= bounds.right
+                && bounds.top <= eventY && eventY <= bounds.bottom;
     }
 
     private void updateRecyclerViewPosition(float eventY) {

From 7203bf8aabe05c9dbd967cdd7ad3090e76c6688b Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Fri, 1 Nov 2019 09:23:29 +0300
Subject: [PATCH 14/32] Build gradle updated to 3.5.1 Sticky decoration width
 bug fixed.

---
 build.gradle                                               | 2 +-
 .../sticky_decoration/HeaderStickyDecoration.java          | 7 +------
 .../sticky_decoration/StickyDecoration.java                | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5eb7270..07bd018 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/HeaderStickyDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/HeaderStickyDecoration.java
index bee888f..5592cc4 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/HeaderStickyDecoration.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/HeaderStickyDecoration.java
@@ -85,9 +85,4 @@ protected int getStickerTop(boolean isReverseLayout, View child, View sticker, i
         return (int) Math.max(0, child.getY() - stickerHeight  - topMargin);
     }
 
-    @Override
-    protected int getMeasureStickerWidthMode() {
-        return View.MeasureSpec.EXACTLY;
-    }
-
-}
+}
\ No newline at end of file
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java
index 83ce4fa..831cc9f 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java
@@ -153,7 +153,7 @@ RecyclerView.ViewHolder getStickyHolder(RecyclerView parent, int position) {
     }
 
     protected int getMeasureStickerWidthMode() {
-        return View.MeasureSpec.UNSPECIFIED;
+        return View.MeasureSpec.EXACTLY;
     }
 
     protected int getMeasureStickerHeightMode() {

From 615978efe9e24247ae9904121fdef37877b57ab6 Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Mon, 16 Mar 2020 09:50:06 +0300
Subject: [PATCH 15/32] ViewPagerLayoutManager onRestoreInstanceState crash
 with not bundle instance fixed.

---
 app/build.gradle                                          | 2 +-
 build.gradle                                              | 4 ++--
 gradle/wrapper/gradle-wrapper.properties                  | 4 ++--
 .../viewpager/ViewPagerLayoutManager.java                 | 8 ++++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e1949ba..a1bb1c0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,7 +21,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:' + rootProject.appcompatVersion
diff --git a/build.gradle b/build.gradle
index 07bd018..1f3556a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.3.70'
     repositories {
         jcenter()
         maven { url 'https://jitpack.io' }
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index df55377..f710117 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Aug 23 11:22:57 MSK 2019
+#Mon Mar 16 09:45:52 MSK 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
index 80323a9..44349ad 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
@@ -663,8 +663,12 @@ public Parcelable onSaveInstanceState() {
 
     @Override
     public void onRestoreInstanceState(Parcelable state) {
-        Bundle bundle = (Bundle) state;
-        mCurrentPosition = bundle.getInt(KEY_EXTRA_POSITION);
+        if (state instanceof Bundle) {
+            Bundle bundle = (Bundle) state;
+            mCurrentPosition = bundle.getInt(KEY_EXTRA_POSITION);
+        } else {
+            super.onRestoreInstanceState(state);
+        }
     }
 
     @Override

From de50c8addd4b1960e0a93db075ac529e756aa963 Mon Sep 17 00:00:00 2001
From: Anton Knyazev <anton.knyazev@omega-r.com>
Date: Fri, 20 Mar 2020 18:19:10 +0300
Subject: [PATCH 16/32] Fix bug with swipe menu

---
 .../swipe_menu/SwipeHorizontalMenuLayout.java | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java
index edf7da8..6e9b06c 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java
@@ -1,8 +1,10 @@
 package com.omega_r.libs.omegarecyclerview.swipe_menu;
 
 import android.content.Context;
+
 import androidx.annotation.NonNull;
 import androidx.core.view.ViewCompat;
+
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
@@ -49,6 +51,7 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
             case MotionEvent.ACTION_MOVE:
                 int disX = (int) (ev.getX() - mDownX);
                 int disY = (int) (ev.getY() - mDownY);
+                mLastX = (int) ev.getX();
                 isIntercepted = Math.abs(disX) > mScaledTouchSlop && Math.abs(disX) > Math.abs(disY);
                 break;
             case MotionEvent.ACTION_UP:
@@ -89,17 +92,13 @@ public boolean onTouchEvent(MotionEvent ev) {
                 if (eventX > mLastX && !isLeftSwipeEnabled && !isNotInPlace()) break;
 
                 int disX = (int) (mLastX - ev.getX());
-                int disY = (int) (mLastY - ev.getY());
-                if (!mDragging
-                        && Math.abs(disX) > mScaledTouchSlop
-                        && Math.abs(disX) > Math.abs(disY)) {
+                if (!mDragging) {
                     ViewParent parent = getParent();
                     if (parent != null) {
                         parent.requestDisallowInterceptTouchEvent(true);
                     }
                     mDragging = true;
-                }
-                if (mDragging) {
+                } else {
                     if (mCurrentSwiper == null || shouldResetSwiper) {
                         if (disX < 0) {
                             if (mBeginSwiper != null)
@@ -332,9 +331,9 @@ public void smoothCloseMenu(int duration) {
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
         if (mContentView == null) return;
 
-        int parentViewWidth = ViewCompat.getMeasuredWidthAndState(this);
-        int contentViewWidth = ViewCompat.getMeasuredWidthAndState(mContentView);
-        int contentViewHeight = ViewCompat.getMeasuredHeightAndState(mContentView);
+        int parentViewWidth = getMeasuredWidthAndState();
+        int contentViewWidth = mContentView.getMeasuredWidthAndState();
+        int contentViewHeight = mContentView.getMeasuredHeightAndState();
         LayoutParams lp = (LayoutParams) mContentView.getLayoutParams();
         int lGap = getPaddingLeft() + lp.leftMargin;
         int tGap = getPaddingTop() + lp.topMargin;
@@ -345,8 +344,8 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
                 tGap + contentViewHeight);
 
         if (mEndSwiper != null) {
-            int menuViewWidth = ViewCompat.getMeasuredWidthAndState(mEndSwiper.getMenuView());
-            int menuViewHeight = ViewCompat.getMeasuredHeightAndState(mEndSwiper.getMenuView());
+            int menuViewWidth = mEndSwiper.getMenuView().getMeasuredWidthAndState();
+            int menuViewHeight = mEndSwiper.getMenuView().getMeasuredHeightAndState();
             lp = (LayoutParams) mEndSwiper.getMenuView().getLayoutParams();
             tGap = getPaddingTop() + lp.topMargin;
             mEndSwiper.getMenuView().layout(parentViewWidth,
@@ -356,8 +355,8 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
         }
 
         if (mBeginSwiper != null) {
-            int menuViewWidth = ViewCompat.getMeasuredWidthAndState(mBeginSwiper.getMenuView());
-            int menuViewHeight = ViewCompat.getMeasuredHeightAndState(mBeginSwiper.getMenuView());
+            int menuViewWidth = mBeginSwiper.getMenuView().getMeasuredWidthAndState();
+            int menuViewHeight = mBeginSwiper.getMenuView().getMeasuredHeightAndState();
             lp = (LayoutParams) mBeginSwiper.getMenuView().getLayoutParams();
             tGap = getPaddingTop() + lp.topMargin;
             mBeginSwiper.getMenuView().layout(-menuViewWidth,

From ba7c75d7cc668cdaea72cd65647c66d25cb6da46 Mon Sep 17 00:00:00 2001
From: Anton Knyazev <anton.knyazev@omega-r.com>
Date: Fri, 20 Mar 2020 18:48:07 +0300
Subject: [PATCH 17/32] Add fixed position swipe menu

---
 .../swipe_menu/SwipeHorizontalMenuLayout.java | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java
index 6e9b06c..25c000c 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java
@@ -5,6 +5,7 @@
 import androidx.annotation.NonNull;
 import androidx.core.view.ViewCompat;
 
+import android.graphics.Canvas;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
@@ -24,6 +25,7 @@ public class SwipeHorizontalMenuLayout extends SwipeMenuLayout {
     private boolean mDownMenuOpen;
     private boolean isLeftSwipeEnabled = true;
     private boolean isRightSwipeEnabled = true;
+    private boolean mFixedPositionMenuEnabled;
 
     public SwipeHorizontalMenuLayout(Context context) {
         super(context);
@@ -400,4 +402,33 @@ public void setSwipeEnable(SwipeDirection direction, boolean swipeEnable) {
         }
     }
 
+    public void setFixedPositionMenuEnabled(boolean enabled) {
+        mFixedPositionMenuEnabled = enabled;
+    }
+
+    @Override
+    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
+        super.onScrollChanged(l, t, oldl, oldt);
+        if (mFixedPositionMenuEnabled) {
+            if (mBeginSwiper != null) {
+                mBeginSwiper.getMenuView().setTranslationX(mBeginSwiper.getMenuView().getWidth() + l);
+            }
+            if (mEndSwiper != null) {
+                mEndSwiper.getMenuView().setTranslationX(-mEndSwiper.getMenuView().getWidth() + l);
+            }
+        }
+    }
+
+    @Override
+    protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
+        if (mFixedPositionMenuEnabled) {
+            int saveCount = canvas.save();
+            canvas.clipRect(child.getLeft(), child.getTop(), child.getRight(), child.getBottom());
+            boolean result = super.drawChild(canvas, child, drawingTime);
+            canvas.restoreToCount(saveCount);
+            return result;
+        } else {
+            return super.drawChild(canvas, child, drawingTime);
+        }
+    }
 }
\ No newline at end of file

From 838ad8a672d4f42fdf9d5ec43d6bd137dc66b256 Mon Sep 17 00:00:00 2001
From: Anton Knyazev <anton.knyazev@omega-r.com>
Date: Mon, 23 Mar 2020 11:28:19 +0300
Subject: [PATCH 18/32] Fix bug with swipe menu

---
 .../swipe_menu/SwipeHorizontalMenuLayout.java                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java
index 25c000c..2d874b9 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java
@@ -411,10 +411,10 @@ protected void onScrollChanged(int l, int t, int oldl, int oldt) {
         super.onScrollChanged(l, t, oldl, oldt);
         if (mFixedPositionMenuEnabled) {
             if (mBeginSwiper != null) {
-                mBeginSwiper.getMenuView().setTranslationX(mBeginSwiper.getMenuView().getWidth() + l);
+                mBeginSwiper.getMenuView().setTranslationX(l == 0 ? 0 : mBeginSwiper.getMenuView().getWidth() + l);
             }
             if (mEndSwiper != null) {
-                mEndSwiper.getMenuView().setTranslationX(-mEndSwiper.getMenuView().getWidth() + l);
+                mEndSwiper.getMenuView().setTranslationX(l == 0 ? 0 : -mEndSwiper.getMenuView().getWidth() + l);
             }
         }
     }

From b6c3470d16eba00bd77d50e7c8db9d93552c59c7 Mon Sep 17 00:00:00 2001
From: Anton Knyazev <anton.knyazev@omega-r.com>
Date: Wed, 17 Jun 2020 17:10:06 +0300
Subject: [PATCH 19/32] Fix wrapcontent for pager

---
 .../viewpager/ViewPagerLayoutManager.java       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
index 44349ad..881bee3 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
@@ -199,8 +199,21 @@ private View getMeasuredChildForAdapterPosition(int position, RecyclerView.Recyc
                 break;
         }
 
-        final int widthSpec = View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY);
-        final int heightSpec = View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY);
+        int widthSpec = View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY);
+        int heightSpec = View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY);
+
+        switch (mOrientation) {
+            case HORIZONTAL:
+                if (getHeightMode() == View.MeasureSpec.AT_MOST) {
+                    heightSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+                }
+                break;
+            case VERTICAL:
+                if (getWidthMode() == View.MeasureSpec.AT_MOST) {
+                    widthSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+                }
+                break;
+        }
         measureChildWithDecorationsAndMargin(view, widthSpec, heightSpec);
         return view;
     }

From e82bcfe6acbe9dc221aa459d47965bf8d6ccca0f Mon Sep 17 00:00:00 2001
From: Anton Knyazev <anton.knyazev@omega-r.com>
Date: Wed, 17 Jun 2020 17:16:42 +0300
Subject: [PATCH 20/32] Fix wrapcontent for pager

---
 .../viewpager/ViewPagerLayoutManager.java            | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
index 881bee3..cd7182e 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
@@ -28,8 +28,10 @@
 import com.omega_r.libs.omegarecyclerview.viewpager.orientation.VerticalHelper;
 import com.omega_r.libs.omegarecyclerview.viewpager.transform.ItemTransformer;
 
+import static android.view.View.MeasureSpec.UNSPECIFIED;
 import static androidx.recyclerview.widget.RecyclerView.HORIZONTAL;
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
+import static androidx.recyclerview.widget.RecyclerView.UNDEFINED_DURATION;
 import static androidx.recyclerview.widget.RecyclerView.VERTICAL;
 
 public class ViewPagerLayoutManager extends RecyclerView.LayoutManager {
@@ -204,13 +206,15 @@ private View getMeasuredChildForAdapterPosition(int position, RecyclerView.Recyc
 
         switch (mOrientation) {
             case HORIZONTAL:
-                if (getHeightMode() == View.MeasureSpec.AT_MOST) {
-                    heightSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+                int heightMode = getHeightMode();
+                if (heightMode == View.MeasureSpec.AT_MOST || heightMode == UNSPECIFIED) {
+                    heightSpec = View.MeasureSpec.makeMeasureSpec(0, UNSPECIFIED);
                 }
                 break;
             case VERTICAL:
-                if (getWidthMode() == View.MeasureSpec.AT_MOST) {
-                    widthSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+                int widthMode = getWidthMode();
+                if (widthMode == View.MeasureSpec.AT_MOST || widthMode == UNSPECIFIED) {
+                    widthSpec = View.MeasureSpec.makeMeasureSpec(0, UNSPECIFIED);
                 }
                 break;
         }

From 3cfa2c06b3e6b02cab60d5ff08786e225adf0e12 Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Tue, 7 Jul 2020 10:29:54 +0300
Subject: [PATCH 21/32] smoothScrollToRealPosition method added

---
 build.gradle                                         |  4 ++--
 gradle/wrapper/gradle-wrapper.properties             |  4 ++--
 .../libs/omegarecyclerview/OmegaRecyclerView.java    | 12 ++++++++++++
 .../header/HeaderFooterWrapperAdapter.java           |  8 ++++++++
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1f3556a..596bd8c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.70'
+    ext.kotlin_version = '1.3.72'
     repositories {
         jcenter()
         maven { url 'https://jitpack.io' }
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f710117..b0fa419 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 16 09:45:52 MSK 2020
+#Tue Jul 07 10:28:25 MSK 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
index a65ef03..0220a5a 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
@@ -42,6 +42,7 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+@SuppressWarnings("rawtypes")
 public class OmegaRecyclerView extends ExpandedRecyclerView implements SwipeMenuHelper.Callback {
 
     private static final int[] DEFAULT_DIVIDER_ATTRS = new int[]{android.R.attr.listDivider};
@@ -286,6 +287,17 @@ protected final BaseStickyDecoration getStickyDecoration() {
         return mBaseStickyDecoration;
     }
 
+    public void smoothScrollToRealPosition(int position) {
+        int scrollPosition = position;
+
+        RecyclerView.Adapter adapter = getAdapter();
+        if (adapter instanceof HeaderFooterWrapperAdapter) {
+            if (((HeaderFooterWrapperAdapter) adapter).isHeadersVisible()) {
+                scrollPosition += mHeadersList.size();
+            }
+        }
+        super.smoothScrollToPosition(scrollPosition);
+    }
 
     @Override
     public void addView(View view, int index, ViewGroup.LayoutParams params) {
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java
index ae298cb..4438382 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java
@@ -187,6 +187,10 @@ public void setHeadersVisible(boolean visible) {
         }
     }
 
+    public boolean isHeadersVisible() {
+        return mHeadersVisibility;
+    }
+
     public void setFootersVisible(boolean visible) {
         if (mFootersVisibility != visible) {
             if (visible) {
@@ -199,6 +203,10 @@ public void setFootersVisible(boolean visible) {
         }
     }
 
+    public boolean isFootersVisible() {
+        return mFootersVisibility;
+    }
+
     private <V> void copyTo(SparseArray<V> fromArray, SparseArray<V> toArray) {
         toArray.clear();
 

From e4ac22b35d9b88ec5eeef98cd345ecec5b42f7db Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Tue, 7 Jul 2020 16:33:30 +0300
Subject: [PATCH 22/32] Disable open other item when opening in progress.

---
 .../omegarecyclerview/OmegaRecyclerView.java  | 53 +++++++---------
 .../swipe_menu/SwipeMenuHelper.java           | 62 +++++++++++--------
 2 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
index a65ef03..ae52986 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
@@ -13,6 +13,18 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.ExpandedRecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.omega_r.libs.omegarecyclerview.header.HeaderFooterWrapperAdapter;
 import com.omega_r.libs.omegarecyclerview.item_decoration.DividerItemDecoration;
 import com.omega_r.libs.omegarecyclerview.item_decoration.SpaceItemDecoration;
@@ -30,27 +42,19 @@
 import java.util.List;
 import java.util.WeakHashMap;
 
-import androidx.annotation.ColorInt;
-import androidx.annotation.ColorRes;
-import androidx.annotation.IdRes;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.ExpandedRecyclerView;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 public class OmegaRecyclerView extends ExpandedRecyclerView implements SwipeMenuHelper.Callback {
 
     private static final int[] DEFAULT_DIVIDER_ATTRS = new int[]{android.R.attr.listDivider};
 
+    private final WeakHashMap<ViewGroup.LayoutParams, SectionState> mLayoutParamCache = new WeakHashMap<>();
+    private final SwipeMenuHelper mSwipeMenuHelper = new SwipeMenuHelper(this);
+    private final PageRequester mPageRequester = new PageRequester();
+    private final List<View> mHeadersList = new ArrayList<>();
+    private final List<View> mFooterList = new ArrayList<>();
+
     private View mEmptyView;
     private int mEmptyViewId;
 
-    private SwipeMenuHelper mSwipeMenuHelper;
-    private PageRequester mPageRequester = new PageRequester();
     private BaseStickyDecoration mBaseStickyDecoration;
     private int mStickyMode = StickyAdapter.Mode.HEADER;
     @LayoutRes
@@ -58,9 +62,6 @@ public class OmegaRecyclerView extends ExpandedRecyclerView implements SwipeMenu
     @LayoutRes
     private int mPaginationErrorLayout = R.layout.pagination_error_omega_layout;
     private boolean mFinishedInflate = false;
-    private List<View> mHeadersList = new ArrayList<>();
-    private List<View> mFooterList = new ArrayList<>();
-    private WeakHashMap<ViewGroup.LayoutParams, SectionState> mLayoutParamCache = new WeakHashMap<>();
     @Nullable
     private DividerItemDecoration mDividerItemDecoration;
     private int mItemSpace;
@@ -94,7 +95,6 @@ private void init(Context context, @Nullable AttributeSet attrs, int defStyleAtt
             initStickyMode(a);
             a.recycle();
         }
-        mSwipeMenuHelper = new SwipeMenuHelper(getContext(), this);
         mPageRequester.attach(this);
     }
 
@@ -307,7 +307,7 @@ public void addView(View view, int index, ViewGroup.LayoutParams params) {
 
     @Override
     public int getChildCount() {
-        if (!mIsAdapterConnected && areSectionsInitialized())  {
+        if (!mIsAdapterConnected && areSectionsInitialized()) {
             return super.getChildCount() + mHeadersList.size() + mFooterList.size();
         }
 
@@ -409,17 +409,12 @@ private void findEmptyView() {
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
-        boolean isIntercepted = super.onInterceptTouchEvent(ev);
-        if (ev.getActionIndex() != 0) return true;
-        int action = ev.getAction();
-
-        switch (action) {
-            case MotionEvent.ACTION_DOWN:
-                isIntercepted = mSwipeMenuHelper.handleListDownTouchEvent(ev, isIntercepted);
-                break;
-        }
+        return mSwipeMenuHelper.handleInterceptTouchEvent(ev, super.onInterceptTouchEvent(ev));
+    }
 
-        return isIntercepted;
+    @Override
+    public boolean onFilterTouchEventForSecurity(MotionEvent ev) {
+        return mSwipeMenuHelper.handleTouchEventForSecurity(ev, super.onFilterTouchEventForSecurity(ev));
     }
 
     private Drawable getDefaultDivider() {
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuHelper.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuHelper.java
index 03ddbe8..6447cd7 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuHelper.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuHelper.java
@@ -1,11 +1,11 @@
 package com.omega_r.libs.omegarecyclerview.swipe_menu;
 
-import android.content.Context;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 
+import androidx.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -13,19 +13,29 @@ public class SwipeMenuHelper {
 
     private static final int INVALID_POSITION = -1;
 
-    private Callback mCallback;
-
+    private final Callback mCallback;
+    @Nullable
     private SwipeHorizontalMenuLayout mOldSwipedView;
-
     private int mOldTouchedPosition = INVALID_POSITION;
 
-    public SwipeMenuHelper(Context context, Callback callback) {
+    public SwipeMenuHelper(Callback callback) {
         mCallback = callback;
-        ViewConfiguration.get(context);
     }
 
-    public boolean handleListDownTouchEvent(MotionEvent ev, boolean defaultIntercepted) {
-        boolean isIntercepted = defaultIntercepted;
+    public boolean handleTouchEventForSecurity(MotionEvent ev, boolean defaultResult) {
+        if (mOldSwipedView == null ||
+                ev.getActionIndex() == 0 ||
+                ev.getActionMasked() != MotionEvent.ACTION_POINTER_DOWN) return defaultResult;
+
+        int pointerId = ev.getPointerId(ev.getActionIndex());
+        SwipeHorizontalMenuLayout touchingView = getTouchingView(ev.getX(pointerId), ev.getY(pointerId));
+        return mOldSwipedView.equals(touchingView) && defaultResult;
+    }
+
+    public boolean handleInterceptTouchEvent(MotionEvent ev, boolean defaultResult) {
+        if (ev.getActionIndex() != 0 || ev.getAction() != MotionEvent.ACTION_DOWN) return defaultResult;
+
+        boolean isIntercepted = defaultResult;
         View touchingView = findChildViewUnder((int) ev.getX(), (int) ev.getY());
         int touchingPosition;
 
@@ -42,16 +52,11 @@ public boolean handleListDownTouchEvent(MotionEvent ev, boolean defaultIntercept
             }
         }
 
-        touchingView = mCallback.transformTouchView(touchingPosition, touchingView);
-
-        if (touchingView instanceof ViewGroup) {
-            View itemView = getSwipeMenuView((ViewGroup) touchingView);
-            if (itemView instanceof SwipeHorizontalMenuLayout) {
-                mOldSwipedView = (SwipeHorizontalMenuLayout) itemView;
-                mOldTouchedPosition = touchingPosition;
-            }
+        touchingView = extractSwipeMenuView(mCallback.transformTouchView(touchingPosition, touchingView));
+        if (touchingView != null) {
+            mOldSwipedView = (SwipeHorizontalMenuLayout) touchingView;
+            mOldTouchedPosition = touchingPosition;
         }
-
         if (isIntercepted) {
             mOldSwipedView = null;
             mOldTouchedPosition = INVALID_POSITION;
@@ -60,21 +65,28 @@ public boolean handleListDownTouchEvent(MotionEvent ev, boolean defaultIntercept
         return isIntercepted;
     }
 
-    private View getSwipeMenuView(ViewGroup itemView) {
-        if (itemView instanceof SwipeHorizontalMenuLayout) {
-            return itemView;
+    private SwipeHorizontalMenuLayout getTouchingView(float eventX, float eventY) {
+        View touchingView = findChildViewUnder(eventX, eventY);
+        if (touchingView != null) {
+            int touchingPosition = mCallback.getPositionForView(touchingView);
+            touchingView = mCallback.transformTouchView(touchingPosition, touchingView);
         }
+        return extractSwipeMenuView(touchingView);
+    }
+
+    @Nullable
+    private SwipeHorizontalMenuLayout extractSwipeMenuView(@Nullable View view) {
+        if (view instanceof SwipeHorizontalMenuLayout) return (SwipeHorizontalMenuLayout) view;
 
         List<View> unvisited = new ArrayList<>();
-        unvisited.add(itemView);
+        if (view != null) unvisited.add(view);
 
         while (!unvisited.isEmpty()) {
             View child = unvisited.remove(0);
 
+            if (child instanceof SwipeHorizontalMenuLayout) return (SwipeHorizontalMenuLayout) child;
             if (!(child instanceof ViewGroup)) continue;
 
-            if (child instanceof SwipeHorizontalMenuLayout) return child;
-
             ViewGroup group = (ViewGroup) child;
             int childCount = group.getChildCount();
 
@@ -83,7 +95,7 @@ private View getSwipeMenuView(ViewGroup itemView) {
             }
         }
 
-        return itemView;
+        return null;
     }
 
     private View findChildViewUnder(float x, float y) {

From f6da3dbd75eead5cb2aee08b87a5f354b376d51b Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Tue, 14 Jul 2020 11:44:28 +0300
Subject: [PATCH 23/32] Sticky click handling in progress

---
 .../support_sticky/DefaultStickyAdapter.java  |  5 +
 .../StickyHeaderAdapter.java                  | 14 +++
 .../omegarecyclerview/OmegaRecyclerView.java  | 11 ++-
 .../header/HeaderFooterWrapperAdapter.java    |  5 +
 .../BaseStickyDecoration.java                 | 11 ++-
 .../HeaderStickyDecoration.java               | 94 ++++++++++++++++++-
 .../sticky_decoration/StickyAdapter.java      |  1 +
 .../sticky_decoration/StickyDecoration.java   | 74 +++++++++++++++
 8 files changed, 210 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyAdapter.java
index bd5a75c..57d27c8 100644
--- a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyAdapter.java
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyAdapter.java
@@ -44,6 +44,11 @@ public void onBindStickyViewHolder(StickyViewHolder viewHolder, int position) {
         viewHolder.bind(getItem(position).getGroup().getYear());
     }
 
+    @Override
+    public void onClickStickyViewHolder(long id) {
+        // nothing
+    }
+
     class ExGroupViewHolder extends GroupViewHolder {
 
         private TextView textView;
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/sticky_header_example/StickyHeaderAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/sticky_header_example/StickyHeaderAdapter.java
index 6e60455..8903a87 100644
--- a/app/src/main/java/com/omega_r/omegarecyclerview/sticky_header_example/StickyHeaderAdapter.java
+++ b/app/src/main/java/com/omega_r/omegarecyclerview/sticky_header_example/StickyHeaderAdapter.java
@@ -5,6 +5,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
 import com.omega_r.libs.omegarecyclerview.sticky_decoration.StickyAdapter;
@@ -14,9 +15,11 @@ public class StickyHeaderAdapter extends OmegaRecyclerView.Adapter<StickyHeaderA
         implements StickyAdapter<StickyHeaderAdapter.HeaderHolder> {
 
     private LayoutInflater mInflater;
+    private final Context mContext;
 
     public StickyHeaderAdapter(Context context) {
         mInflater = LayoutInflater.from(context);
+        mContext = context;
     }
 
     @Override
@@ -51,12 +54,23 @@ public void onBindStickyViewHolder(HeaderHolder viewHolder, int position) {
         viewHolder.header.setText("Header " + getStickyId(position));
     }
 
+    @Override
+    public void onClickStickyViewHolder(long id) {
+        Toast.makeText(mContext, "onClickStickyViewHolder " + id, Toast.LENGTH_SHORT).show();
+    }
+
     static class ViewHolder extends OmegaRecyclerView.ViewHolder {
         public TextView item;
 
         public ViewHolder(View itemView) {
             super(itemView);
             item = (TextView) itemView;
+            item.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Toast.makeText(v.getContext(), "Clicked", Toast.LENGTH_SHORT).show();
+                }
+            });
         }
     }
 
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
index ae52986..ef100f2 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
@@ -55,6 +55,7 @@ public class OmegaRecyclerView extends ExpandedRecyclerView implements SwipeMenu
     private View mEmptyView;
     private int mEmptyViewId;
 
+    @Nullable
     private BaseStickyDecoration mBaseStickyDecoration;
     private int mStickyMode = StickyAdapter.Mode.HEADER;
     @LayoutRes
@@ -409,7 +410,15 @@ private void findEmptyView() {
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
-        return mSwipeMenuHelper.handleInterceptTouchEvent(ev, super.onInterceptTouchEvent(ev));
+        boolean result = mSwipeMenuHelper.handleInterceptTouchEvent(ev, super.onInterceptTouchEvent(ev));
+        if (mBaseStickyDecoration != null && !result) return mBaseStickyDecoration.onTouchEvent(this, ev, result);
+        return result;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent e) {
+        boolean result = super.onTouchEvent(e);
+        return mBaseStickyDecoration == null ? result : mBaseStickyDecoration.onTouchEvent(this, e, result);
     }
 
     @Override
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java
index ae298cb..cc1a19d 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java
@@ -262,6 +262,11 @@ public void onBindStickyViewHolder(RecyclerView.ViewHolder viewHolder, int posit
         stickyAdapter.onBindStickyViewHolder(viewHolder, position);
     }
 
+    @Override
+    public void onClickStickyViewHolder(long id) {
+        // nothing
+    }
+
     @Override
     protected void tryNotifyItemRangeChanged(int positionStart, int itemCount, Object payload) {
         super.tryNotifyItemRangeChanged(positionStart + mHeaderArray.size(), itemCount, payload);
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/BaseStickyDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/BaseStickyDecoration.java
index 08ba1bb..031d1fc 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/BaseStickyDecoration.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/BaseStickyDecoration.java
@@ -1,9 +1,13 @@
 package com.omega_r.libs.omegarecyclerview.sticky_decoration;
 
+import android.view.MotionEvent;
+
 import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
+@SuppressWarnings("rawtypes")
 public abstract class BaseStickyDecoration extends RecyclerView.ItemDecoration {
 
     public static final long NO_STICKY_ID = -1L;
@@ -16,6 +20,10 @@ public BaseStickyDecoration(@Nullable StickyAdapter adapter) {
         mStickyAdapter = adapter;
     }
 
+    public boolean onTouchEvent(@NonNull RecyclerView parent, @NonNull MotionEvent ev, boolean defaultResult) {
+        return defaultResult;
+    }
+
     @CallSuper
     public final void setStickyAdapter(@Nullable StickyAdapter adapter) {
         mStickyAdapter = adapter;
@@ -26,8 +34,7 @@ public final void setItemSpace(int itemSpace) {
     }
 
     protected final boolean hasSticker(int position) {
-        if (mStickyAdapter == null) return false;
-        return mStickyAdapter.getStickyId(position) != NO_STICKY_ID;
+        return mStickyAdapter != null && mStickyAdapter.getStickyId(position) != NO_STICKY_ID;
     }
 
 }
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/HeaderStickyDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/HeaderStickyDecoration.java
index 5592cc4..593685e 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/HeaderStickyDecoration.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/HeaderStickyDecoration.java
@@ -1,17 +1,19 @@
 package com.omega_r.libs.omegarecyclerview.sticky_decoration;
 
 import android.graphics.Rect;
+import android.util.Log;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.omega_r.libs.omegarecyclerview.utils.ViewUtils;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
+import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
 import static com.omega_r.libs.omegarecyclerview.utils.ViewUtils.isReverseLayout;
 
+@SuppressWarnings("rawtypes")
 public class HeaderStickyDecoration extends StickyDecoration {
 
     public HeaderStickyDecoration(StickyAdapter adapter) {
@@ -50,6 +52,94 @@ && showHeaderAboveItem(parent, position)) {
         outRect.set(0, topOffset, 0, 0);
     }
 
+    private int mClickedPosition = NO_POSITION;
+
+//    @Override
+//    public boolean onTouchEvent(@NonNull RecyclerView parent, @NonNull MotionEvent ev, boolean defaultResult) {
+//        RecyclerView.Adapter adapter = parent.getAdapter();
+//        if (adapter == null || adapter.getItemCount() == 0) {
+//            mClickedPosition = NO_POSITION;
+//            return defaultResult;
+//        }
+//
+//        float eventY = ev.getY();
+//        float eventX = ev.getX();
+//        Log.d("StickyDecoration", "EventY " + eventY);
+//
+//        switch (ev.getAction()) {
+//            case MotionEvent.ACTION_DOWN:
+//                View view = parent.findChildViewUnder(eventX, eventY);
+//
+//                if (view == null) {
+//                    int position = getNearestViewPosition(parent, eventY);
+//                    if (position != NO_POSITION && hasSticker(position)) {
+//                        mClickedPosition = position;
+//                        return true;
+//                    } else {
+//                        mClickedPosition = NO_POSITION;
+//                    }
+//                } else {
+//                    float viewY = view.getY();
+//                    if (viewY < 0 || parent.getChildAt(0).equals(view) || parent.getChildAt(parent.getChildCount() - 1).equals(view)) {
+//                        int position = parent.getChildAdapterPosition(view);
+//                        if (position != NO_POSITION && hasSticker(position)) {
+//                            RecyclerView.ViewHolder viewHolder = getStickyHolder(parent, position);
+//                            if (viewHolder != null) {
+//                                View itemView = viewHolder.itemView;
+//                                if (itemView.getLeft() <= eventX && eventX <= itemView.getRight()
+//                                        && itemView.getTop() <= eventY && eventY <= itemView.getBottom()) {
+//                                    mClickedPosition = position;
+//                                    return true;
+//                                } else {
+//                                    mClickedPosition = NO_POSITION;
+//                                }
+//                            } else {
+//                                mClickedPosition = NO_POSITION;
+//                            }
+//                        } else {
+//                            mClickedPosition = NO_POSITION;
+//                        }
+//                    } else {
+//                        mClickedPosition = NO_POSITION;
+//                    }
+//                }
+//                break;
+//            case MotionEvent.ACTION_UP:
+//                if (mClickedPosition != NO_POSITION) {
+//                    ((StickyAdapter) adapter).onClickStickyViewHolder(mClickedPosition);
+//                    mClickedPosition = NO_POSITION;
+//                    return true;
+//                }
+//                break;
+//        }
+//        return super.onTouchEvent(parent, ev, defaultResult);
+//    }
+
+    private int getNearestViewPosition(@NonNull RecyclerView parent, float eventY) {
+        int itemCount = parent.getAdapter().getItemCount();
+
+        boolean isReversed = isReverseLayout(parent);
+
+        if (isReversed) {
+            for (int i = itemCount - 1; i >= 0; i--) {
+                RecyclerView.ViewHolder viewHolder = parent.findViewHolderForAdapterPosition(i);
+                if (viewHolder != null) {
+                    View view = viewHolder.itemView;
+                    if (view.getY() >= eventY) return i;
+                }
+            }
+        } else {
+            for (int i = 0; i < itemCount; i++) {
+                RecyclerView.ViewHolder viewHolder = parent.findViewHolderForAdapterPosition(i);
+                if (viewHolder != null) {
+                    View view = viewHolder.itemView;
+                    if (view.getY() >= eventY) return i;
+                }
+            }
+        }
+        return NO_POSITION;
+    }
+
     private boolean showHeaderAboveItem(@NonNull RecyclerView parent, int position) {
         if (mStickyAdapter == null) return false;
         RecyclerView.LayoutManager layoutManager = parent.getLayoutManager();
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyAdapter.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyAdapter.java
index 5df1764..6cc72f6 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyAdapter.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyAdapter.java
@@ -11,6 +11,7 @@ public interface StickyAdapter<T extends RecyclerView.ViewHolder> {
 
     void onBindStickyViewHolder(T viewHolder, int position);
 
+    void onClickStickyViewHolder(long id);
 
     interface Mode {
 
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java
index 831cc9f..6e70a41 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java
@@ -1,6 +1,8 @@
 package com.omega_r.libs.omegarecyclerview.sticky_decoration;
 
 import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -8,19 +10,81 @@
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.BiConsumer;
+
+import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
 import static com.omega_r.libs.omegarecyclerview.utils.ViewUtils.isReverseLayout;
+import static java.lang.Math.abs;
 
+@SuppressWarnings("rawtypes")
 abstract class StickyDecoration extends BaseStickyDecoration {
 
+    private static final float CLICK_MOVE_BIAS = 150;
+
+    private long mClickedPosition = NO_POSITION;
+    private float mActionDownX;
+    private float mActionDownY;
+
+    private final Map<Long, Rect> mMap = new HashMap<>();
+
     public StickyDecoration(@Nullable StickyAdapter adapter) {
         super(adapter);
     }
 
+    @Override
+    public final boolean onTouchEvent(@NonNull RecyclerView parent, @NonNull MotionEvent ev, boolean defaultResult) {
+        if (mStickyAdapter == null) return defaultResult;
+
+        RecyclerView.Adapter adapter = parent.getAdapter();
+        if (adapter == null || adapter.getItemCount() == 0) return defaultResult;
+
+        switch (ev.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                mActionDownX = ev.getX();
+                mActionDownY = ev.getY();
+                mClickedPosition = NO_POSITION;
+                return handleActionDown(parent, ev, defaultResult);
+            case MotionEvent.ACTION_UP:
+                if (mStickyAdapter != null && mClickedPosition != NO_POSITION) {
+                    float eventX = ev.getX();
+                    float eventY = ev.getY();
+                    if (abs(mActionDownX - eventX) <= CLICK_MOVE_BIAS && abs(mActionDownY - eventY) <= CLICK_MOVE_BIAS) {
+                        mStickyAdapter.onClickStickyViewHolder(mClickedPosition);
+                    }
+                }
+                break;
+        }
+        return super.onTouchEvent(parent, ev, defaultResult);
+    }
+
+    protected boolean handleActionDown(@NonNull RecyclerView parent, @NonNull final MotionEvent ev, boolean defaultResult) {
+        int eventX = (int) ev.getX();
+        int eventY = (int) ev.getY();
+        for (Long id : mMap.keySet()) {
+            Rect rect = mMap.get(id);
+            if (rect != null && !rect.isEmpty() && rect.contains(eventX, eventY)) {
+                mClickedPosition = id;
+                return true;
+            }
+        }
+        return defaultResult;
+    }
+
     @Override
     public final void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
         super.onDrawOver(canvas, parent, state);
         int count = parent.getChildCount();
         long previousStickerId = -1;
+
+        mMap.forEach(new BiConsumer<Long, Rect>() {
+            @Override
+            public void accept(Long aLong, Rect rect) {
+                if (rect != null) rect.setEmpty();
+            }
+        });
+
         if (isReverseLayout(parent)) {
             for (int layoutPos = count - 1; layoutPos >= 0; layoutPos--) {
                 previousStickerId = calculateStickerIdAndDrawIt(canvas, parent, true, layoutPos, previousStickerId);
@@ -62,10 +126,20 @@ && hasSticker(adapterPosition - 1)
                             if (previousTop > 0) previousTop = 0;
                             drawSticky(canvas, childView, previousStickyViewHolder, previousTop);
                             drawSticky(canvas, childView, stickyHolder, top);
+
+                            Rect previousStickyViewHolderBounds = previousStickyViewHolder.itemView.getClipBounds();
+                            Rect bounds = stickyHolder.itemView.getClipBounds();
                         }
                     } else {
                         top = getStickerTop(parent, isReverseLayout, childView, stickerView, adapterPosition, layoutPos);
                         drawSticky(canvas, childView, stickyHolder, top);
+
+                        Rect rect = mMap.get(previousId);
+                        if (rect == null) {
+                            rect = new Rect();
+                            mMap.put(previousId, rect);
+                        }
+                        rect.set(stickerView.getLeft(), top, stickerView.getRight(), top + stickerView.getHeight());
                     }
                 }
             }

From 246f29acc5000f12f51e8aa4df8ebe499883269a Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Tue, 14 Jul 2020 12:35:12 +0300
Subject: [PATCH 24/32] Sticky click handling added

---
 .../header/HeaderFooterWrapperAdapter.java    |  3 +-
 .../HeaderStickyDecoration.java               | 91 -------------------
 .../sticky_decoration/StickyDecoration.java   | 49 +++++-----
 3 files changed, 26 insertions(+), 117 deletions(-)

diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java
index cc1a19d..880e528 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java
@@ -264,7 +264,8 @@ public void onBindStickyViewHolder(RecyclerView.ViewHolder viewHolder, int posit
 
     @Override
     public void onClickStickyViewHolder(long id) {
-        // nothing
+        StickyAdapter stickyAdapter = getStickyAdapter();
+        if (stickyAdapter != null) stickyAdapter.onClickStickyViewHolder(id);
     }
 
     @Override
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/HeaderStickyDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/HeaderStickyDecoration.java
index 593685e..0c407ce 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/HeaderStickyDecoration.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/HeaderStickyDecoration.java
@@ -1,8 +1,6 @@
 package com.omega_r.libs.omegarecyclerview.sticky_decoration;
 
 import android.graphics.Rect;
-import android.util.Log;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -10,7 +8,6 @@
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
-import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
 import static com.omega_r.libs.omegarecyclerview.utils.ViewUtils.isReverseLayout;
 
 @SuppressWarnings("rawtypes")
@@ -52,94 +49,6 @@ && showHeaderAboveItem(parent, position)) {
         outRect.set(0, topOffset, 0, 0);
     }
 
-    private int mClickedPosition = NO_POSITION;
-
-//    @Override
-//    public boolean onTouchEvent(@NonNull RecyclerView parent, @NonNull MotionEvent ev, boolean defaultResult) {
-//        RecyclerView.Adapter adapter = parent.getAdapter();
-//        if (adapter == null || adapter.getItemCount() == 0) {
-//            mClickedPosition = NO_POSITION;
-//            return defaultResult;
-//        }
-//
-//        float eventY = ev.getY();
-//        float eventX = ev.getX();
-//        Log.d("StickyDecoration", "EventY " + eventY);
-//
-//        switch (ev.getAction()) {
-//            case MotionEvent.ACTION_DOWN:
-//                View view = parent.findChildViewUnder(eventX, eventY);
-//
-//                if (view == null) {
-//                    int position = getNearestViewPosition(parent, eventY);
-//                    if (position != NO_POSITION && hasSticker(position)) {
-//                        mClickedPosition = position;
-//                        return true;
-//                    } else {
-//                        mClickedPosition = NO_POSITION;
-//                    }
-//                } else {
-//                    float viewY = view.getY();
-//                    if (viewY < 0 || parent.getChildAt(0).equals(view) || parent.getChildAt(parent.getChildCount() - 1).equals(view)) {
-//                        int position = parent.getChildAdapterPosition(view);
-//                        if (position != NO_POSITION && hasSticker(position)) {
-//                            RecyclerView.ViewHolder viewHolder = getStickyHolder(parent, position);
-//                            if (viewHolder != null) {
-//                                View itemView = viewHolder.itemView;
-//                                if (itemView.getLeft() <= eventX && eventX <= itemView.getRight()
-//                                        && itemView.getTop() <= eventY && eventY <= itemView.getBottom()) {
-//                                    mClickedPosition = position;
-//                                    return true;
-//                                } else {
-//                                    mClickedPosition = NO_POSITION;
-//                                }
-//                            } else {
-//                                mClickedPosition = NO_POSITION;
-//                            }
-//                        } else {
-//                            mClickedPosition = NO_POSITION;
-//                        }
-//                    } else {
-//                        mClickedPosition = NO_POSITION;
-//                    }
-//                }
-//                break;
-//            case MotionEvent.ACTION_UP:
-//                if (mClickedPosition != NO_POSITION) {
-//                    ((StickyAdapter) adapter).onClickStickyViewHolder(mClickedPosition);
-//                    mClickedPosition = NO_POSITION;
-//                    return true;
-//                }
-//                break;
-//        }
-//        return super.onTouchEvent(parent, ev, defaultResult);
-//    }
-
-    private int getNearestViewPosition(@NonNull RecyclerView parent, float eventY) {
-        int itemCount = parent.getAdapter().getItemCount();
-
-        boolean isReversed = isReverseLayout(parent);
-
-        if (isReversed) {
-            for (int i = itemCount - 1; i >= 0; i--) {
-                RecyclerView.ViewHolder viewHolder = parent.findViewHolderForAdapterPosition(i);
-                if (viewHolder != null) {
-                    View view = viewHolder.itemView;
-                    if (view.getY() >= eventY) return i;
-                }
-            }
-        } else {
-            for (int i = 0; i < itemCount; i++) {
-                RecyclerView.ViewHolder viewHolder = parent.findViewHolderForAdapterPosition(i);
-                if (viewHolder != null) {
-                    View view = viewHolder.itemView;
-                    if (view.getY() >= eventY) return i;
-                }
-            }
-        }
-        return NO_POSITION;
-    }
-
     private boolean showHeaderAboveItem(@NonNull RecyclerView parent, int position) {
         if (mStickyAdapter == null) return false;
         RecyclerView.LayoutManager layoutManager = parent.getLayoutManager();
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java
index 6e70a41..b8d0187 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java
@@ -12,7 +12,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.BiConsumer;
 
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
 import static com.omega_r.libs.omegarecyclerview.utils.ViewUtils.isReverseLayout;
@@ -27,7 +26,7 @@ abstract class StickyDecoration extends BaseStickyDecoration {
     private float mActionDownX;
     private float mActionDownY;
 
-    private final Map<Long, Rect> mMap = new HashMap<>();
+    private final Map<Long, Rect> mStickyRectMap = new HashMap<>();
 
     public StickyDecoration(@Nullable StickyAdapter adapter) {
         super(adapter);
@@ -59,13 +58,13 @@ public final boolean onTouchEvent(@NonNull RecyclerView parent, @NonNull MotionE
         return super.onTouchEvent(parent, ev, defaultResult);
     }
 
-    protected boolean handleActionDown(@NonNull RecyclerView parent, @NonNull final MotionEvent ev, boolean defaultResult) {
+    private boolean handleActionDown(@NonNull RecyclerView parent, @NonNull final MotionEvent ev, boolean defaultResult) {
         int eventX = (int) ev.getX();
         int eventY = (int) ev.getY();
-        for (Long id : mMap.keySet()) {
-            Rect rect = mMap.get(id);
-            if (rect != null && !rect.isEmpty() && rect.contains(eventX, eventY)) {
-                mClickedPosition = id;
+        for (Long stickyId : mStickyRectMap.keySet()) {
+            Rect rect = mStickyRectMap.get(stickyId);
+            if (stickyId != NO_STICKY_ID && rect != null && !rect.isEmpty() && rect.contains(eventX, eventY)) {
+                mClickedPosition = stickyId;
                 return true;
             }
         }
@@ -75,16 +74,10 @@ protected boolean handleActionDown(@NonNull RecyclerView parent, @NonNull final
     @Override
     public final void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
         super.onDrawOver(canvas, parent, state);
+        invalidateRectMap();
+
         int count = parent.getChildCount();
         long previousStickerId = -1;
-
-        mMap.forEach(new BiConsumer<Long, Rect>() {
-            @Override
-            public void accept(Long aLong, Rect rect) {
-                if (rect != null) rect.setEmpty();
-            }
-        });
-
         if (isReverseLayout(parent)) {
             for (int layoutPos = count - 1; layoutPos >= 0; layoutPos--) {
                 previousStickerId = calculateStickerIdAndDrawIt(canvas, parent, true, layoutPos, previousStickerId);
@@ -96,6 +89,12 @@ public void accept(Long aLong, Rect rect) {
         }
     }
 
+    private void invalidateRectMap() {
+        for (Rect rect : mStickyRectMap.values()) {
+            rect.setEmpty();
+        }
+    }
+
     private long calculateStickerIdAndDrawIt(Canvas canvas, RecyclerView parent, boolean isReverseLayout,
                                              int layoutPos, long previousStickerId) {
         long previousId = previousStickerId;
@@ -126,20 +125,11 @@ && hasSticker(adapterPosition - 1)
                             if (previousTop > 0) previousTop = 0;
                             drawSticky(canvas, childView, previousStickyViewHolder, previousTop);
                             drawSticky(canvas, childView, stickyHolder, top);
-
-                            Rect previousStickyViewHolderBounds = previousStickyViewHolder.itemView.getClipBounds();
-                            Rect bounds = stickyHolder.itemView.getClipBounds();
                         }
                     } else {
                         top = getStickerTop(parent, isReverseLayout, childView, stickerView, adapterPosition, layoutPos);
                         drawSticky(canvas, childView, stickyHolder, top);
-
-                        Rect rect = mMap.get(previousId);
-                        if (rect == null) {
-                            rect = new Rect();
-                            mMap.put(previousId, rect);
-                        }
-                        rect.set(stickerView.getLeft(), top, stickerView.getRight(), top + stickerView.getHeight());
+                        updateStickerRect(previousId, top, stickerView);
                     }
                 }
             }
@@ -147,6 +137,15 @@ && hasSticker(adapterPosition - 1)
         return previousId;
     }
 
+    private void updateStickerRect(long stickyId, int stickerTop, View stickerView) {
+        Rect rect = mStickyRectMap.get(stickyId);
+        if (rect == null) {
+            rect = new Rect();
+            mStickyRectMap.put(stickyId, rect);
+        }
+        rect.set(stickerView.getLeft(), stickerTop, stickerView.getRight(), stickerTop + stickerView.getHeight());
+    }
+
     private void drawSticky(Canvas canvas, View childView, RecyclerView.ViewHolder stickyHolder, int top) {
         if (stickyHolder == null) return;
 

From 6ab4adaa22638318db027b68af62dc1b6c9ecf76 Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Tue, 14 Jul 2020 15:17:22 +0300
Subject: [PATCH 25/32] StickyDecoration fields names changed

---
 .../sticky_decoration/StickyDecoration.java         | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java
index b8d0187..935ed89 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java
@@ -22,12 +22,11 @@ abstract class StickyDecoration extends BaseStickyDecoration {
 
     private static final float CLICK_MOVE_BIAS = 150;
 
-    private long mClickedPosition = NO_POSITION;
+    private final Map<Long, Rect> mStickyRectMap = new HashMap<>();
+    private long mClickedStickyId = NO_STICKY_ID;
     private float mActionDownX;
     private float mActionDownY;
 
-    private final Map<Long, Rect> mStickyRectMap = new HashMap<>();
-
     public StickyDecoration(@Nullable StickyAdapter adapter) {
         super(adapter);
     }
@@ -43,14 +42,14 @@ public final boolean onTouchEvent(@NonNull RecyclerView parent, @NonNull MotionE
             case MotionEvent.ACTION_DOWN:
                 mActionDownX = ev.getX();
                 mActionDownY = ev.getY();
-                mClickedPosition = NO_POSITION;
+                mClickedStickyId = NO_STICKY_ID;
                 return handleActionDown(parent, ev, defaultResult);
             case MotionEvent.ACTION_UP:
-                if (mStickyAdapter != null && mClickedPosition != NO_POSITION) {
+                if (mStickyAdapter != null && mClickedStickyId != NO_STICKY_ID) {
                     float eventX = ev.getX();
                     float eventY = ev.getY();
                     if (abs(mActionDownX - eventX) <= CLICK_MOVE_BIAS && abs(mActionDownY - eventY) <= CLICK_MOVE_BIAS) {
-                        mStickyAdapter.onClickStickyViewHolder(mClickedPosition);
+                        mStickyAdapter.onClickStickyViewHolder(mClickedStickyId);
                     }
                 }
                 break;
@@ -64,7 +63,7 @@ private boolean handleActionDown(@NonNull RecyclerView parent, @NonNull final Mo
         for (Long stickyId : mStickyRectMap.keySet()) {
             Rect rect = mStickyRectMap.get(stickyId);
             if (stickyId != NO_STICKY_ID && rect != null && !rect.isEmpty() && rect.contains(eventX, eventY)) {
-                mClickedPosition = stickyId;
+                mClickedStickyId = stickyId;
                 return true;
             }
         }

From 1261070e67847ceacff71e9f1ce55175f73ea9aa Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Tue, 28 Jul 2020 13:02:10 +0300
Subject: [PATCH 26/32] GroupItemSpace attribute added

---
 .../omegarecyclerview/OmegaRecyclerView.java  | 23 +++++++----
 ...tion.java => BaseSpaceItemDecoration.java} | 22 ++++++----
 .../src/main/res/values/attrs.xml             |  1 +
 .../ExpandableSpaceItemDecoration.java        | 40 +++++++++++++++++++
 .../ExpandableStickyDecoration.java           |  8 +---
 .../OmegaExpandableRecyclerView.java          | 26 +++++++++++-
 6 files changed, 97 insertions(+), 23 deletions(-)
 rename omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/{SpaceItemDecoration.java => BaseSpaceItemDecoration.java} (67%)
 create mode 100644 omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/ExpandableSpaceItemDecoration.java

diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
index a65ef03..aad21b5 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
@@ -15,7 +15,7 @@
 
 import com.omega_r.libs.omegarecyclerview.header.HeaderFooterWrapperAdapter;
 import com.omega_r.libs.omegarecyclerview.item_decoration.DividerItemDecoration;
-import com.omega_r.libs.omegarecyclerview.item_decoration.SpaceItemDecoration;
+import com.omega_r.libs.omegarecyclerview.item_decoration.BaseSpaceItemDecoration;
 import com.omega_r.libs.omegarecyclerview.pagination.OnPageRequestListener;
 import com.omega_r.libs.omegarecyclerview.pagination.PageRequester;
 import com.omega_r.libs.omegarecyclerview.pagination.PaginationAdapter;
@@ -52,6 +52,7 @@ public class OmegaRecyclerView extends ExpandedRecyclerView implements SwipeMenu
     private SwipeMenuHelper mSwipeMenuHelper;
     private PageRequester mPageRequester = new PageRequester();
     private BaseStickyDecoration mBaseStickyDecoration;
+    private BaseSpaceItemDecoration mBaseSpaceItemDecoration;
     private int mStickyMode = StickyAdapter.Mode.HEADER;
     @LayoutRes
     private int mPaginationLayout = R.layout.pagination_omega_layout;
@@ -110,12 +111,16 @@ private void initEmptyView(TypedArray a) {
         }
     }
 
-    public void initItemSpace(TypedArray a) {
-        if (a.hasValue(R.styleable.OmegaRecyclerView_itemSpace)) {
-            int showDivider = a.getInt(R.styleable.OmegaRecyclerView_dividerShow, DividerItemDecoration.ShowDivider.NONE);
-            mItemSpace = (int) a.getDimension(R.styleable.OmegaRecyclerView_itemSpace, 0);
-            addItemDecoration(new SpaceItemDecoration(showDivider, mItemSpace));
-        }
+    private void initItemSpace(TypedArray a) {
+        int showDivider = a.getInt(R.styleable.OmegaRecyclerView_dividerShow, DividerItemDecoration.ShowDivider.NONE);
+        mItemSpace = (int) a.getDimension(R.styleable.OmegaRecyclerView_itemSpace, 0);
+        mBaseSpaceItemDecoration = createSpaceItemDecoration(showDivider, mItemSpace);
+
+        if (a.hasValue(R.styleable.OmegaRecyclerView_itemSpace)) addItemDecoration(mBaseSpaceItemDecoration);
+    }
+
+    protected BaseSpaceItemDecoration createSpaceItemDecoration(int showDivider, int itemSpace) {
+        return new BaseSpaceItemDecoration(showDivider, itemSpace);
     }
 
     public void initDivider(TypedArray a) {
@@ -286,6 +291,10 @@ protected final BaseStickyDecoration getStickyDecoration() {
         return mBaseStickyDecoration;
     }
 
+    @NonNull
+    protected final BaseSpaceItemDecoration getSpaceDecoration() {
+        return mBaseSpaceItemDecoration;
+    }
 
     @Override
     public void addView(View view, int index, ViewGroup.LayoutParams params) {
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/SpaceItemDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/BaseSpaceItemDecoration.java
similarity index 67%
rename from omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/SpaceItemDecoration.java
rename to omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/BaseSpaceItemDecoration.java
index a87e296..ac380c8 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/SpaceItemDecoration.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/BaseSpaceItemDecoration.java
@@ -8,28 +8,34 @@
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-public class SpaceItemDecoration extends BaseItemDecoration {
+public class BaseSpaceItemDecoration extends BaseItemDecoration {
 
-    private final int space;
+    private final int mItemSpace;
 
-    public SpaceItemDecoration(int showDivider, int space) {
+    public BaseSpaceItemDecoration(int showDivider, int space) {
         super(showDivider);
-        this.space = space;
+        mItemSpace = space;
     }
 
     @Override
     void getItemOffset(@NonNull Rect outRect, @NonNull RecyclerView parent,
                        @NonNull DividerDecorationHelper helper, int position, int itemCount) {
         int countBeginEndPositions = getCountBeginEndPositions(parent);
-        if (isShowBeginDivider() || countBeginEndPositions <= position) helper.setStart(outRect, space);
-        if (isShowEndDivider() && position == itemCount - countBeginEndPositions) helper.setEnd(outRect, space);
+        int itemSpace = getItemSpace(parent, position, itemCount);
+
+        if (isShowBeginDivider() || countBeginEndPositions <= position) helper.setStart(outRect, itemSpace);
+        if (isShowEndDivider() && position == itemCount - countBeginEndPositions) helper.setEnd(outRect, itemSpace);
 
         if (countBeginEndPositions > 1) {
-            if (position % countBeginEndPositions != 0 || isShowBeginDivider()) helper.setOtherStart(outRect, space);
-            if (position / (countBeginEndPositions - 1) > 0 && isShowEndDivider()) helper.setOtherEnd(outRect, space);
+            if (position % countBeginEndPositions != 0 || isShowBeginDivider()) helper.setOtherStart(outRect, itemSpace);
+            if (position / (countBeginEndPositions - 1) > 0 && isShowEndDivider()) helper.setOtherEnd(outRect, itemSpace);
         }
     }
 
+    protected int getItemSpace(@NonNull RecyclerView parent, int position, int itemCount) {
+        return mItemSpace;
+    }
+
     private int getCountBeginEndPositions(RecyclerView recyclerView) {
         RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
         if (layoutManager instanceof GridLayoutManager) {
diff --git a/omegarecyclerview/src/main/res/values/attrs.xml b/omegarecyclerview/src/main/res/values/attrs.xml
index 476342c..142b366 100644
--- a/omegarecyclerview/src/main/res/values/attrs.xml
+++ b/omegarecyclerview/src/main/res/values/attrs.xml
@@ -75,6 +75,7 @@
         </attr>
         <attr name="stickyGroups" format="boolean" />
         <attr name="backgrounds" format="reference" />
+        <attr name="groupItemSpace" format="dimension" />
     </declare-styleable>
 
 </resources>
diff --git a/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/ExpandableSpaceItemDecoration.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/ExpandableSpaceItemDecoration.java
new file mode 100644
index 0000000..f935a21
--- /dev/null
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/ExpandableSpaceItemDecoration.java
@@ -0,0 +1,40 @@
+package com.omega_r.libs.omegarecyclerview_expandable;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.omega_r.libs.omegarecyclerview.item_decoration.BaseSpaceItemDecoration;
+
+import static com.omega_r.libs.omegarecyclerview_expandable.OmegaExpandableRecyclerView.Adapter.VH_TYPE_CHILD;
+import static com.omega_r.libs.omegarecyclerview_expandable.OmegaExpandableRecyclerView.Adapter.VH_TYPE_GROUP;
+
+@SuppressWarnings("rawtypes")
+public class ExpandableSpaceItemDecoration extends BaseSpaceItemDecoration {
+
+    private int mGroupItemSpace = 0;
+
+    public ExpandableSpaceItemDecoration(int showDivider, int itemSpace) {
+        super(showDivider, itemSpace);
+    }
+
+    public void setGroupSpace(int groupSpace) {
+        mGroupItemSpace = groupSpace;
+    }
+
+    @Override
+    protected int getItemSpace(@NonNull RecyclerView parent, int position, int itemCount) {
+        RecyclerView.Adapter adapter = parent.getAdapter();
+        if (adapter == null) return super.getItemSpace(parent, position, itemCount);
+
+        int viewType = adapter.getItemViewType(position);
+        switch (viewType) {
+            case VH_TYPE_GROUP:
+                return mGroupItemSpace;
+            case VH_TYPE_CHILD:
+                if (position > 0 && adapter.getItemViewType(position - 1) == VH_TYPE_GROUP) return 0;
+        }
+
+        return super.getItemSpace(parent, position, itemCount);
+    }
+
+}
diff --git a/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/ExpandableStickyDecoration.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/ExpandableStickyDecoration.java
index 8004004..c92c633 100644
--- a/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/ExpandableStickyDecoration.java
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/ExpandableStickyDecoration.java
@@ -26,12 +26,6 @@
 public class ExpandableStickyDecoration extends BaseStickyDecoration {
 
     private static final int OFFSET_NOT_FOUND = Integer.MIN_VALUE;
-    private static final Comparator<Integer> ASCENDING_COMPARATOR = new Comparator<Integer>() {
-        @Override
-        public int compare(Integer o1, Integer o2) {
-            return o1.compareTo(o2);
-        }
-    };
 
     private final Rect mViewRect = new Rect();
     @Nullable
@@ -66,7 +60,7 @@ public void onDrawOver(@NonNull Canvas canvas, @NonNull RecyclerView parent, @No
             mAdapterPositions.add(adapterPosition);
         }
 
-        Collections.sort(mAdapterPositions, ASCENDING_COMPARATOR);
+        Collections.sort(mAdapterPositions);
 
         if (isReverseLayout(parent)) {
             for (int i = mAdapterPositions.size() - 1; i >= 0; i--) {
diff --git a/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/OmegaExpandableRecyclerView.java b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/OmegaExpandableRecyclerView.java
index 6f4e3ee..7ead19a 100644
--- a/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/OmegaExpandableRecyclerView.java
+++ b/omegarecyclerview_expandable/src/main/java/com/omega_r/libs/omegarecyclerview_expandable/OmegaExpandableRecyclerView.java
@@ -27,6 +27,7 @@
 
 import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView;
 import com.omega_r.libs.omegarecyclerview.R;
+import com.omega_r.libs.omegarecyclerview.item_decoration.BaseSpaceItemDecoration;
 import com.omega_r.libs.omegarecyclerview.sticky_decoration.BaseStickyDecoration;
 import com.omega_r.libs.omegarecyclerview.sticky_decoration.StickyAdapter;
 import com.omega_r.libs.omegarecyclerview_expandable.animation.AnimationHelper;
@@ -139,11 +140,34 @@ private void parseAttributes(AttributeSet attributeSet, int defStyleAttr) {
             mExpandMode = attrs.getInteger(R.styleable.OmegaExpandableRecyclerView_expandMode, EXPAND_MODE_SINGLE);
             mShouldUseStickyGroups = attrs.getBoolean(R.styleable.OmegaExpandableRecyclerView_stickyGroups, false);
             mItemsBackgroundRes = attrs.getResourceId(R.styleable.OmegaExpandableRecyclerView_backgrounds, NO_RESOURCE);
+            initGroupItemSpace(attrs);
         } finally {
             attrs.recycle();
         }
     }
 
+    private void initGroupItemSpace(TypedArray a) {
+        BaseSpaceItemDecoration decoration = getSpaceDecoration();
+        int groupItemSpace = (int) a.getDimension(R.styleable.OmegaExpandableRecyclerView_groupItemSpace, 0);
+        if (groupItemSpace > 0) {
+            ((ExpandableSpaceItemDecoration) decoration).setGroupSpace(groupItemSpace);
+            if (!hasSpaceDecoration()) addItemDecoration(decoration);
+        }
+    }
+
+    private boolean hasSpaceDecoration() {
+        for (int i = 0; i < getItemDecorationCount(); i++) {
+            RecyclerView.ItemDecoration decoration = getItemDecorationAt(i);
+            if (decoration instanceof BaseSpaceItemDecoration) return true;
+        }
+        return false;
+    }
+
+    @Override
+    protected BaseSpaceItemDecoration createSpaceItemDecoration(int showDivider, int itemSpace) {
+        return new ExpandableSpaceItemDecoration(showDivider, itemSpace);
+    }
+
     @Override
     protected void initDefaultLayoutManager(@Nullable AttributeSet attrs, int defStyleAttr) {
         if (getLayoutManager() == null) {
@@ -219,7 +243,7 @@ protected void updateStickyDecoration(@Nullable RecyclerView.Adapter adapter) {
         BaseStickyDecoration stickyDecoration = getStickyDecoration();
         if (adapter != null && stickyDecoration != null) {
             if (adapter instanceof OmegaExpandableRecyclerView.Adapter
-                && stickyDecoration instanceof ExpandableStickyDecoration) {
+                    && stickyDecoration instanceof ExpandableStickyDecoration) {
                 ((ExpandableStickyDecoration) stickyDecoration).setExpandableAdapter((Adapter) adapter);
             }
         }

From 8ddf8164a74d77c83e2a58c0fbddc453971de7f8 Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Tue, 28 Jul 2020 13:03:21 +0300
Subject: [PATCH 27/32] Divider blink bug has been fixed.

---
 .../item_decoration/DividerItemDecoration.java | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java
index 8a08a31..17b3456 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java
@@ -129,7 +129,7 @@ public void onDrawOver(@NonNull Canvas c, @NonNull RecyclerView parent, @NonNull
 
             // show beginning divider
             if (isShowBeginDivider()) {
-                child = parent.getChildAt(0);
+                child = getFirstChild(parent);
                 int adapterPosition = getAdapterPosition(parent, child);
                 if (adapterPosition == 0 && isShowDividerAbove(parent, 0)) {
                     offsetIndex = 1;
@@ -171,6 +171,22 @@ public void onDrawOver(@NonNull Canvas c, @NonNull RecyclerView parent, @NonNull
         }
     }
 
+    // But with Expandable adapter and hide animation.
+    // RecyclerView getChild - returns wrong child (ChildClippingFrameLayout).
+    private View getFirstChild(RecyclerView parent) {
+        int count = parent.getChildCount();
+        View topView = null;
+        for (int i = 0; i < count; i++) {
+            View view = parent.getChildAt(i);
+            if (topView == null) {
+                topView = view;
+            } else if (topView.getY() > view.getY()) {
+                topView = view;
+            }
+        }
+        return topView;
+    }
+
     private void updateViewRect(RecyclerView parent, View view) {
         view.getHitRect(mViewRect);
         RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) view.getLayoutParams();

From 4534e128c9fcab76ba274e977f4c704cb4127ed4 Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Tue, 28 Jul 2020 15:08:42 +0300
Subject: [PATCH 28/32] Fixed review

---
 .../item_decoration/DividerItemDecoration.java                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java
index 17b3456..5ffc06d 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java
@@ -171,7 +171,7 @@ public void onDrawOver(@NonNull Canvas c, @NonNull RecyclerView parent, @NonNull
         }
     }
 
-    // But with Expandable adapter and hide animation.
+    // Bug with Expandable adapter and hide animation.
     // RecyclerView getChild - returns wrong child (ChildClippingFrameLayout).
     private View getFirstChild(RecyclerView parent) {
         int count = parent.getChildCount();

From fc9335218da4efa3a30815ac1c5248ba080d47eb Mon Sep 17 00:00:00 2001
From: just-d-a <prospeedcuber@gmail.com>
Date: Tue, 26 Jan 2021 18:54:37 +0300
Subject: [PATCH 29/32] add padding treatment

---
 app/src/main/res/layout/activity_view_pager.xml   |  5 ++++-
 app/src/main/res/layout/item_image.xml            |  2 +-
 .../viewpager/ViewPagerLayoutManager.java         | 15 +++++++++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/activity_view_pager.xml b/app/src/main/res/layout/activity_view_pager.xml
index d6d20b4..68b788f 100644
--- a/app/src/main/res/layout/activity_view_pager.xml
+++ b/app/src/main/res/layout/activity_view_pager.xml
@@ -17,10 +17,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="horizontal"
+        android:paddingLeft="10dp"
+        android:clipChildren="false"
+        android:clipToPadding="false"
         app:autoScrollEnabled="true"
-        app:autoScrollInterval="2500"
         app:pageSize="1"
         app:transformer="RotateUpTransformer"
         app:infinite="true"/>
+    <!--        app:autoScrollInterval="2500"-->
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_image.xml b/app/src/main/res/layout/item_image.xml
index 096f68b..15b7881 100644
--- a/app/src/main/res/layout/item_image.xml
+++ b/app/src/main/res/layout/item_image.xml
@@ -9,7 +9,7 @@
     <ImageView
         android:id="@+id/imageview"
         android:layout_height="250dp"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:scaleType="fitXY"
         tools:src="@drawable/image_1"/>
 
diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
index cd7182e..6341fd8 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
@@ -190,8 +190,8 @@ private View getMeasuredChildForAdapterPosition(int position, RecyclerView.Recyc
         View view = recycler.getViewForPosition(calculateRealPosition(position));
         addView(view);
 
-        int width = getWidth();
-        int height = getHeight();
+        int width = getWidth() - getPaddingLeft() - getPaddingRight();
+        int height = getHeight() - getPaddingTop() - getPaddingBottom();
         switch (mOrientation) {
             case HORIZONTAL:
                 width *= mPageSize;
@@ -251,7 +251,10 @@ private int getMeasuredHeightWithMargin(View child) {
     }
 
     private void updateRecyclerDimensions() {
-        mRecyclerCenterPoint.set(getWidth() / 2, getHeight() / 2);
+        mRecyclerCenterPoint.set(
+                (getWidth() + getPaddingLeft() - getPaddingRight()) / 2,
+                (getHeight() + getPaddingTop() - getPaddingBottom()) / 2
+        );
     }
 
     private void fill(RecyclerView.Recycler recycler) {
@@ -259,7 +262,11 @@ private void fill(RecyclerView.Recycler recycler) {
 
         mOrientationHelper.setCurrentViewCenter(mRecyclerCenterPoint, mScrolled, mCurrentViewCenterPoint);
 
-        final int endBound = mOrientationHelper.getViewEnd(getWidth(), getHeight());
+        final int endBound = getClipToPadding() ?
+                mOrientationHelper.getViewEnd(
+                        getWidth() - getPaddingRight(),
+                getHeight() - getPaddingBottom())
+                : mOrientationHelper.getViewEnd(getWidth(), getHeight());
 
         if (mScrolled >= 0) {
             layoutViews(recycler, Direction.START, endBound); //Layout items before the current item

From 55fb815a4d76ca2d84e136173972877796f604da Mon Sep 17 00:00:00 2001
From: just-d-a <prospeedcuber@gmail.com>
Date: Thu, 11 Feb 2021 13:23:45 +0300
Subject: [PATCH 30/32] try to fix

---
 .../omegarecyclerview/viewpager/ViewPagerLayoutManager.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
index cd7182e..b594517 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
@@ -445,6 +445,9 @@ private int calculateScrollPosition(int position) {
         int itemCount = super.getItemCount();
         if (mIsInfinite && itemCount != 0) {
             int currentWindowPosition = mCurrentPosition / itemCount;
+            if(currentWindowPosition > position * itemCount) {
+                currentWindowPosition++;
+            }
             return currentWindowPosition * itemCount + position;
         }
         return position;

From dc21e527382b2ace7a51397fa1a4d5667728b7b9 Mon Sep 17 00:00:00 2001
From: just-d-a <prospeedcuber@gmail.com>
Date: Thu, 11 Feb 2021 14:22:28 +0300
Subject: [PATCH 31/32] change counting

---
 .../omegarecyclerview/viewpager/ViewPagerLayoutManager.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
index b594517..fbc3a08 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
@@ -445,7 +445,7 @@ private int calculateScrollPosition(int position) {
         int itemCount = super.getItemCount();
         if (mIsInfinite && itemCount != 0) {
             int currentWindowPosition = mCurrentPosition / itemCount;
-            if(currentWindowPosition > position * itemCount) {
+            if (currentWindowPosition > position + (currentWindowPosition * itemCount)) {
                 currentWindowPosition++;
             }
             return currentWindowPosition * itemCount + position;

From 6d0b721f6d556993e9c3301553ebb41362d09289 Mon Sep 17 00:00:00 2001
From: just-d-a <prospeedcuber@gmail.com>
Date: Thu, 11 Feb 2021 14:26:49 +0300
Subject: [PATCH 32/32] new change for counting

---
 .../omegarecyclerview/viewpager/ViewPagerLayoutManager.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
index fbc3a08..8808c60 100644
--- a/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
+++ b/omegarecyclerview/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java
@@ -445,7 +445,7 @@ private int calculateScrollPosition(int position) {
         int itemCount = super.getItemCount();
         if (mIsInfinite && itemCount != 0) {
             int currentWindowPosition = mCurrentPosition / itemCount;
-            if (currentWindowPosition > position + (currentWindowPosition * itemCount)) {
+            if (mCurrentPosition > position + (currentWindowPosition * itemCount)) {
                 currentWindowPosition++;
             }
             return currentWindowPosition * itemCount + position;