From 48cac53a4a49ee22463ae830edb434b987475b27 Mon Sep 17 00:00:00 2001 From: Nikita Ivanov Date: Thu, 10 Jan 2019 17:17:39 +0300 Subject: [PATCH 01/80] Migration to AndroidX --- app/build.gradle | 10 ++++----- .../ExampleInstrumentedTest.java | 4 ++-- .../ListAdapterActivity.java | 5 ++--- .../omegarecyclerview/MainActivity.java | 2 +- .../pagination_example/Image.java | 2 +- .../pagination_example/ImageAdapter.java | 2 +- .../PaginationActivity.java | 2 +- .../sections_example/SectionsActivity.java | 2 +- .../StickyHeaderActivity.java | 2 +- .../swipe_menu_example/SwipeMenuActivity.java | 5 +---- .../viewpager/ViewPagerActivity.java | 6 ++--- build.gradle | 3 +-- gradle.properties | 2 ++ omegarecyclerviewlibs/build.gradle | 6 ++--- .../widget/ExpandedRecyclerView.java | 6 +++-- .../omegarecyclerview/BaseArrayAdapter.java | 2 +- .../omegarecyclerview/BaseListAdapter.java | 5 ++--- .../omegarecyclerview/ClickViewHolder.java | 2 +- .../omegarecyclerview/OmegaRecyclerView.java | 20 ++++++++--------- .../header/HeaderFooterWrapperAdapter.java | 6 ++--- .../header/SectionContentFrameLayout.java | 2 +- .../item_decoration/BaseItemDecoration.java | 6 ++--- .../DividerItemDecoration.java | 6 ++--- .../item_decoration/SpaceItemDecoration.java | 7 ++---- .../DividerDecorationHelper.java | 6 ++--- .../pagination/PageRequester.java | 4 ++-- .../pagination/PaginationAdapter.java | 4 ++-- .../pagination/PaginationViewCreator.java | 2 +- .../pagination/WrapperAdapter.java | 2 +- .../sticky_header/StickyHeaderAdapter.java | 2 +- .../sticky_header/StickyHeaderDecoration.java | 6 ++--- .../swipe_menu/SwipeHorizontalMenuLayout.java | 7 +++--- .../swipe_menu/SwipeMenuLayout.java | 6 ++--- .../swipe_menu/SwipeViewHolder.java | 7 +++--- .../viewpager/OmegaPagerRecyclerView.java | 12 +++++----- .../viewpager/ViewPagerLayoutManager.java | 22 +++++++++---------- .../viewpager/default_transformers/Pivot.java | 2 +- .../ScaleTransformer.java | 2 +- .../transform/ItemTransformerWrapper.java | 2 +- 39 files changed, 95 insertions(+), 106 deletions(-) rename omegarecyclerviewlibs/src/main/java/{android/support/v7 => androidx/recyclerview}/widget/ExpandedRecyclerView.java (82%) diff --git a/app/build.gradle b/app/build.gradle index 26db849..41ef6da 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -21,11 +21,11 @@ android { } dependencies { - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3' implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:' + rootProject.supportLibVersion - implementation 'com.android.support:support-v4:' + rootProject.supportLibVersion - implementation 'com.android.support:design:' + rootProject.supportLibVersion + 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.github.Omega-R.OmegaIntentBuilder:core:' + rootProject.omegaIntentBuilder implementation 'com.github.Omega-R.OmegaIntentBuilder:annotations:' + rootProject.omegaIntentBuilder diff --git a/app/src/androidTest/java/com/omega_r/omegarecyclerview/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/omega_r/omegarecyclerview/ExampleInstrumentedTest.java index a601bb1..b83aea2 100644 --- a/app/src/androidTest/java/com/omega_r/omegarecyclerview/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/omega_r/omegarecyclerview/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.omega_r.omegarecyclerview; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/ListAdapterExample/ListAdapterActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/ListAdapterExample/ListAdapterActivity.java index 07e5260..11edb88 100644 --- a/app/src/main/java/com/omega_r/omegarecyclerview/ListAdapterExample/ListAdapterActivity.java +++ b/app/src/main/java/com/omega_r/omegarecyclerview/ListAdapterExample/ListAdapterActivity.java @@ -1,15 +1,14 @@ package com.omega_r.omegarecyclerview.ListAdapterExample; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.widget.Toast; import com.omega_r.libs.omegarecyclerview.BaseListAdapter; import com.omega_r.omegarecyclerview.R; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import omega.com.annotations.OmegaActivity; 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 6b3ded3..9f47764 100644 --- a/app/src/main/java/com/omega_r/omegarecyclerview/MainActivity.java +++ b/app/src/main/java/com/omega_r/omegarecyclerview/MainActivity.java @@ -1,7 +1,7 @@ package com.omega_r.omegarecyclerview; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import com.omega_r.libs.omegaintentbuilder.AppOmegaIntentBuilder; diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/Image.java b/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/Image.java index 4cbcef5..6ae2fb2 100644 --- a/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/Image.java +++ b/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/Image.java @@ -1,6 +1,6 @@ package com.omega_r.omegarecyclerview.pagination_example; -import android.support.annotation.DrawableRes; +import androidx.annotation.DrawableRes; import com.omega_r.omegarecyclerview.R; diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/ImageAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/ImageAdapter.java index a93e8b6..09d2d8a 100644 --- a/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/ImageAdapter.java +++ b/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/ImageAdapter.java @@ -1,6 +1,6 @@ package com.omega_r.omegarecyclerview.pagination_example; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/PaginationActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/PaginationActivity.java index 7635462..3de8c4a 100644 --- a/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/PaginationActivity.java +++ b/app/src/main/java/com/omega_r/omegarecyclerview/pagination_example/PaginationActivity.java @@ -2,7 +2,7 @@ import android.os.Bundle; import android.os.Handler; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView; import com.omega_r.libs.omegarecyclerview.pagination.OnPageRequestListener; diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/sections_example/SectionsActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/sections_example/SectionsActivity.java index d17263e..3c516fe 100644 --- a/app/src/main/java/com/omega_r/omegarecyclerview/sections_example/SectionsActivity.java +++ b/app/src/main/java/com/omega_r/omegarecyclerview/sections_example/SectionsActivity.java @@ -1,6 +1,6 @@ package com.omega_r.omegarecyclerview.sections_example; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/sticky_header_example/StickyHeaderActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/sticky_header_example/StickyHeaderActivity.java index 8b12e77..984732d 100644 --- a/app/src/main/java/com/omega_r/omegarecyclerview/sticky_header_example/StickyHeaderActivity.java +++ b/app/src/main/java/com/omega_r/omegarecyclerview/sticky_header_example/StickyHeaderActivity.java @@ -1,6 +1,6 @@ package com.omega_r.omegarecyclerview.sticky_header_example; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView; diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/swipe_menu_example/SwipeMenuActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/swipe_menu_example/SwipeMenuActivity.java index 4be3f19..66accab 100644 --- a/app/src/main/java/com/omega_r/omegarecyclerview/swipe_menu_example/SwipeMenuActivity.java +++ b/app/src/main/java/com/omega_r/omegarecyclerview/swipe_menu_example/SwipeMenuActivity.java @@ -1,14 +1,11 @@ package com.omega_r.omegarecyclerview.swipe_menu_example; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView; import com.omega_r.omegarecyclerview.R; -import java.util.List; - import omega.com.annotations.OmegaActivity; @OmegaActivity diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/viewpager/ViewPagerActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/viewpager/ViewPagerActivity.java index e49f216..8c44e6a 100644 --- a/app/src/main/java/com/omega_r/omegarecyclerview/viewpager/ViewPagerActivity.java +++ b/app/src/main/java/com/omega_r/omegarecyclerview/viewpager/ViewPagerActivity.java @@ -2,9 +2,9 @@ import android.annotation.SuppressLint; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; diff --git a/build.gradle b/build.gradle index ac3ea50..f4f8314 100644 --- a/build.gradle +++ b/build.gradle @@ -30,8 +30,7 @@ task clean(type: Delete) { ext { buildToolsVersion = "28.0.3" - supportLibVersion = "28.0.0" espressoVersion = "3.0.1" junitVersion = "4.12" - omegaIntentBuilder = "1.1.2" + omegaIntentBuilder = "1.1.5" } diff --git a/gradle.properties b/gradle.properties index aac7c9b..9e6fce1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/omegarecyclerviewlibs/build.gradle b/omegarecyclerviewlibs/build.gradle index 7463550..6ec272e 100644 --- a/omegarecyclerviewlibs/build.gradle +++ b/omegarecyclerviewlibs/build.gradle @@ -12,7 +12,7 @@ android { versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -25,7 +25,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.android.support:appcompat-v7:$rootProject.supportLibVersion" - implementation "com.android.support:design:$rootProject.supportLibVersion" + implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' + implementation 'com.google.android.material:material:1.1.0-alpha02' } diff --git a/omegarecyclerviewlibs/src/main/java/android/support/v7/widget/ExpandedRecyclerView.java b/omegarecyclerviewlibs/src/main/java/androidx/recyclerview/widget/ExpandedRecyclerView.java similarity index 82% rename from omegarecyclerviewlibs/src/main/java/android/support/v7/widget/ExpandedRecyclerView.java rename to omegarecyclerviewlibs/src/main/java/androidx/recyclerview/widget/ExpandedRecyclerView.java index 3befbb1..cfaddb9 100644 --- a/omegarecyclerviewlibs/src/main/java/android/support/v7/widget/ExpandedRecyclerView.java +++ b/omegarecyclerviewlibs/src/main/java/androidx/recyclerview/widget/ExpandedRecyclerView.java @@ -1,9 +1,11 @@ -package android.support.v7.widget; +package androidx.recyclerview.widget; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; +import androidx.recyclerview.widget.RecyclerView; + public class ExpandedRecyclerView extends RecyclerView { public ExpandedRecyclerView(Context context) { diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseArrayAdapter.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseArrayAdapter.java index a5cf8a1..b8e2591 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseArrayAdapter.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseArrayAdapter.java @@ -1,7 +1,7 @@ package com.omega_r.libs.omegarecyclerview; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import java.util.Arrays; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseListAdapter.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseListAdapter.java index ecda8f5..66d7754 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseListAdapter.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseListAdapter.java @@ -1,11 +1,10 @@ package com.omega_r.libs.omegarecyclerview; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; -import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/ClickViewHolder.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/ClickViewHolder.java index d4f1282..aac4cd7 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/ClickViewHolder.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/ClickViewHolder.java @@ -1,6 +1,6 @@ package com.omega_r.libs.omegarecyclerview; -import android.support.annotation.LayoutRes; +import androidx.annotation.LayoutRes; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java index 10a83ca..9a69613 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java @@ -7,16 +7,16 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorInt; -import android.support.annotation.ColorRes; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.ExpandedRecyclerView; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.ColorInt; +import androidx.annotation.ColorRes; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +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 android.util.AttributeSet; import android.view.LayoutInflater; import android.view.MotionEvent; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java index a1cf9aa..36b53a5 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/header/HeaderFooterWrapperAdapter.java @@ -1,8 +1,8 @@ package com.omega_r.libs.omegarecyclerview.header; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.util.SparseArray; import android.view.View; import android.view.ViewGroup; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/header/SectionContentFrameLayout.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/header/SectionContentFrameLayout.java index 769616d..b411735 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/header/SectionContentFrameLayout.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/header/SectionContentFrameLayout.java @@ -1,7 +1,7 @@ package com.omega_r.libs.omegarecyclerview.header; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/BaseItemDecoration.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/BaseItemDecoration.java index 5a7e615..d30bab6 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/BaseItemDecoration.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/BaseItemDecoration.java @@ -1,9 +1,9 @@ package com.omega_r.libs.omegarecyclerview.item_decoration; import android.graphics.Rect; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java index 2d6908a..0e3698a 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/DividerItemDecoration.java @@ -3,9 +3,9 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/SpaceItemDecoration.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/SpaceItemDecoration.java index 59dfa22..708e60e 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/SpaceItemDecoration.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/SpaceItemDecoration.java @@ -1,12 +1,9 @@ package com.omega_r.libs.omegarecyclerview.item_decoration; import android.graphics.Rect; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.View; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; -import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView; import com.omega_r.libs.omegarecyclerview.item_decoration.decoration_helpers.DividerDecorationHelper; public class SpaceItemDecoration extends BaseItemDecoration { diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/decoration_helpers/DividerDecorationHelper.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/decoration_helpers/DividerDecorationHelper.java index fb35077..9ee8190 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/decoration_helpers/DividerDecorationHelper.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/item_decoration/decoration_helpers/DividerDecorationHelper.java @@ -1,9 +1,9 @@ package com.omega_r.libs.omegarecyclerview.item_decoration.decoration_helpers; import android.graphics.Rect; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import static com.omega_r.libs.omegarecyclerview.item_decoration.DividerItemDecoration.Orientation; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PageRequester.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PageRequester.java index c9c8572..e755d49 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PageRequester.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PageRequester.java @@ -1,8 +1,8 @@ package com.omega_r.libs.omegarecyclerview.pagination; import android.graphics.Rect; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; public class PageRequester extends RecyclerView.ItemDecoration { diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationAdapter.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationAdapter.java index cc5d21a..4758b26 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationAdapter.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationAdapter.java @@ -1,7 +1,7 @@ package com.omega_r.libs.omegarecyclerview.pagination; -import android.support.annotation.LayoutRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.LayoutRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationViewCreator.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationViewCreator.java index 90dca01..195d43f 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationViewCreator.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/PaginationViewCreator.java @@ -1,6 +1,6 @@ package com.omega_r.libs.omegarecyclerview.pagination; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/WrapperAdapter.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/WrapperAdapter.java index e419ee9..41e10ad 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/WrapperAdapter.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/pagination/WrapperAdapter.java @@ -1,6 +1,6 @@ package com.omega_r.libs.omegarecyclerview.pagination; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderAdapter.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderAdapter.java index d46bd6d..e05eda7 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderAdapter.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderAdapter.java @@ -1,6 +1,6 @@ package com.omega_r.libs.omegarecyclerview.sticky_header; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; public interface StickyHeaderAdapter { diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderDecoration.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderDecoration.java index 2fb007b..2d0e926 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderDecoration.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_header/StickyHeaderDecoration.java @@ -2,13 +2,11 @@ import android.graphics.Canvas; import android.graphics.Rect; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; -import com.omega_r.libs.omegarecyclerview.header.HeaderFooterWrapperAdapter; - public class StickyHeaderDecoration extends RecyclerView.ItemDecoration { public static final long NO_HEADER_ID = -1L; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java index 1430ccc..716b488 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeHorizontalMenuLayout.java @@ -1,15 +1,14 @@ package com.omega_r.libs.omegarecyclerview.swipe_menu; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.view.ViewCompat; +import androidx.annotation.NonNull; +import androidx.core.view.ViewCompat; import android.util.AttributeSet; -import android.util.Log; import android.view.MotionEvent; import android.view.VelocityTracker; import android.view.View; import android.view.ViewParent; -import com.omega_r.libs.omegarecyclerview.swipe_menu.listener.SwipeSwitchListener; + import com.omega_r.libs.omegarecyclerview.swipe_menu.swiper.LeftHorizontalSwiper; import com.omega_r.libs.omegarecyclerview.swipe_menu.swiper.RightHorizontalSwiper; import com.omega_r.libs.omegarecyclerview.swipe_menu.swiper.Swiper; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuLayout.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuLayout.java index bf53652..3611624 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuLayout.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeMenuLayout.java @@ -1,14 +1,13 @@ package com.omega_r.libs.omegarecyclerview.swipe_menu; import android.content.Context; -import android.content.res.TypedArray; -import android.support.annotation.Nullable; + +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.VelocityTracker; import android.view.View; import android.view.ViewConfiguration; -import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.widget.FrameLayout; import android.widget.OverScroller; @@ -18,7 +17,6 @@ import java.text.NumberFormat; import java.util.Locale; -import com.omega_r.libs.omegarecyclerview.R; import com.omega_r.libs.omegarecyclerview.swipe_menu.listener.SwipeFractionListener; import com.omega_r.libs.omegarecyclerview.swipe_menu.listener.SwipeSwitchListener; import com.omega_r.libs.omegarecyclerview.swipe_menu.swiper.Swiper; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeViewHolder.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeViewHolder.java index 609f506..7494ebf 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeViewHolder.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/swipe_menu/SwipeViewHolder.java @@ -1,13 +1,12 @@ package com.omega_r.libs.omegarecyclerview.swipe_menu; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; -import android.widget.LinearLayout; import com.omega_r.libs.omegarecyclerview.OmegaRecyclerView; import com.omega_r.libs.omegarecyclerview.swipe_menu.listener.SwipeFractionListener; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/OmegaPagerRecyclerView.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/OmegaPagerRecyclerView.java index 0979bdd..cb3c8d8 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/OmegaPagerRecyclerView.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/OmegaPagerRecyclerView.java @@ -3,12 +3,12 @@ import android.content.Context; import android.content.res.TypedArray; import android.os.Handler; -import android.support.annotation.FloatRange; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.FloatRange; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.viewpager.widget.ViewPager; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.View; import android.view.animation.Interpolator; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java index 26cc28d..80323a9 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/ViewPagerLayoutManager.java @@ -7,14 +7,14 @@ import android.graphics.Rect; import android.os.Bundle; import android.os.Parcelable; -import android.support.annotation.FloatRange; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.accessibility.AccessibilityEventCompat; -import android.support.v4.view.accessibility.AccessibilityRecordCompat; -import android.support.v7.widget.LinearSmoothScroller; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.FloatRange; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.view.accessibility.AccessibilityEventCompat; +import androidx.core.view.accessibility.AccessibilityRecordCompat; +import androidx.recyclerview.widget.LinearSmoothScroller; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.util.SparseArray; import android.view.View; @@ -28,9 +28,9 @@ import com.omega_r.libs.omegarecyclerview.viewpager.orientation.VerticalHelper; import com.omega_r.libs.omegarecyclerview.viewpager.transform.ItemTransformer; -import static android.support.v7.widget.RecyclerView.HORIZONTAL; -import static android.support.v7.widget.RecyclerView.NO_POSITION; -import static android.support.v7.widget.RecyclerView.VERTICAL; +import static androidx.recyclerview.widget.RecyclerView.HORIZONTAL; +import static androidx.recyclerview.widget.RecyclerView.NO_POSITION; +import static androidx.recyclerview.widget.RecyclerView.VERTICAL; public class ViewPagerLayoutManager extends RecyclerView.LayoutManager { diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/Pivot.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/Pivot.java index e69f7e7..81c22d7 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/Pivot.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/Pivot.java @@ -1,6 +1,6 @@ package com.omega_r.libs.omegarecyclerview.viewpager.default_transformers; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import android.view.View; import java.lang.annotation.Retention; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ScaleTransformer.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ScaleTransformer.java index f7b7d62..dcb169a 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ScaleTransformer.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/default_transformers/ScaleTransformer.java @@ -1,6 +1,6 @@ package com.omega_r.libs.omegarecyclerview.viewpager.default_transformers; -import android.support.annotation.FloatRange; +import androidx.annotation.FloatRange; import android.view.View; import com.omega_r.libs.omegarecyclerview.viewpager.transform.ItemTransformer; diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/transform/ItemTransformerWrapper.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/transform/ItemTransformerWrapper.java index bb6b724..ad74bed 100644 --- a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/transform/ItemTransformerWrapper.java +++ b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/viewpager/transform/ItemTransformerWrapper.java @@ -1,6 +1,6 @@ package com.omega_r.libs.omegarecyclerview.viewpager.transform; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.view.View; public class ItemTransformerWrapper implements ItemTransformer { From cbe59af2ad5ee5baf1e5c2f4c5643348f28207a6 Mon Sep 17 00:00:00 2001 From: R12rus Date: Thu, 31 Jan 2019 17:15:51 +0300 Subject: [PATCH 02/80] 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 @@