diff --git a/app/build.gradle b/app/build.gradle index bed24d9..e1f496c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -94,13 +94,13 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" // Android Support - implementation 'androidx.appcompat:appcompat:1.0.0' - implementation 'com.google.android.material:material:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.0.0' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.vectordrawable:vectordrawable:1.0.0' - implementation 'androidx.browser:browser:1.0.0' - implementation 'androidx.cardview:cardview:1.0.0' + implementation "androidx.appcompat:appcompat:$android_version" + implementation "com.google.android.material:material:$android_version" + implementation "androidx.recyclerview:recyclerview:$android_version" + implementation "androidx.legacy:legacy-support-v4:$android_version" + implementation "androidx.vectordrawable:vectordrawable:$android_version" + implementation "androidx.browser:browser:$android_version" + implementation "androidx.cardview:cardview:$android_version" implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' //multidex @@ -110,7 +110,7 @@ dependencies { implementation 'agency.tango.android:material-intro-screen:0.0.5' // About - implementation('com.mikepenz:aboutlibraries:6.0.0@aar') { + implementation('com.mikepenz:aboutlibraries:6.2.0@aar') { transitive = true } @@ -121,8 +121,8 @@ dependencies { implementation 'com.burgstaller:okhttp-digest:1.12' // Material-ish things - implementation 'com.ashokvarma.android:bottom-navigation-bar:2.0.3' - implementation 'com.github.jd-alexander:LikeButton:0.2.1' + implementation 'com.ashokvarma.android:bottom-navigation-bar:2.0.5' + implementation 'com.github.jd-alexander:LikeButton:0.2.3' implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' // glide @@ -130,10 +130,10 @@ dependencies { implementation 'com.github.bumptech.glide:okhttp3-integration:4.1.1' // Asking politely users to rate the app - implementation 'com.github.stkent:amplify:2.1.0' + implementation 'com.github.stkent:amplify:2.2.0' // Drawer - implementation 'co.zsmb:materialdrawer-kt:1.3.7' + implementation 'co.zsmb:materialdrawer-kt:2.0.1' implementation 'com.anupcowkur:reservoir:3.1.0' // Themes @@ -142,7 +142,7 @@ dependencies { implementation 'com.github.rubensousa:floatingtoolbar:1.5.1' // Pager - implementation 'me.relex:circleindicator:1.2.2@aar' + implementation 'me.relex:circleindicator:2.0.0@aar' implementation 'androidx.core:core-ktx:1.0.0' diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt index fb8ec91..d05afe8 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt @@ -114,10 +114,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { private lateinit var appColors: AppColors private var offset: Int = 0 private var firstVisible: Int = 0 - private lateinit var recyclerViewScrollListener: androidx.recyclerview.widget.RecyclerView.OnScrollListener + private lateinit var recyclerViewScrollListener: RecyclerView.OnScrollListener private lateinit var settings: SharedPreferences - private var recyclerAdapter: androidx.recyclerview.widget.RecyclerView.Adapter<*>? = null + private var recyclerAdapter: RecyclerView.Adapter<*>? = null private var badgeNew: Int = -1 private var badgeAll: Int = -1 @@ -209,8 +209,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT ) { override fun getSwipeDirs( - recyclerView: androidx.recyclerview.widget.RecyclerView, - viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder + recyclerView: RecyclerView, + viewHolder: RecyclerView.ViewHolder ): Int = if (elementsShown != UNREAD_SHOWN) { 0 @@ -222,12 +222,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { } override fun onMove( - recyclerView: androidx.recyclerview.widget.RecyclerView, - viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder, - target: androidx.recyclerview.widget.RecyclerView.ViewHolder + recyclerView: RecyclerView, + viewHolder: RecyclerView.ViewHolder, + target: RecyclerView.ViewHolder ): Boolean = false - override fun onSwiped(viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder, swipeDir: Int) { + override fun onSwiped(viewHolder: RecyclerView.ViewHolder, swipeDir: Int) { val position = viewHolder.adapterPosition val i = items.elementAtOrNull(position) @@ -729,43 +729,43 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { private fun reloadLayoutManager() { val currentManager = recyclerView.layoutManager - val layoutManager: androidx.recyclerview.widget.RecyclerView.LayoutManager + val layoutManager: RecyclerView.LayoutManager // This will only update the layout manager if settings changed when (currentManager) { - is androidx.recyclerview.widget.StaggeredGridLayoutManager -> + is StaggeredGridLayoutManager -> if (!shouldBeCardView) { - layoutManager = androidx.recyclerview.widget.GridLayoutManager( + layoutManager = GridLayoutManager( this, calculateNoOfColumns() ) recyclerView.layoutManager = layoutManager } - is androidx.recyclerview.widget.GridLayoutManager -> + is GridLayoutManager -> if (shouldBeCardView) { - layoutManager = androidx.recyclerview.widget.StaggeredGridLayoutManager( + layoutManager = StaggeredGridLayoutManager( calculateNoOfColumns(), - androidx.recyclerview.widget.StaggeredGridLayoutManager.VERTICAL + StaggeredGridLayoutManager.VERTICAL ) layoutManager.gapStrategy = - androidx.recyclerview.widget.StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS + StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS recyclerView.layoutManager = layoutManager } else -> if (currentManager == null) { if (!shouldBeCardView) { - layoutManager = androidx.recyclerview.widget.GridLayoutManager( + layoutManager = GridLayoutManager( this, calculateNoOfColumns() ) recyclerView.layoutManager = layoutManager } else { - layoutManager = androidx.recyclerview.widget.StaggeredGridLayoutManager( + layoutManager = StaggeredGridLayoutManager( calculateNoOfColumns(), - androidx.recyclerview.widget.StaggeredGridLayoutManager.VERTICAL + StaggeredGridLayoutManager.VERTICAL ) layoutManager.gapStrategy = - androidx.recyclerview.widget.StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS + StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS recyclerView.layoutManager = layoutManager } } else { @@ -781,13 +781,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { val layoutManager = recyclerView.adapter when (layoutManager) { - is androidx.recyclerview.widget.StaggeredGridLayoutManager -> + is StaggeredGridLayoutManager -> if (layoutManager.findFirstCompletelyVisibleItemPositions(null)[0] == 0) { getElementsAccordingToTab() } else { layoutManager.scrollToPositionWithOffset(0, 0) } - is androidx.recyclerview.widget.GridLayoutManager -> + is GridLayoutManager -> if (layoutManager.findFirstCompletelyVisibleItemPosition() == 0) { getElementsAccordingToTab() } else { @@ -811,15 +811,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { } private fun handleInfiniteScroll() { - recyclerViewScrollListener = object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() { - override fun onScrolled(localRecycler: androidx.recyclerview.widget.RecyclerView, dx: Int, dy: Int) { + recyclerViewScrollListener = object : RecyclerView.OnScrollListener() { + override fun onScrolled(localRecycler: RecyclerView, dx: Int, dy: Int) { if (localRecycler != null && dy > 0) { val manager = recyclerView.layoutManager val lastVisibleItem: Int = when (manager) { - is androidx.recyclerview.widget.StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions( + is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions( null ).last() - is androidx.recyclerview.widget.GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition() + is GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition() else -> 0 } @@ -970,9 +970,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { if (appendResults) { val oldManager = recyclerView.layoutManager firstVisible = when (oldManager) { - is androidx.recyclerview.widget.StaggeredGridLayoutManager -> + is StaggeredGridLayoutManager -> oldManager.findFirstCompletelyVisibleItemPositions(null).last() - is androidx.recyclerview.widget.GridLayoutManager -> + is GridLayoutManager -> oldManager.findFirstCompletelyVisibleItemPosition() else -> 0 } @@ -1013,9 +1013,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { } recyclerView.addItemDecoration( - androidx.recyclerview.widget.DividerItemDecoration( + DividerItemDecoration( this@HomeActivity, - androidx.recyclerview.widget.DividerItemDecoration.VERTICAL + DividerItemDecoration.VERTICAL ) ) } diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt index 4396c28..39a7a5e 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt @@ -104,7 +104,7 @@ class ReaderActivity : AppCompatActivity() { (indicator as CircleIndicator).setViewPager(pager) pager.addOnPageChangeListener( - object : androidx.viewpager.widget.ViewPager.SimpleOnPageChangeListener() { + object : ViewPager.SimpleOnPageChangeListener() { override fun onPageSelected(position: Int) { @@ -170,8 +170,8 @@ class ReaderActivity : AppCompatActivity() { oldInstanceState!!.clear() } - private inner class ScreenSlidePagerAdapter(fm: androidx.fragment.app.FragmentManager, val appColors: AppColors) : - androidx.fragment.app.FragmentStatePagerAdapter(fm) { + private inner class ScreenSlidePagerAdapter(fm: FragmentManager, val appColors: AppColors) : + FragmentStatePagerAdapter(fm) { override fun getCount(): Int { diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt index 83e04ec..b454155 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt @@ -51,7 +51,7 @@ class SourcesActivity : AppCompatActivity() { override fun onResume() { super.onResume() - val mLayoutManager = androidx.recyclerview.widget.LinearLayoutManager(this) + val mLayoutManager = LinearLayoutManager(this) val prefs = PreferenceManager.getDefaultSharedPreferences(this) diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt index f605f43..ed2d0a0 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt @@ -53,7 +53,7 @@ class ItemCardAdapter( c.resources.getDimension(R.dimen.card_image_max_height).toInt() override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { - val v = LayoutInflater.from(c).inflate(R.layout.card_item, parent, false) as androidx.cardview.widget.CardView + val v = LayoutInflater.from(c).inflate(R.layout.card_item, parent, false) as CardView return ViewHolder(v) } @@ -102,7 +102,7 @@ class ItemCardAdapter( return items.size } - inner class ViewHolder(val mView: androidx.cardview.widget.CardView) : androidx.recyclerview.widget.RecyclerView.ViewHolder(mView) { + inner class ViewHolder(val mView: CardView) : RecyclerView.ViewHolder(mView) { init { mView.setCardBackgroundColor(appColors.cardBackgroundColor) handleClickListeners() diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt index 6811de9..3673ad1 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt @@ -123,7 +123,7 @@ class ItemListAdapter( override fun getItemCount(): Int = items.size - inner class ViewHolder(val mView: ConstraintLayout) : androidx.recyclerview.widget.RecyclerView.ViewHolder(mView) { + inner class ViewHolder(val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) { init { handleClickListeners() diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt index f7d838f..b428e60 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt @@ -18,7 +18,7 @@ import retrofit2.Call import retrofit2.Callback import retrofit2.Response -abstract class ItemsAdapter : androidx.recyclerview.widget.RecyclerView.Adapter() { +abstract class ItemsAdapter : RecyclerView.Adapter() { abstract var items: ArrayList abstract val api: SelfossApi abstract val debugReadingItems: Boolean diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt index 5e38c5f..13d14ed 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt @@ -25,7 +25,7 @@ class SourcesListAdapter( private val app: Activity, private val items: ArrayList, private val api: SelfossApi -) : androidx.recyclerview.widget.RecyclerView.Adapter() { +) : RecyclerView.Adapter() { private val c: Context = app.baseContext private val generator: ColorGenerator = ColorGenerator.MATERIAL @@ -59,7 +59,7 @@ class SourcesListAdapter( override fun getItemCount(): Int = items.size - inner class ViewHolder(internal val mView: ConstraintLayout) : androidx.recyclerview.widget.RecyclerView.ViewHolder(mView) { + inner class ViewHolder(internal val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) { init { handleClickListeners() diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt index ec4aa9c..e6fff57 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt @@ -45,7 +45,7 @@ import retrofit2.Response import java.net.MalformedURLException import java.net.URL -class ArticleFragment : androidx.fragment.app.Fragment() { +class ArticleFragment : Fragment() { private lateinit var pageNumber: Number private var fontSize: Int = 14 private lateinit var allItems: ArrayList diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/transformers/DepthPageTransformer.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/transformers/DepthPageTransformer.kt index 877ba32..e5da460 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/transformers/DepthPageTransformer.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/transformers/DepthPageTransformer.kt @@ -3,7 +3,7 @@ package apps.amine.bou.readerforselfoss.transformers import androidx.viewpager.widget.ViewPager import android.view.View -class DepthPageTransformer : androidx.viewpager.widget.ViewPager.PageTransformer { +class DepthPageTransformer : ViewPager.PageTransformer { override fun transformPage(view: View, position: Float) { val pageWidth = view.width diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ScrollAwareFABBehavior.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ScrollAwareFABBehavior.kt deleted file mode 100644 index 63a3866..0000000 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ScrollAwareFABBehavior.kt +++ /dev/null @@ -1,54 +0,0 @@ -package apps.amine.bou.readerforselfoss.utils - -import android.content.Context -import androidx.coordinatorlayout.widget.CoordinatorLayout -import com.google.android.material.floatingactionbutton.FloatingActionButton -import android.util.AttributeSet -import android.view.View - -class ScrollAwareFABBehavior( - context: Context, - attrs: AttributeSet -) : androidx.coordinatorlayout.widget.CoordinatorLayout.Behavior() { - - - override fun onStartNestedScroll( - coordinatorLayout: androidx.coordinatorlayout.widget.CoordinatorLayout, - child: FloatingActionButton, - directTargetChild: View, - target: View, - nestedScrollAxes: Int - ): Boolean { - return true - } - - override fun onNestedScroll( - coordinatorLayout: androidx.coordinatorlayout.widget.CoordinatorLayout, - child: FloatingActionButton, - target: View, - dxConsumed: Int, - dyConsumed: Int, - dxUnconsumed: Int, - dyUnconsumed: Int - ) { - super.onNestedScroll( - coordinatorLayout, - child, - target, - dxConsumed, - dyConsumed, - dxUnconsumed, - dyUnconsumed - ) - if (dyConsumed > 0 && child.visibility == View.VISIBLE) { - child.hide(object : FloatingActionButton.OnVisibilityChangedListener() { - override fun onHidden(fab: FloatingActionButton?) { - super.onHidden(fab) - fab!!.visibility = View.INVISIBLE - } - }) - } else if (dyConsumed < 0 && child.visibility != View.VISIBLE) { - child.show() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomBaseViewHolder.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomBaseViewHolder.kt index a524c20..5c6506a 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomBaseViewHolder.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomBaseViewHolder.kt @@ -8,7 +8,7 @@ import android.widget.TextView import apps.amine.bou.readerforselfoss.R -open class CustomBaseViewHolder(var view: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(view) { +open class CustomBaseViewHolder(var view: View) : RecyclerView.ViewHolder(view) { var icon: ImageView = view.findViewById(R.id.material_drawer_icon) var name: TextView = view.findViewById(R.id.material_drawer_name) var description: TextView = view.findViewById(R.id.material_drawer_description) diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlBasePrimaryDrawerItem.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlBasePrimaryDrawerItem.kt index bdfb706..f8b74c8 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlBasePrimaryDrawerItem.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlBasePrimaryDrawerItem.kt @@ -15,7 +15,7 @@ import com.mikepenz.materialdrawer.util.DrawerImageLoader import com.mikepenz.materialdrawer.util.DrawerUIUtils import com.mikepenz.materialize.util.UIUtils -abstract class CustomUrlBasePrimaryDrawerItem : +abstract class CustomUrlBasePrimaryDrawerItem : BaseDrawerItem() { fun withIcon(url: String): T { this.icon = ImageHolder(url) diff --git a/build.gradle b/build.gradle index 96ea7c5..eabae3a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { kotlin_version = '1.2.51' - android_version = '28.0.0' + android_version = '1.0.0' } repositories { jcenter()