From 21be7357b5eb42c08f2175362d8b4034032ab4a2 Mon Sep 17 00:00:00 2001 From: Amine Date: Tue, 25 Sep 2018 20:27:27 +0200 Subject: [PATCH] Revert "Updated to androidx." This reverts commit d47ba2c820e8bf997cb225d52ffb9d66439e3f7a. --- app/build.gradle | 36 ++++++++--------- app/proguard-rules.pro | 2 +- .../HomeActivityEspressoTest.kt | 39 ++++++++++--------- .../IntroActivityEspressoTest.kt | 26 ++++++------- .../LoginActivityEspressoTest.kt | 38 +++++++++--------- .../MainActivityEspressoTest.kt | 14 +++---- .../apps/amine/bou/readerforselfoss/Utils.kt | 4 +- .../bou/readerforselfoss/AddSourceActivity.kt | 9 +++-- .../bou/readerforselfoss/HomeActivity.kt | 31 +++++++-------- .../bou/readerforselfoss/IntroActivity.kt | 2 +- .../bou/readerforselfoss/LoginActivity.kt | 14 ++++--- .../bou/readerforselfoss/MainActivity.kt | 2 +- .../apps/amine/bou/readerforselfoss/MyApp.kt | 2 +- .../bou/readerforselfoss/ReaderActivity.kt | 13 +++---- .../bou/readerforselfoss/SourcesActivity.kt | 4 +- .../adapters/ItemCardAdapter.kt | 4 +- .../adapters/ItemListAdapter.kt | 4 +- .../readerforselfoss/adapters/ItemsAdapter.kt | 6 +-- .../adapters/SourcesListAdapter.kt | 4 +- .../fragments/ArticleFragment.kt | 12 +++--- .../settings/AppCompatPreferenceActivity.java | 14 +++---- .../settings/SettingsActivity.java | 3 +- .../bou/readerforselfoss/themes/AppColors.kt | 5 ++- .../transformers/DepthPageTransformer.kt | 2 +- .../bou/readerforselfoss/utils/LinksUtils.kt | 2 +- .../utils/ScrollAwareFABBehavior.kt | 4 +- .../customtabs/CustomTabActivityHelper.java | 8 ++-- .../utils/customtabs/CustomTabsHelper.java | 4 +- .../utils/customtabs/ServiceConnection.java | 4 +- .../customtabs/ServiceConnectionCallback.java | 2 +- .../utils/drawer/CustomBaseViewHolder.kt | 2 +- .../drawer/CustomUrlBasePrimaryDrawerItem.kt | 8 ++-- .../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 | 5 ++- gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 49 files changed, 240 insertions(+), 233 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6592584..6bdf8c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,7 +53,7 @@ android { vectorDrawables.useSupportLibrary = true // tests - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -85,26 +85,26 @@ android { dependencies { // Testing - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4' - androidTestImplementation 'androidx.test:runner:1.1.0-alpha4' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' + androidTestImplementation 'com.android.support.test:runner:1.0.1' // Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource - androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0-alpha4' + androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.1' // Espresso-intents for validation and stubbing of Intents - androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0-alpha4' + androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.1' 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.constraintlayout:constraintlayout:2.0.0-alpha2' + 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' //multidex - implementation 'androidx.multidex:multidex:2.0.0' + implementation 'com.android.support:multidex:1.0.3' // Intro implementation 'agency.tango.android:material-intro-screen:0.0.5' @@ -133,7 +133,7 @@ dependencies { implementation 'com.github.stkent:amplify:2.1.0' // Drawer - implementation 'co.zsmb:materialdrawer-kt:2.0.0' + implementation 'co.zsmb:materialdrawer-kt:1.3.5' implementation 'com.anupcowkur:reservoir:3.1.0' // Themes @@ -144,11 +144,11 @@ dependencies { // Pager implementation 'me.relex:circleindicator:1.2.2@aar' - implementation 'androidx.core:core-ktx:1.0.0' + implementation 'androidx.core:core-ktx:0.3' // Crash - implementation 'ch.acra:acra-http:5.2.0' - implementation 'ch.acra:acra-dialog:5.2.0' + implementation 'ch.acra:acra-http:5.1.3' + implementation 'ch.acra:acra-dialog:5.1.3' } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 1386b7a..b88ba28 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -75,4 +75,4 @@ -dontwarn javax.annotation.** --keep class androidx.appcompat.widget.SearchView { *; } \ No newline at end of file +-keep class android.support.v7.widget.SearchView { *; } \ No newline at end of file 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 ed8476d..5f692f1 100644 --- a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/HomeActivityEspressoTest.kt +++ b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/HomeActivityEspressoTest.kt @@ -2,24 +2,27 @@ package apps.amine.bou.readerforselfoss import android.content.Context import android.content.Intent -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.pressKey -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.isDisplayed -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.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 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 9455253..7fbe62d 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 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 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 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 1bcdd4c..68e4243 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 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 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 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 c5bc6ba..df91d30 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 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 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 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 0c30d74..8489fed 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 com.google.android.material.textfield.TextInputLayout -import androidx.test.espresso.matcher.ViewMatchers +import android.support.design.widget.TextInputLayout +import android.support.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 dbee68f..eb321c3 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 androidx.constraintlayout.widget.ConstraintLayout -import androidx.appcompat.app.AppCompatActivity +import android.support.constraint.ConstraintLayout +import android.support.v7.app.AppCompatActivity import android.view.View import android.widget.AdapterView import android.widget.ArrayAdapter @@ -22,12 +22,13 @@ import apps.amine.bou.readerforselfoss.themes.Toppings import apps.amine.bou.readerforselfoss.utils.Config import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid import com.ftinc.scoop.Scoop +import kotlinx.android.synthetic.main.activity_add_source.* import retrofit2.Call import retrofit2.Callback import retrofit2.Response import android.graphics.PorterDuff -import androidx.appcompat.widget.Toolbar -import kotlinx.android.synthetic.main.activity_add_source.* + + class AddSourceActivity : AppCompatActivity() { 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 adc103f..be6e02f 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,16 @@ import android.net.Uri import android.os.Build import android.os.Bundle import android.preference.PreferenceManager -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.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 android.util.Log import android.view.Menu import android.view.MenuItem import android.view.View @@ -208,8 +209,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT ) { override fun getSwipeDirs( - recyclerView: RecyclerView, - viewHolder: RecyclerView.ViewHolder + recyclerView: RecyclerView?, + viewHolder: RecyclerView.ViewHolder? ): Int = if (elementsShown != UNREAD_SHOWN) { 0 @@ -806,8 +807,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { private fun handleInfiniteScroll() { if (recyclerViewScrollListener == null) { recyclerViewScrollListener = object : RecyclerView.OnScrollListener() { - override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { - if (recyclerView != null && dy > 0) { + override fun onScrolled(localRecycler: RecyclerView?, dx: Int, dy: Int) { + if (localRecycler != null && dy > 0) { val manager = recyclerView.layoutManager val lastVisibleItem: Int = when (manager) { is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions( @@ -826,9 +827,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { } recyclerView.clearOnScrollListeners() - if (recyclerViewScrollListener != null) { - recyclerView.addOnScrollListener(recyclerViewScrollListener!!) - } + recyclerView.addOnScrollListener(recyclerViewScrollListener) } private fun mayBeEmpty() = 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 afbb8a6..676d0dd 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt @@ -7,8 +7,8 @@ import android.content.Intent import android.net.Uri import android.os.Bundle import android.preference.PreferenceManager +import android.support.v7.app.AppCompatDelegate import android.view.View -import androidx.appcompat.app.AppCompatDelegate 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 065dedc..5182df3 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 androidx.appcompat.app.AlertDialog -import androidx.appcompat.app.AppCompatActivity +import android.support.v7.app.AlertDialog +import android.support.v7.app.AppCompatActivity import android.text.TextUtils import android.view.Menu import android.view.MenuItem @@ -112,8 +112,9 @@ class LoginActivity : AppCompatActivity() { alertDialog.setMessage(getString(R.string.base_url_error)) alertDialog.setButton( AlertDialog.BUTTON_NEUTRAL, - "OK" - ) { dialog, _ -> dialog.dismiss() } + "OK", + { dialog, _ -> dialog.dismiss() } + ) alertDialog.show() } } @@ -154,8 +155,9 @@ class LoginActivity : AppCompatActivity() { alertDialog.setMessage(getString(R.string.text_wrong_url)) alertDialog.setButton( AlertDialog.BUTTON_NEUTRAL, - "OK" - ) { dialog, _ -> dialog.dismiss() } + "OK", + { dialog, _ -> dialog.dismiss() } + ) alertDialog.show() inValidCount = 0 } 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 112747f..263da6b 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 androidx.appcompat.app.AppCompatActivity +import android.support.v7.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 5d0c1f4..c5ddfb7 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt @@ -5,8 +5,8 @@ import android.content.SharedPreferences import android.graphics.drawable.Drawable import android.net.Uri import android.preference.PreferenceManager +import android.support.multidex.MultiDexApplication import android.widget.ImageView -import androidx.multidex.MultiDexApplication import apps.amine.bou.readerforselfoss.utils.Config import com.anupcowkur.reservoir.Reservoir import com.bumptech.glide.Glide 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 1029197..3efa2a0 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 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.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 android.view.Menu import android.view.MenuItem import android.view.ViewGroup @@ -101,8 +101,7 @@ class ReaderActivity : AppCompatActivity() { notifyAdapter() pager.setPageTransformer(true, DepthPageTransformer()) - // TODO: add back the page indicator - // (indicator as CircleIndicator).setViewPager(pager as android.support.v4.view.ViewPager) + (indicator as CircleIndicator).setViewPager(pager) pager.addOnPageChangeListener( object : ViewPager.SimpleOnPageChangeListener() { 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 f74f68d..3c96dc7 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt @@ -5,9 +5,9 @@ import android.content.res.ColorStateList import android.os.Build import android.os.Bundle import android.preference.PreferenceManager -import androidx.appcompat.app.AppCompatActivity +import android.support.v7.app.AppCompatActivity +import android.support.v7.widget.LinearLayoutManager import android.widget.Toast -import androidx.recyclerview.widget.LinearLayoutManager import apps.amine.bou.readerforselfoss.adapters.SourcesListAdapter import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi import apps.amine.bou.readerforselfoss.api.selfoss.Sources 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 ed2d0a0..c4a6f76 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 androidx.cardview.widget.CardView -import androidx.recyclerview.widget.RecyclerView +import android.support.v7.widget.CardView +import android.support.v7.widget.RecyclerView import android.text.Html import android.view.LayoutInflater import android.view.View 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 3673ad1..42ebc6f 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 androidx.constraintlayout.widget.ConstraintLayout -import androidx.recyclerview.widget.RecyclerView +import android.support.constraint.ConstraintLayout +import android.support.v7.widget.RecyclerView import android.text.Html import android.util.TypedValue import android.view.LayoutInflater 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 8579a71..6b69283 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,7 +2,8 @@ package apps.amine.bou.readerforselfoss.adapters import android.app.Activity import android.graphics.Color -import androidx.recyclerview.widget.RecyclerView +import android.support.design.widget.Snackbar +import android.support.v7.widget.RecyclerView import android.widget.TextView import android.widget.Toast import apps.amine.bou.readerforselfoss.R @@ -12,7 +13,6 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse import apps.amine.bou.readerforselfoss.themes.AppColors import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException import apps.amine.bou.readerforselfoss.utils.succeeded -import com.google.android.material.snackbar.Snackbar import org.acra.ACRA import retrofit2.Call import retrofit2.Callback @@ -62,7 +62,7 @@ abstract class ItemsAdapter : RecyclerView.Adapte } val view = s.view - val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text) + val tv: TextView = view.findViewById(android.support.design.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 13d14ed..957384c 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 androidx.constraintlayout.widget.ConstraintLayout -import androidx.recyclerview.widget.RecyclerView +import android.support.constraint.ConstraintLayout +import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup import android.widget.Button 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 785414f..cf45abe 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 @@ -9,12 +9,12 @@ import android.net.Uri import android.os.Build import android.os.Bundle import android.preference.PreferenceManager -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 androidx.appcompat.app.AlertDialog +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 android.support.v7.app.AlertDialog import android.view.LayoutInflater import android.view.MenuItem import android.view.View 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 05d56ac..a2f84e2 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,12 +4,13 @@ import android.content.res.Configuration; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceActivity; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.app.AppCompatDelegate; -import androidx.appcompat.widget.Toolbar; +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 android.view.LayoutInflater; import android.view.MenuInflater; import android.view.View; @@ -17,7 +18,6 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import com.ftinc.scoop.Scoop; -import com.google.android.material.appbar.AppBarLayout; import apps.amine.bou.readerforselfoss.R; import apps.amine.bou.readerforselfoss.themes.AppColors; 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 6019500..47e6c0e 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 androidx.appcompat.app.ActionBar; +import android.support.v7.app.ActionBar; import android.text.Editable; import android.text.InputFilter; import android.text.Spanned; @@ -31,6 +31,7 @@ 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 ff43429..2b24d77 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,9 +3,12 @@ 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 android.util.TypedValue -import androidx.annotation.ColorInt import apps.amine.bou.readerforselfoss.R +import android.view.LayoutInflater +import android.view.ViewGroup class AppColors(a: Activity) { 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 e5da460..abbcc20 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,6 +1,6 @@ package apps.amine.bou.readerforselfoss.transformers -import androidx.viewpager.widget.ViewPager +import android.support.v4.view.ViewPager import android.view.View class DepthPageTransformer : ViewPager.PageTransformer { 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 b6d2e3f..6981418 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 androidx.browser.customtabs.CustomTabsIntent +import android.support.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 daecc88..54f8490 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,8 +1,8 @@ package apps.amine.bou.readerforselfoss.utils import android.content.Context -import androidx.coordinatorlayout.widget.CoordinatorLayout -import com.google.android.material.floatingactionbutton.FloatingActionButton +import android.support.design.widget.CoordinatorLayout +import android.support.design.widget.FloatingActionButton import android.util.AttributeSet import android.view.View 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 ebfbd96..004eb0f 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 androidx.browser.customtabs.CustomTabsClient; -import androidx.browser.customtabs.CustomTabsIntent; -import androidx.browser.customtabs.CustomTabsServiceConnection; -import androidx.browser.customtabs.CustomTabsSession; +import android.support.customtabs.CustomTabsClient; +import android.support.customtabs.CustomTabsIntent; +import android.support.customtabs.CustomTabsServiceConnection; +import android.support.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 462f3a4..4338f2a 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 androidx.browser.customtabs.CustomTabsService; +import android.support.customtabs.CustomTabsService; import android.text.TextUtils; import android.util.Log; @@ -24,7 +24,7 @@ class CustomTabsHelper { private static final String DEV_PACKAGE = "com.chrome.dev"; private static final String LOCAL_PACKAGE = "com.google.android.apps.chrome"; private static final String EXTRA_CUSTOM_TABS_KEEP_ALIVE = - "androidx.browser.customtabs.extra.KEEP_ALIVE"; + "android.support.customtabs.extra.KEEP_ALIVE"; private static String sPackageNameToUse; 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 f035dff..974edf2 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 androidx.browser.customtabs.CustomTabsClient; -import androidx.browser.customtabs.CustomTabsServiceConnection; +import android.support.customtabs.CustomTabsClient; +import android.support.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 d9db63a..b5dae99 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 androidx.browser.customtabs.CustomTabsClient; +import android.support.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 5c6506a..7a55e15 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,7 +1,7 @@ /* 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 androidx.recyclerview.widget.RecyclerView +import android.support.v7.widget.RecyclerView import android.view.View import android.widget.ImageView import android.widget.TextView 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 f8b74c8..748b865 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 androidx.annotation.ColorInt -import androidx.annotation.ColorRes -import androidx.annotation.StringRes -import androidx.recyclerview.widget.RecyclerView +import android.support.annotation.ColorInt +import android.support.annotation.ColorRes +import android.support.annotation.StringRes +import android.support.v7.widget.RecyclerView import com.mikepenz.materialdrawer.holder.ColorHolder import com.mikepenz.materialdrawer.holder.ImageHolder 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 c4bb2b5..809ef7a 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 androidx.annotation.LayoutRes -import androidx.annotation.StringRes +import android.support.annotation.LayoutRes +import android.support.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 d107bea..eb0c19e 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 androidx.core.graphics.drawable.RoundedBitmapDrawableFactory +import android.support.v4.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 c9166c0..bb8ef0f 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 b631400..9913044 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 7b2fc80..90db78e 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 7f484e0..471d5b0 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 575369c..082baa6 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 7227456..07f3440 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 2b03650..7326815 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 c9f9325..e97dbf9 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 aa81876..c8b17d4 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 6a8c9b0..e9c80ee 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="androidx.appcompat.widget.SearchView" /> + app:actionViewClass="android.support.v7.widget.SearchView" />