From 06b88c783da3590c7752d0c672550facde688eb5 Mon Sep 17 00:00:00 2001 From: Amine Date: Fri, 12 Oct 2018 20:36:18 +0200 Subject: [PATCH] Auto migration to android x. --- app/build.gradle | 32 ++++---- .../HomeActivityEspressoTest.kt | 42 +++++----- .../IntroActivityEspressoTest.kt | 26 +++--- .../LoginActivityEspressoTest.kt | 38 ++++----- .../MainActivityEspressoTest.kt | 14 ++-- .../apps/amine/bou/readerforselfoss/Utils.kt | 4 +- .../bou/readerforselfoss/AddSourceActivity.kt | 4 +- .../bou/readerforselfoss/HomeActivity.kt | 82 ++++++++++--------- .../bou/readerforselfoss/IntroActivity.kt | 2 +- .../bou/readerforselfoss/LoginActivity.kt | 4 +- .../bou/readerforselfoss/MainActivity.kt | 2 +- .../apps/amine/bou/readerforselfoss/MyApp.kt | 2 +- .../bou/readerforselfoss/ReaderActivity.kt | 16 ++-- .../bou/readerforselfoss/SourcesActivity.kt | 6 +- .../adapters/ItemCardAdapter.kt | 8 +- .../adapters/ItemListAdapter.kt | 6 +- .../readerforselfoss/adapters/ItemsAdapter.kt | 8 +- .../adapters/SourcesListAdapter.kt | 8 +- .../fragments/ArticleFragment.kt | 12 +-- .../settings/AppCompatPreferenceActivity.java | 14 ++-- .../settings/SettingsActivity.java | 3 +- .../bou/readerforselfoss/themes/AppColors.kt | 4 +- .../transformers/DepthPageTransformer.kt | 4 +- .../bou/readerforselfoss/utils/LinksUtils.kt | 2 +- .../utils/ScrollAwareFABBehavior.kt | 10 +-- .../customtabs/CustomTabActivityHelper.java | 8 +- .../utils/customtabs/CustomTabsHelper.java | 2 +- .../utils/customtabs/ServiceConnection.java | 4 +- .../customtabs/ServiceConnectionCallback.java | 2 +- .../utils/drawer/CustomBaseViewHolder.kt | 4 +- .../drawer/CustomUrlBasePrimaryDrawerItem.kt | 10 +-- .../drawer/CustomUrlPrimaryDrawerItem.kt | 4 +- .../utils/glide/GlideUtils.kt | 2 +- .../main/res/layout/activity_add_source.xml | 10 +-- app/src/main/res/layout/activity_home.xml | 20 ++--- app/src/main/res/layout/activity_login.xml | 26 +++--- app/src/main/res/layout/activity_main.xml | 4 +- app/src/main/res/layout/activity_reader.xml | 12 +-- app/src/main/res/layout/activity_sources.xml | 16 ++-- app/src/main/res/layout/card_item.xml | 12 +-- app/src/main/res/layout/fragment_article.xml | 14 ++-- app/src/main/res/layout/list_item.xml | 4 +- app/src/main/res/layout/settings_toolbar.xml | 6 +- app/src/main/res/layout/source_list_item.xml | 4 +- app/src/main/res/menu/home_menu.xml | 2 +- build.gradle | 2 +- gradle.properties | 4 +- 47 files changed, 266 insertions(+), 259 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9a335b7..bed24d9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,7 +36,7 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } compileSdkVersion 28 - buildToolsVersion '28.0.2' + buildToolsVersion '28.0.3' defaultConfig { applicationId "apps.amine.bou.readerforselfoss" minSdkVersion 16 @@ -53,7 +53,7 @@ android { vectorDrawables.useSupportLibrary = true // tests - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -85,26 +85,26 @@ android { dependencies { // Testing - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' - androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-beta02' + androidTestImplementation 'androidx.test:runner:1.1.0-beta02' // Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource - androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.1' + androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0-beta02' // Espresso-intents for validation and stubbing of Intents - androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.1' + androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0-beta02' implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" // Android Support - implementation "com.android.support:appcompat-v7:$android_version" - implementation "com.android.support:design:$android_version" - implementation "com.android.support:recyclerview-v7:$android_version" - implementation "com.android.support:support-v4:$android_version" - implementation "com.android.support:support-vector-drawable:$android_version" - implementation "com.android.support:customtabs:$android_version" - implementation "com.android.support:cardview-v7:$android_version" - implementation 'com.android.support.constraint:constraint-layout:1.1.0' + 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.constraintlayout:constraintlayout:2.0.0-alpha2' //multidex - implementation 'com.android.support:multidex:1.0.3' + implementation 'androidx.multidex:multidex:2.0.0' // Intro implementation 'agency.tango.android:material-intro-screen:0.0.5' @@ -144,7 +144,7 @@ dependencies { // Pager implementation 'me.relex:circleindicator:1.2.2@aar' - implementation 'androidx.core:core-ktx:0.3' + implementation 'androidx.core:core-ktx:1.0.0' // Crash implementation 'ch.acra:acra-http:5.1.3' diff --git a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/HomeActivityEspressoTest.kt b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/HomeActivityEspressoTest.kt index 5f692f1..cd521c2 100644 --- a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/HomeActivityEspressoTest.kt +++ b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/HomeActivityEspressoTest.kt @@ -2,27 +2,27 @@ package apps.amine.bou.readerforselfoss import android.content.Context import android.content.Intent -import android.support.test.InstrumentationRegistry -import android.support.test.espresso.Espresso.onView -import android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu -import android.support.test.espresso.action.ViewActions.click -import android.support.test.espresso.action.ViewActions.closeSoftKeyboard -import android.support.test.espresso.action.ViewActions.pressBack -import android.support.test.espresso.action.ViewActions.pressKey -import android.support.test.espresso.action.ViewActions.typeText -import android.support.test.espresso.assertion.ViewAssertions.matches -import android.support.test.espresso.contrib.DrawerActions -import android.support.test.espresso.intent.Intents -import android.support.test.espresso.intent.Intents.intended -import android.support.test.espresso.intent.Intents.times -import android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent -import android.support.test.espresso.matcher.ViewMatchers.isDisplayed -import android.support.test.espresso.matcher.ViewMatchers.isRoot -import android.support.test.espresso.matcher.ViewMatchers.withContentDescription -import android.support.test.espresso.matcher.ViewMatchers.withId -import android.support.test.espresso.matcher.ViewMatchers.withText -import android.support.test.rule.ActivityTestRule -import android.support.test.runner.AndroidJUnit4 +import androidx.test.InstrumentationRegistry +import androidx.test.espresso.Espresso.onView +import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu +import androidx.test.espresso.action.ViewActions.click +import androidx.test.espresso.action.ViewActions.closeSoftKeyboard +import androidx.test.espresso.action.ViewActions.pressBack +import androidx.test.espresso.action.ViewActions.pressKey +import androidx.test.espresso.action.ViewActions.typeText +import androidx.test.espresso.assertion.ViewAssertions.matches +import androidx.test.espresso.contrib.DrawerActions +import androidx.test.espresso.intent.Intents +import androidx.test.espresso.intent.Intents.intended +import androidx.test.espresso.intent.Intents.times +import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent +import androidx.test.espresso.matcher.ViewMatchers.isDisplayed +import androidx.test.espresso.matcher.ViewMatchers.isRoot +import androidx.test.espresso.matcher.ViewMatchers.withContentDescription +import androidx.test.espresso.matcher.ViewMatchers.withId +import androidx.test.espresso.matcher.ViewMatchers.withText +import androidx.test.rule.ActivityTestRule +import androidx.test.runner.AndroidJUnit4 import android.view.KeyEvent import apps.amine.bou.readerforselfoss.utils.Config import org.junit.After diff --git a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/IntroActivityEspressoTest.kt b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/IntroActivityEspressoTest.kt index 7fbe62d..9455253 100644 --- a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/IntroActivityEspressoTest.kt +++ b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/IntroActivityEspressoTest.kt @@ -2,19 +2,19 @@ package apps.amine.bou.readerforselfoss import android.content.Context import android.content.Intent -import android.support.test.InstrumentationRegistry.getInstrumentation -import android.support.test.espresso.Espresso.onView -import android.support.test.espresso.action.ViewActions.click -import android.support.test.espresso.assertion.ViewAssertions.matches -import android.support.test.espresso.intent.Intents -import android.support.test.espresso.intent.Intents.intended -import android.support.test.espresso.intent.Intents.times -import android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent -import android.support.test.espresso.matcher.ViewMatchers.isDisplayed -import android.support.test.espresso.matcher.ViewMatchers.withId -import android.support.test.espresso.matcher.ViewMatchers.withText -import android.support.test.rule.ActivityTestRule -import android.support.test.runner.AndroidJUnit4 +import androidx.test.InstrumentationRegistry.getInstrumentation +import androidx.test.espresso.Espresso.onView +import androidx.test.espresso.action.ViewActions.click +import androidx.test.espresso.assertion.ViewAssertions.matches +import androidx.test.espresso.intent.Intents +import androidx.test.espresso.intent.Intents.intended +import androidx.test.espresso.intent.Intents.times +import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent +import androidx.test.espresso.matcher.ViewMatchers.isDisplayed +import androidx.test.espresso.matcher.ViewMatchers.withId +import androidx.test.espresso.matcher.ViewMatchers.withText +import androidx.test.rule.ActivityTestRule +import androidx.test.runner.AndroidJUnit4 import apps.amine.bou.readerforselfoss.utils.Config import org.junit.After import org.junit.Before diff --git a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/LoginActivityEspressoTest.kt b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/LoginActivityEspressoTest.kt index 68e4243..1bcdd4c 100644 --- a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/LoginActivityEspressoTest.kt +++ b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/LoginActivityEspressoTest.kt @@ -2,25 +2,25 @@ package apps.amine.bou.readerforselfoss import android.content.Context import android.content.Intent -import android.support.test.InstrumentationRegistry -import android.support.test.espresso.Espresso.onView -import android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu -import android.support.test.espresso.action.ViewActions.click -import android.support.test.espresso.action.ViewActions.closeSoftKeyboard -import android.support.test.espresso.action.ViewActions.pressBack -import android.support.test.espresso.action.ViewActions.typeText -import android.support.test.espresso.assertion.ViewAssertions.matches -import android.support.test.espresso.intent.Intents -import android.support.test.espresso.intent.Intents.intended -import android.support.test.espresso.intent.Intents.times -import android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent -import android.support.test.espresso.matcher.ViewMatchers -import android.support.test.espresso.matcher.ViewMatchers.isRoot -import android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility -import android.support.test.espresso.matcher.ViewMatchers.withId -import android.support.test.espresso.matcher.ViewMatchers.withText -import android.support.test.rule.ActivityTestRule -import android.support.test.runner.AndroidJUnit4 +import androidx.test.InstrumentationRegistry +import androidx.test.espresso.Espresso.onView +import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu +import androidx.test.espresso.action.ViewActions.click +import androidx.test.espresso.action.ViewActions.closeSoftKeyboard +import androidx.test.espresso.action.ViewActions.pressBack +import androidx.test.espresso.action.ViewActions.typeText +import androidx.test.espresso.assertion.ViewAssertions.matches +import androidx.test.espresso.intent.Intents +import androidx.test.espresso.intent.Intents.intended +import androidx.test.espresso.intent.Intents.times +import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent +import androidx.test.espresso.matcher.ViewMatchers +import androidx.test.espresso.matcher.ViewMatchers.isRoot +import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility +import androidx.test.espresso.matcher.ViewMatchers.withId +import androidx.test.espresso.matcher.ViewMatchers.withText +import androidx.test.rule.ActivityTestRule +import androidx.test.runner.AndroidJUnit4 import apps.amine.bou.readerforselfoss.utils.Config import com.mikepenz.aboutlibraries.ui.LibsActivity import org.junit.After diff --git a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/MainActivityEspressoTest.kt b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/MainActivityEspressoTest.kt index df91d30..c5bc6ba 100644 --- a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/MainActivityEspressoTest.kt +++ b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/MainActivityEspressoTest.kt @@ -3,13 +3,13 @@ package apps.amine.bou.readerforselfoss import android.content.Intent import android.content.SharedPreferences import android.preference.PreferenceManager -import android.support.test.InstrumentationRegistry.getInstrumentation -import android.support.test.espresso.intent.Intents -import android.support.test.espresso.intent.Intents.intended -import android.support.test.espresso.intent.Intents.times -import android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent -import android.support.test.rule.ActivityTestRule -import android.support.test.runner.AndroidJUnit4 +import androidx.test.InstrumentationRegistry.getInstrumentation +import androidx.test.espresso.intent.Intents +import androidx.test.espresso.intent.Intents.intended +import androidx.test.espresso.intent.Intents.times +import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent +import androidx.test.rule.ActivityTestRule +import androidx.test.runner.AndroidJUnit4 import org.junit.After import org.junit.Before diff --git a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/Utils.kt b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/Utils.kt index 8489fed..0c30d74 100644 --- a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/Utils.kt +++ b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/Utils.kt @@ -1,7 +1,7 @@ package apps.amine.bou.readerforselfoss -import android.support.design.widget.TextInputLayout -import android.support.test.espresso.matcher.ViewMatchers +import com.google.android.material.textfield.TextInputLayout +import androidx.test.espresso.matcher.ViewMatchers import android.view.View import org.hamcrest.Description import org.hamcrest.Matcher diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt index eb321c3..8c2758d 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt @@ -4,8 +4,8 @@ import android.content.Intent import android.os.Build import android.os.Bundle import android.preference.PreferenceManager -import android.support.constraint.ConstraintLayout -import android.support.v7.app.AppCompatActivity +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.appcompat.app.AppCompatActivity import android.view.View import android.widget.AdapterView import android.widget.ArrayAdapter 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 271816b..fb8ec91 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt @@ -9,15 +9,15 @@ import android.net.Uri import android.os.Build import android.os.Bundle import android.preference.PreferenceManager -import android.support.v4.view.MenuItemCompat -import android.support.v7.app.AlertDialog -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.DividerItemDecoration -import android.support.v7.widget.GridLayoutManager -import android.support.v7.widget.RecyclerView -import android.support.v7.widget.SearchView -import android.support.v7.widget.StaggeredGridLayoutManager -import android.support.v7.widget.helper.ItemTouchHelper +import androidx.core.view.MenuItemCompat +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.DividerItemDecoration +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.RecyclerView +import androidx.appcompat.widget.SearchView +import androidx.recyclerview.widget.StaggeredGridLayoutManager +import androidx.recyclerview.widget.ItemTouchHelper import android.util.Log import android.view.Menu import android.view.MenuItem @@ -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: RecyclerView.OnScrollListener + private lateinit var recyclerViewScrollListener: androidx.recyclerview.widget.RecyclerView.OnScrollListener private lateinit var settings: SharedPreferences - private var recyclerAdapter: RecyclerView.Adapter<*>? = null + private var recyclerAdapter: androidx.recyclerview.widget.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: RecyclerView, - viewHolder: RecyclerView.ViewHolder + recyclerView: androidx.recyclerview.widget.RecyclerView, + viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder ): Int = if (elementsShown != UNREAD_SHOWN) { 0 @@ -222,12 +222,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { } override fun onMove( - recyclerView: RecyclerView, - viewHolder: RecyclerView.ViewHolder, - target: RecyclerView.ViewHolder + recyclerView: androidx.recyclerview.widget.RecyclerView, + viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder, + target: androidx.recyclerview.widget.RecyclerView.ViewHolder ): Boolean = false - override fun onSwiped(viewHolder: RecyclerView.ViewHolder, swipeDir: Int) { + override fun onSwiped(viewHolder: androidx.recyclerview.widget.RecyclerView.ViewHolder, swipeDir: Int) { val position = viewHolder.adapterPosition val i = items.elementAtOrNull(position) @@ -729,37 +729,43 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { private fun reloadLayoutManager() { val currentManager = recyclerView.layoutManager - val layoutManager: RecyclerView.LayoutManager + val layoutManager: androidx.recyclerview.widget.RecyclerView.LayoutManager // This will only update the layout manager if settings changed when (currentManager) { - is StaggeredGridLayoutManager -> + is androidx.recyclerview.widget.StaggeredGridLayoutManager -> if (!shouldBeCardView) { - layoutManager = GridLayoutManager(this, calculateNoOfColumns()) + layoutManager = androidx.recyclerview.widget.GridLayoutManager( + this, + calculateNoOfColumns() + ) recyclerView.layoutManager = layoutManager } - is GridLayoutManager -> + is androidx.recyclerview.widget.GridLayoutManager -> if (shouldBeCardView) { - layoutManager = StaggeredGridLayoutManager( + layoutManager = androidx.recyclerview.widget.StaggeredGridLayoutManager( calculateNoOfColumns(), - StaggeredGridLayoutManager.VERTICAL + androidx.recyclerview.widget.StaggeredGridLayoutManager.VERTICAL ) layoutManager.gapStrategy = - StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS + androidx.recyclerview.widget.StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS recyclerView.layoutManager = layoutManager } else -> if (currentManager == null) { if (!shouldBeCardView) { - layoutManager = GridLayoutManager(this, calculateNoOfColumns()) + layoutManager = androidx.recyclerview.widget.GridLayoutManager( + this, + calculateNoOfColumns() + ) recyclerView.layoutManager = layoutManager } else { - layoutManager = StaggeredGridLayoutManager( + layoutManager = androidx.recyclerview.widget.StaggeredGridLayoutManager( calculateNoOfColumns(), - StaggeredGridLayoutManager.VERTICAL + androidx.recyclerview.widget.StaggeredGridLayoutManager.VERTICAL ) layoutManager.gapStrategy = - StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS + androidx.recyclerview.widget.StaggeredGridLayoutManager.GAP_HANDLING_MOVE_ITEMS_BETWEEN_SPANS recyclerView.layoutManager = layoutManager } } else { @@ -775,13 +781,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { val layoutManager = recyclerView.adapter when (layoutManager) { - is StaggeredGridLayoutManager -> + is androidx.recyclerview.widget.StaggeredGridLayoutManager -> if (layoutManager.findFirstCompletelyVisibleItemPositions(null)[0] == 0) { getElementsAccordingToTab() } else { layoutManager.scrollToPositionWithOffset(0, 0) } - is GridLayoutManager -> + is androidx.recyclerview.widget.GridLayoutManager -> if (layoutManager.findFirstCompletelyVisibleItemPosition() == 0) { getElementsAccordingToTab() } else { @@ -805,15 +811,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { } private fun handleInfiniteScroll() { - recyclerViewScrollListener = object : RecyclerView.OnScrollListener() { - override fun onScrolled(localRecycler: RecyclerView, dx: Int, dy: Int) { + recyclerViewScrollListener = object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() { + override fun onScrolled(localRecycler: androidx.recyclerview.widget.RecyclerView, dx: Int, dy: Int) { if (localRecycler != null && dy > 0) { val manager = recyclerView.layoutManager val lastVisibleItem: Int = when (manager) { - is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions( + is androidx.recyclerview.widget.StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions( null ).last() - is GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition() + is androidx.recyclerview.widget.GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition() else -> 0 } @@ -964,9 +970,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { if (appendResults) { val oldManager = recyclerView.layoutManager firstVisible = when (oldManager) { - is StaggeredGridLayoutManager -> + is androidx.recyclerview.widget.StaggeredGridLayoutManager -> oldManager.findFirstCompletelyVisibleItemPositions(null).last() - is GridLayoutManager -> + is androidx.recyclerview.widget.GridLayoutManager -> oldManager.findFirstCompletelyVisibleItemPosition() else -> 0 } @@ -1007,9 +1013,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { } recyclerView.addItemDecoration( - DividerItemDecoration( + androidx.recyclerview.widget.DividerItemDecoration( this@HomeActivity, - DividerItemDecoration.VERTICAL + androidx.recyclerview.widget.DividerItemDecoration.VERTICAL ) ) } diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt index 676d0dd..3ce0e9b 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt @@ -7,7 +7,7 @@ import android.content.Intent import android.net.Uri import android.os.Bundle import android.preference.PreferenceManager -import android.support.v7.app.AppCompatDelegate +import androidx.appcompat.app.AppCompatDelegate import android.view.View class IntroActivity : MaterialIntroActivity() { diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt index 5182df3..76693de 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt @@ -6,8 +6,8 @@ import android.content.Context import android.content.Intent import android.content.SharedPreferences import android.os.Bundle -import android.support.v7.app.AlertDialog -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity import android.text.TextUtils import android.view.Menu import android.view.MenuItem diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/MainActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/MainActivity.kt index 263da6b..112747f 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/MainActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/MainActivity.kt @@ -3,7 +3,7 @@ package apps.amine.bou.readerforselfoss import android.content.Intent import android.os.Bundle import android.preference.PreferenceManager -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity class MainActivity : AppCompatActivity() { diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt index c5ddfb7..c567395 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt @@ -5,7 +5,7 @@ import android.content.SharedPreferences import android.graphics.drawable.Drawable import android.net.Uri import android.preference.PreferenceManager -import android.support.multidex.MultiDexApplication +import androidx.multidex.MultiDexApplication import android.widget.ImageView import apps.amine.bou.readerforselfoss.utils.Config import com.anupcowkur.reservoir.Reservoir 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 3efa2a0..4396c28 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt @@ -4,11 +4,11 @@ import android.graphics.drawable.ColorDrawable import android.os.Build import android.os.Bundle import android.preference.PreferenceManager -import android.support.v4.app.FragmentManager -import android.support.v4.app.FragmentStatePagerAdapter -import android.support.v4.content.ContextCompat -import android.support.v4.view.ViewPager -import android.support.v7.app.AppCompatActivity +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentStatePagerAdapter +import androidx.core.content.ContextCompat +import androidx.viewpager.widget.ViewPager +import androidx.appcompat.app.AppCompatActivity import android.view.Menu import android.view.MenuItem import android.view.ViewGroup @@ -104,7 +104,7 @@ class ReaderActivity : AppCompatActivity() { (indicator as CircleIndicator).setViewPager(pager) pager.addOnPageChangeListener( - object : ViewPager.SimpleOnPageChangeListener() { + object : androidx.viewpager.widget.ViewPager.SimpleOnPageChangeListener() { override fun onPageSelected(position: Int) { @@ -170,8 +170,8 @@ class ReaderActivity : AppCompatActivity() { oldInstanceState!!.clear() } - private inner class ScreenSlidePagerAdapter(fm: FragmentManager, val appColors: AppColors) : - FragmentStatePagerAdapter(fm) { + private inner class ScreenSlidePagerAdapter(fm: androidx.fragment.app.FragmentManager, val appColors: AppColors) : + androidx.fragment.app.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 3c96dc7..83e04ec 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt @@ -5,8 +5,8 @@ import android.content.res.ColorStateList import android.os.Build import android.os.Bundle import android.preference.PreferenceManager -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.LinearLayoutManager +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.LinearLayoutManager import android.widget.Toast import apps.amine.bou.readerforselfoss.adapters.SourcesListAdapter import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi @@ -51,7 +51,7 @@ class SourcesActivity : AppCompatActivity() { override fun onResume() { super.onResume() - val mLayoutManager = LinearLayoutManager(this) + val mLayoutManager = androidx.recyclerview.widget.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 c4a6f76..f605f43 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 @@ -2,8 +2,8 @@ package apps.amine.bou.readerforselfoss.adapters import android.app.Activity import android.content.Context -import android.support.v7.widget.CardView -import android.support.v7.widget.RecyclerView +import androidx.cardview.widget.CardView +import androidx.recyclerview.widget.RecyclerView import android.text.Html import android.view.LayoutInflater import android.view.View @@ -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 CardView + val v = LayoutInflater.from(c).inflate(R.layout.card_item, parent, false) as androidx.cardview.widget.CardView return ViewHolder(v) } @@ -102,7 +102,7 @@ class ItemCardAdapter( return items.size } - inner class ViewHolder(val mView: CardView) : RecyclerView.ViewHolder(mView) { + inner class ViewHolder(val mView: androidx.cardview.widget.CardView) : androidx.recyclerview.widget.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 42ebc6f..6811de9 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 @@ -2,8 +2,8 @@ package apps.amine.bou.readerforselfoss.adapters import android.app.Activity import android.content.Context -import android.support.constraint.ConstraintLayout -import android.support.v7.widget.RecyclerView +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.recyclerview.widget.RecyclerView import android.text.Html import android.util.TypedValue import android.view.LayoutInflater @@ -123,7 +123,7 @@ class ItemListAdapter( override fun getItemCount(): Int = items.size - inner class ViewHolder(val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) { + inner class ViewHolder(val mView: ConstraintLayout) : androidx.recyclerview.widget.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 6b69283..f7d838f 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 @@ -2,8 +2,8 @@ package apps.amine.bou.readerforselfoss.adapters import android.app.Activity import android.graphics.Color -import android.support.design.widget.Snackbar -import android.support.v7.widget.RecyclerView +import com.google.android.material.snackbar.Snackbar +import androidx.recyclerview.widget.RecyclerView import android.widget.TextView import android.widget.Toast import apps.amine.bou.readerforselfoss.R @@ -18,7 +18,7 @@ import retrofit2.Call import retrofit2.Callback import retrofit2.Response -abstract class ItemsAdapter : RecyclerView.Adapter() { +abstract class ItemsAdapter : androidx.recyclerview.widget.RecyclerView.Adapter() { abstract var items: ArrayList abstract val api: SelfossApi abstract val debugReadingItems: Boolean @@ -62,7 +62,7 @@ abstract class ItemsAdapter : RecyclerView.Adapte } val view = s.view - val tv: TextView = view.findViewById(android.support.design.R.id.snackbar_text) + val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text) tv.setTextColor(Color.WHITE) s.show() } 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 957384c..5e38c5f 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 @@ -2,8 +2,8 @@ package apps.amine.bou.readerforselfoss.adapters import android.app.Activity import android.content.Context -import android.support.constraint.ConstraintLayout -import android.support.v7.widget.RecyclerView +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import android.widget.Button @@ -25,7 +25,7 @@ class SourcesListAdapter( private val app: Activity, private val items: ArrayList, private val api: SelfossApi -) : RecyclerView.Adapter() { +) : androidx.recyclerview.widget.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) : RecyclerView.ViewHolder(mView) { + inner class ViewHolder(internal val mView: ConstraintLayout) : androidx.recyclerview.widget.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 d26e97c..ec4aa9c 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 @@ -7,11 +7,11 @@ import android.graphics.drawable.ColorDrawable import android.os.Build import android.os.Bundle import android.preference.PreferenceManager -import android.support.customtabs.CustomTabsIntent -import android.support.design.widget.FloatingActionButton -import android.support.v4.app.Fragment -import android.support.v4.content.ContextCompat -import android.support.v4.widget.NestedScrollView +import androidx.browser.customtabs.CustomTabsIntent +import com.google.android.material.floatingactionbutton.FloatingActionButton +import androidx.fragment.app.Fragment +import androidx.core.content.ContextCompat +import androidx.core.widget.NestedScrollView import android.view.LayoutInflater import android.view.MenuItem import android.view.View @@ -45,7 +45,7 @@ import retrofit2.Response import java.net.MalformedURLException import java.net.URL -class ArticleFragment : Fragment() { +class ArticleFragment : androidx.fragment.app.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/settings/AppCompatPreferenceActivity.java b/app/src/main/java/apps/amine/bou/readerforselfoss/settings/AppCompatPreferenceActivity.java index a2f84e2..81eed38 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/settings/AppCompatPreferenceActivity.java +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/settings/AppCompatPreferenceActivity.java @@ -4,13 +4,13 @@ import android.content.res.Configuration; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceActivity; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.AppBarLayout; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatDelegate; -import android.support.v7.widget.Toolbar; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.appbar.AppBarLayout; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.MenuInflater; import android.view.View; diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java b/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java index 47e6c0e..6019500 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java @@ -19,7 +19,7 @@ import android.preference.PreferenceActivity; import android.preference.PreferenceFragment; import android.preference.PreferenceManager; import android.preference.SwitchPreference; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.text.Editable; import android.text.InputFilter; import android.text.Spanned; @@ -31,7 +31,6 @@ import android.widget.Toast; import java.util.List; -import apps.amine.bou.readerforselfoss.BuildConfig; import apps.amine.bou.readerforselfoss.R; import apps.amine.bou.readerforselfoss.themes.AppColors; import apps.amine.bou.readerforselfoss.utils.Config; diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/themes/AppColors.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/themes/AppColors.kt index 2b24d77..a4d86e3 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/themes/AppColors.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/themes/AppColors.kt @@ -3,8 +3,8 @@ package apps.amine.bou.readerforselfoss.themes import android.app.Activity import android.content.Context import android.preference.PreferenceManager -import android.support.annotation.ColorInt -import android.support.v7.view.ContextThemeWrapper +import androidx.annotation.ColorInt +import androidx.appcompat.view.ContextThemeWrapper import android.util.TypedValue import apps.amine.bou.readerforselfoss.R import android.view.LayoutInflater 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 abbcc20..877ba32 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 @@ -1,9 +1,9 @@ package apps.amine.bou.readerforselfoss.transformers -import android.support.v4.view.ViewPager +import androidx.viewpager.widget.ViewPager import android.view.View -class DepthPageTransformer : ViewPager.PageTransformer { +class DepthPageTransformer : androidx.viewpager.widget.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/LinksUtils.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt index 6981418..b6d2e3f 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt @@ -6,7 +6,7 @@ import android.content.Context import android.content.Intent import android.graphics.BitmapFactory import android.net.Uri -import android.support.customtabs.CustomTabsIntent +import androidx.browser.customtabs.CustomTabsIntent import android.util.Patterns import android.widget.Toast import apps.amine.bou.readerforselfoss.R 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 index 54f8490..63a3866 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ScrollAwareFABBehavior.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ScrollAwareFABBehavior.kt @@ -1,19 +1,19 @@ package apps.amine.bou.readerforselfoss.utils import android.content.Context -import android.support.design.widget.CoordinatorLayout -import android.support.design.widget.FloatingActionButton +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 -) : CoordinatorLayout.Behavior() { +) : androidx.coordinatorlayout.widget.CoordinatorLayout.Behavior() { override fun onStartNestedScroll( - coordinatorLayout: CoordinatorLayout, + coordinatorLayout: androidx.coordinatorlayout.widget.CoordinatorLayout, child: FloatingActionButton, directTargetChild: View, target: View, @@ -23,7 +23,7 @@ class ScrollAwareFABBehavior( } override fun onNestedScroll( - coordinatorLayout: CoordinatorLayout, + coordinatorLayout: androidx.coordinatorlayout.widget.CoordinatorLayout, child: FloatingActionButton, target: View, dxConsumed: Int, diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabActivityHelper.java b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabActivityHelper.java index 004eb0f..ebfbd96 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabActivityHelper.java +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabActivityHelper.java @@ -4,10 +4,10 @@ package apps.amine.bou.readerforselfoss.utils.customtabs; import android.app.Activity; import android.net.Uri; import android.os.Bundle; -import android.support.customtabs.CustomTabsClient; -import android.support.customtabs.CustomTabsIntent; -import android.support.customtabs.CustomTabsServiceConnection; -import android.support.customtabs.CustomTabsSession; +import androidx.browser.customtabs.CustomTabsClient; +import androidx.browser.customtabs.CustomTabsIntent; +import androidx.browser.customtabs.CustomTabsServiceConnection; +import androidx.browser.customtabs.CustomTabsSession; import java.util.List; diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabsHelper.java b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabsHelper.java index 4338f2a..080f5b9 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabsHelper.java +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabsHelper.java @@ -7,7 +7,7 @@ import android.content.IntentFilter; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.net.Uri; -import android.support.customtabs.CustomTabsService; +import androidx.browser.customtabs.CustomTabsService; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/ServiceConnection.java b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/ServiceConnection.java index 974edf2..f035dff 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/ServiceConnection.java +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/ServiceConnection.java @@ -2,8 +2,8 @@ package apps.amine.bou.readerforselfoss.utils.customtabs; import android.content.ComponentName; -import android.support.customtabs.CustomTabsClient; -import android.support.customtabs.CustomTabsServiceConnection; +import androidx.browser.customtabs.CustomTabsClient; +import androidx.browser.customtabs.CustomTabsServiceConnection; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/ServiceConnectionCallback.java b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/ServiceConnectionCallback.java index b5dae99..d9db63a 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/ServiceConnectionCallback.java +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/ServiceConnectionCallback.java @@ -1,7 +1,7 @@ package apps.amine.bou.readerforselfoss.utils.customtabs; -import android.support.customtabs.CustomTabsClient; +import androidx.browser.customtabs.CustomTabsClient; public interface ServiceConnectionCallback { 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 7a55e15..a524c20 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 @@ -1,14 +1,14 @@ /* From https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/CustomBaseViewHolder.java */ package apps.amine.bou.readerforselfoss.utils.drawer -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.View import android.widget.ImageView import android.widget.TextView import apps.amine.bou.readerforselfoss.R -open class CustomBaseViewHolder(var view: View) : RecyclerView.ViewHolder(view) { +open class CustomBaseViewHolder(var view: View) : androidx.recyclerview.widget.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 748b865..bdfb706 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 @@ -2,10 +2,10 @@ package apps.amine.bou.readerforselfoss.utils.drawer import android.net.Uri -import android.support.annotation.ColorInt -import android.support.annotation.ColorRes -import android.support.annotation.StringRes -import android.support.v7.widget.RecyclerView +import androidx.annotation.ColorInt +import androidx.annotation.ColorRes +import androidx.annotation.StringRes +import androidx.recyclerview.widget.RecyclerView import com.mikepenz.materialdrawer.holder.ColorHolder import com.mikepenz.materialdrawer.holder.ImageHolder @@ -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/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlPrimaryDrawerItem.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlPrimaryDrawerItem.kt index 809ef7a..c4bb2b5 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlPrimaryDrawerItem.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlPrimaryDrawerItem.kt @@ -1,8 +1,8 @@ /* From https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/CustomUrlPrimaryDrawerItem.java */ package apps.amine.bou.readerforselfoss.utils.drawer -import android.support.annotation.LayoutRes -import android.support.annotation.StringRes +import androidx.annotation.LayoutRes +import androidx.annotation.StringRes import android.view.View import android.widget.TextView import apps.amine.bou.readerforselfoss.R diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/glide/GlideUtils.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/glide/GlideUtils.kt index eb0c19e..d107bea 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/glide/GlideUtils.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/glide/GlideUtils.kt @@ -2,7 +2,7 @@ package apps.amine.bou.readerforselfoss.utils.glide import android.content.Context import android.graphics.Bitmap -import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory +import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory import android.widget.ImageView import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions diff --git a/app/src/main/res/layout/activity_add_source.xml b/app/src/main/res/layout/activity_add_source.xml index bb8ef0f..c9166c0 100644 --- a/app/src/main/res/layout/activity_add_source.xml +++ b/app/src/main/res/layout/activity_add_source.xml @@ -10,22 +10,22 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - + - - + - - @@ -46,18 +46,18 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - + - @@ -89,7 +89,7 @@ android:background="@color/transparent" android:visibility="gone" /> - - + - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 9913044..b631400 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -6,18 +6,18 @@ android:gravity="center_horizontal" android:orientation="vertical" tools:context="apps.amine.bou.readerforselfoss.LoginActivity"> - - - + - - + - - + - - + - - + - - + - - + diff --git a/app/src/main/res/layout/activity_reader.xml b/app/src/main/res/layout/activity_reader.xml index 90db78e..7b2fc80 100644 --- a/app/src/main/res/layout/activity_reader.xml +++ b/app/src/main/res/layout/activity_reader.xml @@ -1,10 +1,10 @@ - - - - + - - + diff --git a/app/src/main/res/layout/activity_sources.xml b/app/src/main/res/layout/activity_sources.xml index 471d5b0..7f484e0 100644 --- a/app/src/main/res/layout/activity_sources.xml +++ b/app/src/main/res/layout/activity_sources.xml @@ -1,33 +1,33 @@ - - - - + - - + - - + diff --git a/app/src/main/res/layout/card_item.xml b/app/src/main/res/layout/card_item.xml index 082baa6..d8dcccb 100644 --- a/app/src/main/res/layout/card_item.xml +++ b/app/src/main/res/layout/card_item.xml @@ -1,5 +1,5 @@ - - @@ -34,7 +34,7 @@ app:srcCompat="@drawable/background_splash" card_view:layout_constraintBottom_toTopOf="@+id/constraintLayout" /> - - - + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_article.xml b/app/src/main/res/layout/fragment_article.xml index 07f3440..7227456 100644 --- a/app/src/main/res/layout/fragment_article.xml +++ b/app/src/main/res/layout/fragment_article.xml @@ -1,4 +1,4 @@ - - - @@ -70,9 +70,9 @@ app:layout_constraintTop_toBottomOf="@+id/source" tools:visibility="visible" /> - + - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml index 7326815..2b03650 100644 --- a/app/src/main/res/layout/list_item.xml +++ b/app/src/main/res/layout/list_item.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/settings_toolbar.xml b/app/src/main/res/layout/settings_toolbar.xml index e97dbf9..c9f9325 100644 --- a/app/src/main/res/layout/settings_toolbar.xml +++ b/app/src/main/res/layout/settings_toolbar.xml @@ -1,15 +1,15 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/source_list_item.xml b/app/src/main/res/layout/source_list_item.xml index c8b17d4..aa81876 100644 --- a/app/src/main/res/layout/source_list_item.xml +++ b/app/src/main/res/layout/source_list_item.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/menu/home_menu.xml b/app/src/main/res/menu/home_menu.xml index e9c80ee..6a8c9b0 100644 --- a/app/src/main/res/menu/home_menu.xml +++ b/app/src/main/res/menu/home_menu.xml @@ -6,7 +6,7 @@ android:title="@string/menu_home_search" android:icon="@drawable/ic_action_search" app:showAsAction="ifRoom|collapseActionView" - app:actionViewClass="android.support.v7.widget.SearchView" /> + app:actionViewClass="androidx.appcompat.widget.SearchView" />