diff --git a/app/build.gradle b/app/build.gradle index 605c08667a..a7971bf770 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -68,7 +68,8 @@ android { abortOnError false ignoreWarnings true // Translations are crowd-sourced - disable 'MissingTranslation', 'ExtraTranslation' + disable 'MissingTranslation', 'ExtraTranslation', + 'StaticFieldLeak', 'ClickableViewAccessibility' } testOptions { @@ -79,7 +80,6 @@ android { } ext { - supportLibVersion = '28.0.0' robolectricVersion = '3.8' powerMockitoVersion = '1.7.4' exoPlayerVersion = '2.11.7' @@ -95,15 +95,13 @@ dependencies { implementation 'com.github.ccrama:JReadability:bb291880a5' implementation 'com.github.Alexendoo:Android-RobotoTextView:f6d0eb5ac7' - implementation "com.android.support:design:${supportLibVersion}" - implementation "com.android.support:customtabs:${supportLibVersion}" - implementation "com.android.support:exifinterface:${supportLibVersion}" - implementation "com.android.support:appcompat-v7:${supportLibVersion}" - implementation "com.android.support:cardview-v7:${supportLibVersion}" - implementation "com.android.support:recyclerview-v7:${supportLibVersion}" - implementation "com.android.support:support-v13:${supportLibVersion}" - implementation "com.android.support:interpolator:${supportLibVersion}" - implementation 'com.android.support:multidex:1.0.3' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.browser:browser:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.interpolator:interpolator:1.0.0' + implementation 'androidx.multidex:multidex:2.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'com.google.android.material:material:1.0.0' implementation "com.google.android.exoplayer:exoplayer-core:${exoPlayerVersion}" implementation "com.google.android.exoplayer:extension-okhttp:${exoPlayerVersion}" @@ -150,5 +148,4 @@ dependencies { testImplementation "org.robolectric:shadows-multidex:${robolectricVersion}" testImplementation "org.powermock:powermock-api-mockito2:${powerMockitoVersion}" testImplementation "org.powermock:powermock-module-junit4:${powerMockitoVersion}" - androidTestImplementation 'com.android.support.test:runner:1.0.2' } diff --git a/app/src/androidTest/java/me/ccrama/redditslide/ApplicationTest.java b/app/src/androidTest/java/me/ccrama/redditslide/ApplicationTest.java deleted file mode 100644 index 6a244dac8e..0000000000 --- a/app/src/androidTest/java/me/ccrama/redditslide/ApplicationTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package me.ccrama.redditslide; - -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.assertEquals; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ApplicationTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("me.ccrama.redditslide", appContext.getPackageName()); - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bfb440c51e..79d9729bbe 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,7 +22,7 @@ android:usesCleartextTraffic="true" android:theme="@style/yellow_dark"> diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Album.java b/app/src/main/java/me/ccrama/redditslide/Activities/Album.java index 4e815ecbba..bffd290ade 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Album.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Album.java @@ -8,11 +8,11 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/AlbumPager.java b/app/src/main/java/me/ccrama/redditslide/Activities/AlbumPager.java index 5bcd777fff..a845f72c7d 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/AlbumPager.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/AlbumPager.java @@ -13,11 +13,11 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.Toolbar; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.*; import android.widget.*; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/BaseActivity.java b/app/src/main/java/me/ccrama/redditslide/Activities/BaseActivity.java index 42eac79dab..16e7bf970c 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/BaseActivity.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/BaseActivity.java @@ -11,10 +11,10 @@ import android.nfc.NfcEvent; import android.os.Build; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v7.widget.Toolbar; +import androidx.annotation.IdRes; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/CommentSearch.java b/app/src/main/java/me/ccrama/redditslide/Activities/CommentSearch.java index b00723ff97..aab6e7c301 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/CommentSearch.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/CommentSearch.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.Activities; import android.os.Bundle; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.text.TextWatcher; import android.widget.EditText; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/CommentsScreen.java b/app/src/main/java/me/ccrama/redditslide/Activities/CommentsScreen.java index 508bea7ad6..47b1c07ab7 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/CommentsScreen.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/CommentsScreen.java @@ -5,11 +5,11 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.recyclerview.widget.RecyclerView; import android.view.KeyEvent; import android.view.ViewGroup; import android.view.Window; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/CommentsScreenSingle.java b/app/src/main/java/me/ccrama/redditslide/Activities/CommentsScreenSingle.java index ea25c83e52..dbc2aef092 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/CommentsScreenSingle.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/CommentsScreenSingle.java @@ -6,10 +6,10 @@ import android.graphics.drawable.ColorDrawable; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.util.TypedValue; import android.view.KeyEvent; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/CreateMulti.java b/app/src/main/java/me/ccrama/redditslide/Activities/CreateMulti.java index 4de195f897..7be94a97e1 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/CreateMulti.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/CreateMulti.java @@ -21,8 +21,8 @@ import android.graphics.PorterDuff; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Crosspost.java b/app/src/main/java/me/ccrama/redditslide/Activities/Crosspost.java index c8ef6e3816..cc1a41c7aa 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Crosspost.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Crosspost.java @@ -4,8 +4,8 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.v7.widget.SwitchCompat; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.appcompat.widget.SwitchCompat; import android.text.Editable; import android.text.TextWatcher; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Discover.java b/app/src/main/java/me/ccrama/redditslide/Activities/Discover.java index e435c24b0a..ddbae129af 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Discover.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Discover.java @@ -2,13 +2,13 @@ import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v4.widget.DrawerLayout; +import androidx.annotation.NonNull; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.drawerlayout.widget.DrawerLayout; import android.text.InputType; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/DonateView.java b/app/src/main/java/me/ccrama/redditslide/Activities/DonateView.java index c82b147db8..772ae9f87e 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/DonateView.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/DonateView.java @@ -4,8 +4,8 @@ import android.content.DialogInterface; import android.os.Build; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.Toolbar; +import androidx.core.content.ContextCompat; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.View; import android.view.Window; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Draw.java b/app/src/main/java/me/ccrama/redditslide/Activities/Draw.java index 877fde4dec..af101a0705 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Draw.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Draw.java @@ -7,9 +7,9 @@ import android.net.Uri; import android.os.Bundle; import android.provider.MediaStore; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.v7.widget.Toolbar; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/EditCardsLayout.java b/app/src/main/java/me/ccrama/redditslide/Activities/EditCardsLayout.java index 85486b8699..8ad4aa765c 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/EditCardsLayout.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/EditCardsLayout.java @@ -2,9 +2,9 @@ import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v7.widget.AppCompatCheckBox; -import android.support.v7.widget.PopupMenu; -import android.support.v7.widget.SwitchCompat; +import androidx.appcompat.widget.AppCompatCheckBox; +import androidx.appcompat.widget.PopupMenu; +import androidx.appcompat.widget.SwitchCompat; import android.view.MenuItem; import android.view.View; import android.widget.CompoundButton; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Gallery.java b/app/src/main/java/me/ccrama/redditslide/Activities/Gallery.java index bb7afb69ad..e404d3dceb 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Gallery.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Gallery.java @@ -3,11 +3,11 @@ import android.content.res.Configuration; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import net.dean.jraw.models.Submission; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java b/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java index 2fa420e5a2..ff47601225 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java @@ -4,11 +4,11 @@ import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/LiveThread.java b/app/src/main/java/me/ccrama/redditslide/Activities/LiveThread.java index b909450884..2717e878e6 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/LiveThread.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/LiveThread.java @@ -7,9 +7,9 @@ import android.graphics.drawable.ColorDrawable; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.view.Gravity; import android.view.LayoutInflater; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Login.java b/app/src/main/java/me/ccrama/redditslide/Activities/Login.java index 7581e1a6bd..2d54438d49 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Login.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Login.java @@ -8,7 +8,7 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import android.view.View; import android.webkit.CookieManager; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java index 44ae04db63..7a6dd4bf50 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java @@ -36,24 +36,26 @@ import android.os.Bundle; import android.os.Handler; import android.os.Parcelable; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.design.widget.TabLayout; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.res.ResourcesCompat; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.ViewPager; -import android.support.v4.view.animation.FastOutSlowInInterpolator; -import android.support.v4.widget.DrawerLayout; -import android.support.v4.widget.ViewDragHelper; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.view.ContextThemeWrapper; -import android.support.v7.widget.*; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import com.google.android.material.tabs.TabLayout; +import androidx.core.app.ActivityCompat; +import androidx.cardview.widget.CardView; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.core.content.ContextCompat; +import androidx.core.content.res.ResourcesCompat; +import androidx.core.view.GravityCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.viewpager.widget.ViewPager; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.customview.widget.ViewDragHelper; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.view.ContextThemeWrapper; +import androidx.appcompat.widget.*; import android.text.Editable; import android.text.Spannable; import android.text.TextWatcher; @@ -663,7 +665,7 @@ public void onClick(View v) { Snackbar s = Snackbar.make(findViewById(R.id.anchor), getString(R.string.friends_sort_error), Snackbar.LENGTH_SHORT); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } else { @@ -1070,7 +1072,7 @@ public void onSingleClick(View v) { }); View view = snack.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); snack.show(); } @@ -2463,7 +2465,7 @@ public void run() { Snackbar.LENGTH_LONG); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -2657,7 +2659,7 @@ public void onClick( TextView tv = view .findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor( Color.WHITE); s.show(); @@ -2708,7 +2710,7 @@ public void onClick(DialogInterface dialog, int which) { Snackbar.LENGTH_LONG); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -2759,7 +2761,7 @@ public void onClick( TextView tv = view .findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor( Color.WHITE); s.show(); @@ -2809,7 +2811,7 @@ public void onClick(DialogInterface dialog, int which) { Snackbar.LENGTH_LONG); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -3263,7 +3265,7 @@ protected void onPostExecute( tv = view .findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor( Color.WHITE); s.show(); @@ -3327,7 +3329,7 @@ protected void onPostExecute( if (s != null) { View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -3457,8 +3459,8 @@ public void doSubSidebarNoLoad(final String subreddit) { * @param CLOSE_BUTTON button that clears the search and closes the search UI */ public void enterAnimationsForToolbarSearch(final long ANIMATION_DURATION, - final CardView SUGGESTIONS_BACKGROUND, final AutoCompleteTextView GO_TO_SUB_FIELD, - final ImageView CLOSE_BUTTON) { + final CardView SUGGESTIONS_BACKGROUND, final AutoCompleteTextView GO_TO_SUB_FIELD, + final ImageView CLOSE_BUTTON) { SUGGESTIONS_BACKGROUND.animate() .translationY(headerHeight) .setInterpolator(new AccelerateDecelerateInterpolator()) @@ -4941,7 +4943,7 @@ public void onSingleClick(View v) { }); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/MediaView.java b/app/src/main/java/me/ccrama/redditslide/Activities/MediaView.java index 783f60a678..29dfabadda 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/MediaView.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/MediaView.java @@ -20,8 +20,8 @@ import android.os.Bundle; import android.os.Environment; import android.os.Handler; -import android.support.v4.app.NotificationCompat; -import android.support.v4.view.animation.FastOutSlowInInterpolator; +import androidx.core.app.NotificationCompat; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import android.text.Html; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/ModQueue.java b/app/src/main/java/me/ccrama/redditslide/Activities/ModQueue.java index 2810bc462a..60d42da5fe 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/ModQueue.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/ModQueue.java @@ -1,11 +1,11 @@ package me.ccrama.redditslide.Activities; import android.os.Bundle; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.view.View; import android.view.ViewGroup; import android.view.animation.LinearInterpolator; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/MultiredditOverview.java b/app/src/main/java/me/ccrama/redditslide/Activities/MultiredditOverview.java index 3ef889c4d2..e44f4d5f07 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/MultiredditOverview.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/MultiredditOverview.java @@ -8,15 +8,15 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.PopupMenu; +import androidx.annotation.NonNull; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.appcompat.widget.PopupMenu; import android.text.Spannable; import android.util.Log; import android.view.Gravity; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/NewsActivity.java b/app/src/main/java/me/ccrama/redditslide/Activities/NewsActivity.java index 807b0ed1f2..5296885242 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/NewsActivity.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/NewsActivity.java @@ -15,16 +15,16 @@ import android.os.Build; import android.os.Bundle; import android.os.Parcelable; -import android.support.design.widget.TabLayout; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v4.widget.DrawerLayout; -import android.support.v4.widget.ViewDragHelper; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.Toolbar; +import com.google.android.material.tabs.TabLayout; +import androidx.core.app.ActivityCompat; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.customview.widget.ViewDragHelper; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.appcompat.widget.Toolbar; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/PostReadLater.java b/app/src/main/java/me/ccrama/redditslide/Activities/PostReadLater.java index f028400d47..84fec8ca2a 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/PostReadLater.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/PostReadLater.java @@ -1,10 +1,10 @@ package me.ccrama.redditslide.Activities; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; import me.ccrama.redditslide.ColorPreferences; import me.ccrama.redditslide.Fragments.ReadLaterView; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Profile.java b/app/src/main/java/me/ccrama/redditslide/Activities/Profile.java index 99acac1ae4..21807d7c76 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Profile.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Profile.java @@ -8,13 +8,13 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.support.design.widget.Snackbar; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.PopupMenu; +import com.google.android.material.snackbar.Snackbar; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.widget.PopupMenu; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.Spanned; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/ReaderMode.java b/app/src/main/java/me/ccrama/redditslide/Activities/ReaderMode.java index 70408a10f3..b86acfd475 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/ReaderMode.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/ReaderMode.java @@ -4,8 +4,8 @@ import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.Toolbar; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Reauthenticate.java b/app/src/main/java/me/ccrama/redditslide/Activities/Reauthenticate.java index 95390e3e21..7ce1695baf 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Reauthenticate.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Reauthenticate.java @@ -6,7 +6,7 @@ import android.graphics.Bitmap; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import android.view.View; import android.webkit.CookieManager; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Related.java b/app/src/main/java/me/ccrama/redditslide/Activities/Related.java index e6a83214a4..de1d4abda0 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Related.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Related.java @@ -3,8 +3,8 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.RecyclerView; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Search.java b/app/src/main/java/me/ccrama/redditslide/Activities/Search.java index d9c69a34c4..5395de8be8 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Search.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Search.java @@ -7,9 +7,9 @@ import android.content.res.Configuration; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SendMessage.java b/app/src/main/java/me/ccrama/redditslide/Activities/SendMessage.java index fdd28658c4..d0afd7ae3e 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SendMessage.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SendMessage.java @@ -5,8 +5,8 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.v7.widget.Toolbar; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.appcompat.widget.Toolbar; import android.text.InputType; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Settings.java b/app/src/main/java/me/ccrama/redditslide/Activities/Settings.java index 272f29b990..84015b7dbd 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Settings.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Settings.java @@ -9,8 +9,8 @@ import android.net.Uri; import android.os.Bundle; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.v7.widget.SwitchCompat; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.SwitchCompat; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsFilter.java b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsFilter.java index 4e757349f5..b298e72bba 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsFilter.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsFilter.java @@ -3,7 +3,7 @@ import android.content.SharedPreferences; import android.graphics.Typeface; import android.os.Bundle; -import android.support.v4.util.Consumer; +import androidx.core.util.Consumer; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.style.ForegroundColorSpan; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java index 09881136a6..ce7239752e 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.Activities; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewGroup; import java.io.File; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsSubreddit.java b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsSubreddit.java index 501fab7770..96597671ac 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsSubreddit.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsSubreddit.java @@ -6,10 +6,10 @@ import android.graphics.Color; import android.os.AsyncTask; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; @@ -178,7 +178,7 @@ protected void onPostExecute(Void aVoid) { } else { Snackbar s = Snackbar.make(mToolbar, R.string.err_color_sync_login, Snackbar.LENGTH_SHORT); View view = s.getView(); - TextView tv = (TextView) view.findViewById(android.support.design.R.id.snackbar_text); + TextView 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/me/ccrama/redditslide/Activities/SettingsViewType.java b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsViewType.java index e854f26ee1..8d0a5c522a 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsViewType.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsViewType.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.Activities; import android.os.Bundle; -import android.support.v7.widget.PopupMenu; +import androidx.appcompat.widget.PopupMenu; import android.view.MenuItem; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Shadowbox.java b/app/src/main/java/me/ccrama/redditslide/Activities/Shadowbox.java index fbf6537c42..bdf7efa135 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Shadowbox.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Shadowbox.java @@ -1,10 +1,10 @@ package me.ccrama.redditslide.Activities; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; import net.dean.jraw.models.Submission; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/ShadowboxComments.java b/app/src/main/java/me/ccrama/redditslide/Activities/ShadowboxComments.java index 53d42824b5..816a903feb 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/ShadowboxComments.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/ShadowboxComments.java @@ -1,10 +1,10 @@ package me.ccrama.redditslide.Activities; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; import net.dean.jraw.models.Comment; import net.dean.jraw.models.CommentNode; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Submit.java b/app/src/main/java/me/ccrama/redditslide/Activities/Submit.java index 15c268e3fb..25de9f2b9f 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Submit.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Submit.java @@ -10,10 +10,10 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; -import android.support.v7.widget.SwitchCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.appcompat.widget.SwitchCompat; import android.text.Editable; import android.text.TextWatcher; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SubredditSearch.java b/app/src/main/java/me/ccrama/redditslide/Activities/SubredditSearch.java index 2e3436e2dd..bb766bd811 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SubredditSearch.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SubredditSearch.java @@ -2,10 +2,10 @@ import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import android.text.InputType; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SubredditView.java b/app/src/main/java/me/ccrama/redditslide/Activities/SubredditView.java index 9bbf52248a..045b7026e1 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SubredditView.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SubredditView.java @@ -13,19 +13,19 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.design.widget.CoordinatorLayout; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.ViewPager; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.view.ContextThemeWrapper; -import android.support.v7.widget.AppCompatCheckBox; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.PopupMenu; +import androidx.annotation.NonNull; +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.core.view.GravityCompat; +import androidx.viewpager.widget.ViewPager; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.view.ContextThemeWrapper; +import androidx.appcompat.widget.AppCompatCheckBox; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.appcompat.widget.PopupMenu; import android.text.Spannable; import android.util.Log; import android.view.Gravity; @@ -306,7 +306,7 @@ public boolean onOptionsItemSelected(MenuItem item) { Snackbar s = Snackbar.make(findViewById(R.id.anchor), getString(R.string.friends_sort_error), Snackbar.LENGTH_SHORT); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } else { @@ -886,7 +886,7 @@ protected void onPostExecute( tv = view .findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor( Color.WHITE); s.show(); @@ -949,7 +949,7 @@ protected void onPostExecute( if (s != null) { View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -1254,7 +1254,7 @@ private void changeSubscription(Subreddit subreddit, boolean isChecked) { Snackbar s = Snackbar.make(mToolbar, isChecked ? getString(R.string.misc_subscribed) : getString(R.string.misc_unsubscribed), Snackbar.LENGTH_SHORT); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -1366,7 +1366,7 @@ public void run() { Snackbar.LENGTH_LONG); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -1466,7 +1466,7 @@ public void onClick( tv = view .findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor( Color.WHITE); s.show(); @@ -1518,7 +1518,7 @@ public void onClick(DialogInterface dialog, Snackbar.LENGTH_SHORT); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -1582,7 +1582,7 @@ public void onClick( tv = view .findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor( Color.WHITE); s.show(); @@ -1634,7 +1634,7 @@ public void onClick(DialogInterface dialog, Snackbar.LENGTH_SHORT); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Tumblr.java b/app/src/main/java/me/ccrama/redditslide/Activities/Tumblr.java index 78c3999648..5b21811942 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Tumblr.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Tumblr.java @@ -8,11 +8,11 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/TumblrPager.java b/app/src/main/java/me/ccrama/redditslide/Activities/TumblrPager.java index a4fc225a3f..dfacc82c4f 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/TumblrPager.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/TumblrPager.java @@ -13,11 +13,11 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.Toolbar; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.*; import android.widget.*; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Tutorial.java b/app/src/main/java/me/ccrama/redditslide/Activities/Tutorial.java index cd3a921c92..6ac95693ec 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Tutorial.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Tutorial.java @@ -4,13 +4,13 @@ import android.graphics.Color; import android.os.Build; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.core.content.ContextCompat; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; import android.util.Pair; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Website.java b/app/src/main/java/me/ccrama/redditslide/Activities/Website.java index 37717e37a7..7d6dcc6005 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Website.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Website.java @@ -3,7 +3,7 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; import android.view.*; import android.webkit.*; import android.widget.FrameLayout; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Wiki.java b/app/src/main/java/me/ccrama/redditslide/Activities/Wiki.java index e11048364e..ccda12d09c 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Wiki.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Wiki.java @@ -5,11 +5,11 @@ import android.graphics.Color; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.ColorInt; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.annotation.ColorInt; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import com.afollestad.materialdialogs.AlertDialogWrapper; import me.ccrama.redditslide.Authentication; import me.ccrama.redditslide.ColorPreferences; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/AlbumView.java b/app/src/main/java/me/ccrama/redditslide/Adapters/AlbumView.java index 7f3a426007..c29ade3667 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/AlbumView.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/AlbumView.java @@ -4,8 +4,8 @@ import android.app.Dialog; import android.content.Intent; import android.graphics.Typeface; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapter.java index bbd3c29384..e38380c533 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapter.java @@ -16,11 +16,11 @@ import android.os.Build; import android.os.Handler; import android.os.Looper; -import android.support.v4.app.FragmentManager; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.animation.FastOutSlowInInterpolator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.FragmentManager; +import androidx.core.content.ContextCompat; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.text.TextWatcher; import android.util.Log; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapterHelper.java b/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapterHelper.java index e1c7533d3c..5e730f977e 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapterHelper.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapterHelper.java @@ -17,10 +17,10 @@ import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v4.app.FragmentManager; -import android.support.v4.view.animation.FastOutSlowInInterpolator; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.FragmentManager; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import android.text.Html; import android.text.InputType; import android.text.Spannable; @@ -364,7 +364,7 @@ protected void onPostExecute(Void aVoid) { } View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -443,7 +443,7 @@ public void onClick(View v) { } View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -546,7 +546,7 @@ protected void onPostExecute( s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor( Color.WHITE); s.show(); @@ -561,7 +561,7 @@ protected void onPostExecute( s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor( Color.WHITE); s.show(); @@ -598,7 +598,7 @@ protected void onPostExecute(Boolean done) { Snackbar.LENGTH_SHORT); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -609,7 +609,7 @@ protected void onPostExecute(Boolean done) { Snackbar.LENGTH_SHORT); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -758,7 +758,7 @@ public void onComplete(boolean success) { Snackbar s = Snackbar.make(holder.itemView, R.string.comment_removed, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -948,7 +948,7 @@ public void onClick(View v) { { View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -974,7 +974,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, R.string.comment_distinguished, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } else { @@ -1009,7 +1009,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, R.string.comment_undistinguished, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } else { @@ -1044,7 +1044,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, R.string.comment_stickied, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } else { @@ -1148,7 +1148,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, R.string.comment_unstickied, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } else { @@ -1182,7 +1182,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, R.string.comment_removed, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -1268,7 +1268,7 @@ public void onPostExecute(Boolean b) { if (b) { Snackbar s = Snackbar.make(holder.itemView, R.string.comment_removed, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -1310,7 +1310,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, lock ? R.string.mod_locked : R.string.mod_unlocked, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } else { @@ -1834,7 +1834,7 @@ protected void onPostExecute(Void aVoid) { Snackbar s = Snackbar.make(contextView, R.string.msg_report_sent, Snackbar.LENGTH_SHORT); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapterSearch.java b/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapterSearch.java index 77946bf230..3b7dbacf8f 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapterSearch.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapterSearch.java @@ -13,8 +13,8 @@ import android.graphics.BitmapFactory; import android.graphics.Typeface; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.text.Spannable; import android.text.SpannableStringBuilder; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/CommentViewHolder.java b/app/src/main/java/me/ccrama/redditslide/Adapters/CommentViewHolder.java index 012908b1d8..7c21423e3a 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/CommentViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/CommentViewHolder.java @@ -2,8 +2,8 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/ContributionAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/ContributionAdapter.java index 07b60fbd41..42c2f77e75 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/ContributionAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/ContributionAdapter.java @@ -14,8 +14,8 @@ import android.graphics.Color; import android.graphics.Typeface; import android.os.AsyncTask; -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.text.Html; import android.text.SpannableStringBuilder; import android.text.Spanned; @@ -158,7 +158,7 @@ protected Void doInBackground(Submission... submissions) { public void run() { View view = s.getView(); TextView tv = - view.findViewById(android.support.design.R.id.snackbar_text); + view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -175,7 +175,7 @@ public void run() { public void run() { View view = s.getView(); TextView tv = - view.findViewById(android.support.design.R.id.snackbar_text); + view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -324,7 +324,7 @@ public void onClick(View v) { }); View view = s.getView(); TextView tv = - view.findViewById(android.support.design.R.id.snackbar_text); + view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/ContributionPosts.java b/app/src/main/java/me/ccrama/redditslide/Adapters/ContributionPosts.java index 323ccf07fe..b1534c0f9b 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/ContributionPosts.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/ContributionPosts.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.Adapters; import android.os.AsyncTask; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import net.dean.jraw.models.Contribution; import net.dean.jraw.models.Submission; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/ErrorAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/ErrorAdapter.java index 8f50518186..af0580653f 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/ErrorAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/ErrorAdapter.java @@ -4,7 +4,7 @@ * Created by ccrama on 10/30/2015. */ -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/GalleryView.java b/app/src/main/java/me/ccrama/redditslide/Adapters/GalleryView.java index 2d055f4d31..7fd92dd5a1 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/GalleryView.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/GalleryView.java @@ -6,7 +6,7 @@ import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.view.HapticFeedbackConstants; import android.view.LayoutInflater; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/HistoryPosts.java b/app/src/main/java/me/ccrama/redditslide/Adapters/HistoryPosts.java index 4670aa1581..d6b7729c1f 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/HistoryPosts.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/HistoryPosts.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.Adapters; import android.os.AsyncTask; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.lusfold.androidkeyvaluestore.KVStore; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/InboxAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/InboxAdapter.java index 75439407c3..0e3915eafe 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/InboxAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/InboxAdapter.java @@ -17,10 +17,10 @@ import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.AsyncTask; -import android.support.design.widget.Snackbar; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.RecyclerView; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.text.SpannableStringBuilder; import android.text.Spanned; @@ -491,7 +491,7 @@ public void onPostExecute(Void voids) { Snackbar s = Snackbar.make(listView, "Reply sent!", Snackbar.LENGTH_LONG); View view = s.getView(); TextView tv = - (TextView) view.findViewById(android.support.design.R.id.snackbar_text); + (TextView) view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } else { @@ -499,7 +499,7 @@ public void onPostExecute(Void voids) { Snackbar.LENGTH_LONG); View view = s.getView(); TextView tv = - (TextView) view.findViewById(android.support.design.R.id.snackbar_text); + (TextView) view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); Drafts.addDraft(text); diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/InboxMessages.java b/app/src/main/java/me/ccrama/redditslide/Adapters/InboxMessages.java index fc1dabcdaf..726e219ad1 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/InboxMessages.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/InboxMessages.java @@ -2,7 +2,7 @@ import android.app.Activity; import android.os.AsyncTask; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.fasterxml.jackson.databind.JsonNode; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/MessageViewHolder.java b/app/src/main/java/me/ccrama/redditslide/Adapters/MessageViewHolder.java index 7b95663fda..39547725e1 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/MessageViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/MessageViewHolder.java @@ -1,6 +1,6 @@ package me.ccrama.redditslide.Adapters; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/ModLogAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/ModLogAdapter.java index c847c36f95..2eb3266e3b 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/ModLogAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/ModLogAdapter.java @@ -6,8 +6,8 @@ import android.app.Activity; import android.graphics.Typeface; -import android.support.v4.content.res.ResourcesCompat; -import android.support.v7.widget.RecyclerView; +import androidx.core.content.res.ResourcesCompat; +import androidx.recyclerview.widget.RecyclerView; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.Spanned; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/ModLogPosts.java b/app/src/main/java/me/ccrama/redditslide/Adapters/ModLogPosts.java index 8db6928cee..e2ed306819 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/ModLogPosts.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/ModLogPosts.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.Adapters; import android.os.AsyncTask; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import net.dean.jraw.models.ModAction; import net.dean.jraw.paginators.ModLogPaginator; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/ModeratorAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/ModeratorAdapter.java index ba175f8a1d..d3feb19bcd 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/ModeratorAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/ModeratorAdapter.java @@ -13,10 +13,10 @@ import android.graphics.*; import android.graphics.drawable.Drawable; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.text.InputType; import android.text.SpannableStringBuilder; @@ -162,7 +162,7 @@ protected Void doInBackground(Submission... submissions) { public void run() { View view = s.getView(); TextView tv = - view.findViewById(android.support.design.R.id.snackbar_text); + view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -179,7 +179,7 @@ public void run() { public void run() { View view = s.getView(); TextView tv = - view.findViewById(android.support.design.R.id.snackbar_text); + view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -327,7 +327,7 @@ public void onClick(View v) { }); View view = s.getView(); TextView tv = - view.findViewById(android.support.design.R.id.snackbar_text); + view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -702,7 +702,7 @@ public void onComplete(boolean success) { Snackbar s = Snackbar.make(holder.itemView, R.string.comment_removed, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -782,7 +782,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, R.string.comment_distinguished, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } else { @@ -817,7 +817,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, R.string.comment_undistinguished, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } else { @@ -852,7 +852,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, R.string.comment_removed, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -930,7 +930,7 @@ public void onPostExecute(Boolean b) { if (b) { Snackbar s = Snackbar.make(holder.itemView, R.string.comment_removed, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -968,7 +968,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, lock ? R.string.mod_locked : R.string.mod_unlocked, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } else { diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/ModeratorPosts.java b/app/src/main/java/me/ccrama/redditslide/Adapters/ModeratorPosts.java index a45a2e7a22..7d3b3b0543 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/ModeratorPosts.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/ModeratorPosts.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.Adapters; import android.os.AsyncTask; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import net.dean.jraw.models.PublicContribution; import net.dean.jraw.paginators.ModeratorPaginator; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/MoreCommentViewHolder.java b/app/src/main/java/me/ccrama/redditslide/Adapters/MoreCommentViewHolder.java index d856977e86..0334b417cc 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/MoreCommentViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/MoreCommentViewHolder.java @@ -1,6 +1,6 @@ package me.ccrama.redditslide.Adapters; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/MultiredditAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/MultiredditAdapter.java index fa8b37df88..c5709bc0de 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/MultiredditAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/MultiredditAdapter.java @@ -9,9 +9,9 @@ import android.graphics.Color; import android.os.AsyncTask; import android.os.Handler; -import android.support.design.widget.Snackbar; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.RecyclerView; +import com.google.android.material.snackbar.Snackbar; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -161,7 +161,7 @@ public void onClick(View arg0) { } else { Snackbar s = Snackbar.make(holder.itemView, R.string.offline_comments_not_loaded, Snackbar.LENGTH_SHORT); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -244,7 +244,7 @@ protected Void doInBackground(Submission... submissions) { public void run() { View view = s.getView(); TextView tv = - view.findViewById(android.support.design.R.id.snackbar_text); + view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -261,7 +261,7 @@ public void run() { public void run() { View view = s.getView(); TextView tv = - view.findViewById(android.support.design.R.id.snackbar_text); + view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/NewsViewHolder.java b/app/src/main/java/me/ccrama/redditslide/Adapters/NewsViewHolder.java index 31818f9788..0f809a323c 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/NewsViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/NewsViewHolder.java @@ -1,6 +1,6 @@ package me.ccrama.redditslide.Adapters; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.RelativeLayout; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/ProfileCommentViewHolder.java b/app/src/main/java/me/ccrama/redditslide/Adapters/ProfileCommentViewHolder.java index db04f269ea..f1e3acbb58 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/ProfileCommentViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/ProfileCommentViewHolder.java @@ -1,6 +1,6 @@ package me.ccrama.redditslide.Adapters; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/SettingsSubAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/SettingsSubAdapter.java index d6011d3885..0ac87f1d55 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/SettingsSubAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/SettingsSubAdapter.java @@ -4,10 +4,10 @@ import android.content.Context; import android.content.DialogInterface; import android.graphics.PorterDuff; -import android.support.v4.content.ContextCompat; -import android.support.v7.view.ContextThemeWrapper; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SwitchCompat; +import androidx.core.content.ContextCompat; +import androidx.appcompat.view.ContextThemeWrapper; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.SwitchCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/SideArrayAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/SideArrayAdapter.java index e45cd71237..82f83b4d86 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/SideArrayAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/SideArrayAdapter.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.graphics.PorterDuff; -import android.support.v7.widget.CardView; +import androidx.cardview.widget.CardView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/SubChooseAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/SubChooseAdapter.java index 5f58f526c0..1cbb7f2be2 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/SubChooseAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/SubChooseAdapter.java @@ -8,7 +8,7 @@ import android.graphics.Paint; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionAdapter.java index 9b5a9bc4ab..a4538631c6 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionAdapter.java @@ -10,8 +10,8 @@ import android.graphics.Color; import android.os.AsyncTask; import android.os.Handler; -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.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -336,7 +336,7 @@ public void onClick(DialogInterface dialog, }); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -448,7 +448,7 @@ protected Void doInBackground(Submission... submissions) { public void run() { View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -466,7 +466,7 @@ public void run() { public void run() { View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionComments.java b/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionComments.java index a5ea55acad..b18657c4d7 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionComments.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionComments.java @@ -2,8 +2,8 @@ import android.graphics.Color; import android.os.AsyncTask; -import android.support.design.widget.Snackbar; -import android.support.v4.widget.SwipeRefreshLayout; +import com.google.android.material.snackbar.Snackbar; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.view.View; import android.widget.TextView; @@ -160,7 +160,7 @@ public void loadMoreReplyTop(CommentAdapter adapter, String context) { if (context == null || context.isEmpty()) { Snackbar s = Snackbar.make(page.rv, "Comment submitted", Snackbar.LENGTH_SHORT); View view = s.getView(); - TextView tv = (TextView) view.findViewById(android.support.design.R.id.snackbar_text); + TextView 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/me/ccrama/redditslide/Adapters/SubmissionNewsAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionNewsAdapter.java index b7da781539..ebf73795c7 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionNewsAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionNewsAdapter.java @@ -10,8 +10,8 @@ import android.graphics.Color; import android.os.AsyncTask; import android.os.Handler; -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.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -326,7 +326,7 @@ public void onClick(DialogInterface dialog, }); View view = s.getView(); TextView tv = (TextView) view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -436,7 +436,7 @@ protected Void doInBackground(Submission... submissions) { public void run() { View view = s.getView(); TextView tv = (TextView) view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -454,7 +454,7 @@ public void run() { public void run() { View view = s.getView(); TextView tv = (TextView) view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionViewHolder.java b/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionViewHolder.java index d16de30b25..5495795fdb 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/SubmissionViewHolder.java @@ -1,6 +1,6 @@ package me.ccrama.redditslide.Adapters; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.RelativeLayout; import android.widget.TextView; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditAdapter.java index 1fe8692792..6f99181118 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditAdapter.java @@ -8,7 +8,7 @@ import android.content.Intent; import android.graphics.PorterDuff; import android.os.Handler; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditPosts.java b/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditPosts.java index 990edb2359..cf2cd03924 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditPosts.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditPosts.java @@ -3,7 +3,7 @@ import android.content.Context; import android.graphics.Bitmap; import android.os.AsyncTask; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.text.Html; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditPostsRealm.java b/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditPostsRealm.java index 9fc48dc642..a6da4ef4a4 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditPostsRealm.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditPostsRealm.java @@ -3,7 +3,7 @@ import android.content.Context; import android.graphics.Bitmap; import android.os.AsyncTask; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.text.Html; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditSearchPosts.java b/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditSearchPosts.java index f7b061c50c..8f5657e628 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditSearchPosts.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditSearchPosts.java @@ -2,7 +2,7 @@ import android.app.Activity; import android.os.AsyncTask; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.widget.Toast; import net.dean.jraw.http.NetworkException; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditViewHolder.java b/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditViewHolder.java index 4d23d8b59f..3a32cb481f 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditViewHolder.java @@ -1,6 +1,6 @@ package me.ccrama.redditslide.Adapters; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/TumblrView.java b/app/src/main/java/me/ccrama/redditslide/Adapters/TumblrView.java index 54f331a0af..f8e082da41 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/TumblrView.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/TumblrView.java @@ -4,8 +4,8 @@ import android.app.Dialog; import android.content.Intent; import android.graphics.Typeface; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/ColorPreferences.java b/app/src/main/java/me/ccrama/redditslide/ColorPreferences.java index 1a3c7aa638..9f62ad763d 100644 --- a/app/src/main/java/me/ccrama/redditslide/ColorPreferences.java +++ b/app/src/main/java/me/ccrama/redditslide/ColorPreferences.java @@ -3,7 +3,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.graphics.Color; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.Pair; import org.apache.commons.text.StringEscapeUtils; diff --git a/app/src/main/java/me/ccrama/redditslide/CommentCacheAsync.java b/app/src/main/java/me/ccrama/redditslide/CommentCacheAsync.java index c112cc2918..f7f886c5dc 100644 --- a/app/src/main/java/me/ccrama/redditslide/CommentCacheAsync.java +++ b/app/src/main/java/me/ccrama/redditslide/CommentCacheAsync.java @@ -6,7 +6,7 @@ import android.graphics.Bitmap; import android.net.Uri; import android.os.AsyncTask; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import android.text.Html; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/DragSort/DragSortRecycler.java b/app/src/main/java/me/ccrama/redditslide/DragSort/DragSortRecycler.java index 8743f37c6b..38932cf696 100644 --- a/app/src/main/java/me/ccrama/redditslide/DragSort/DragSortRecycler.java +++ b/app/src/main/java/me/ccrama/redditslide/DragSort/DragSortRecycler.java @@ -29,8 +29,8 @@ import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.BitmapDrawable; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/DragSort/ReorderSubreddits.java b/app/src/main/java/me/ccrama/redditslide/DragSort/ReorderSubreddits.java index e71f44286d..b129bce187 100644 --- a/app/src/main/java/me/ccrama/redditslide/DragSort/ReorderSubreddits.java +++ b/app/src/main/java/me/ccrama/redditslide/DragSort/ReorderSubreddits.java @@ -25,12 +25,12 @@ import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Bundle; -import android.support.design.widget.Snackbar; -import android.support.v4.content.res.ResourcesCompat; -import android.support.v7.widget.AppCompatCheckBox; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.res.ResourcesCompat; +import androidx.appcompat.widget.AppCompatCheckBox; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; diff --git a/app/src/main/java/me/ccrama/redditslide/ForceTouch/PeekView.java b/app/src/main/java/me/ccrama/redditslide/ForceTouch/PeekView.java index 1a392ffc9b..dcaec64493 100644 --- a/app/src/main/java/me/ccrama/redditslide/ForceTouch/PeekView.java +++ b/app/src/main/java/me/ccrama/redditslide/ForceTouch/PeekView.java @@ -7,11 +7,11 @@ import android.graphics.Color; import android.graphics.Point; import android.graphics.Rect; -import android.support.annotation.FloatRange; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.FloatRange; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.Display; import android.view.LayoutInflater; import android.view.MotionEvent; diff --git a/app/src/main/java/me/ccrama/redditslide/ForceTouch/PeekViewActivity.java b/app/src/main/java/me/ccrama/redditslide/ForceTouch/PeekViewActivity.java index 38fc4f339d..12c7765e8e 100644 --- a/app/src/main/java/me/ccrama/redditslide/ForceTouch/PeekViewActivity.java +++ b/app/src/main/java/me/ccrama/redditslide/ForceTouch/PeekViewActivity.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.ForceTouch; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.HapticFeedbackConstants; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/ForceTouch/builder/Peek.java b/app/src/main/java/me/ccrama/redditslide/ForceTouch/builder/Peek.java index b202999287..3051f12d54 100644 --- a/app/src/main/java/me/ccrama/redditslide/ForceTouch/builder/Peek.java +++ b/app/src/main/java/me/ccrama/redditslide/ForceTouch/builder/Peek.java @@ -19,8 +19,8 @@ import android.graphics.drawable.RippleDrawable; import android.os.Build; import android.os.Handler; -import android.support.annotation.LayoutRes; -import android.support.annotation.Nullable; +import androidx.annotation.LayoutRes; +import androidx.annotation.Nullable; import android.util.Log; import android.view.GestureDetector; import android.view.MotionEvent; diff --git a/app/src/main/java/me/ccrama/redditslide/ForceTouch/builder/PeekViewOptions.java b/app/src/main/java/me/ccrama/redditslide/ForceTouch/builder/PeekViewOptions.java index 34d4bc1955..1ef680f06e 100644 --- a/app/src/main/java/me/ccrama/redditslide/ForceTouch/builder/PeekViewOptions.java +++ b/app/src/main/java/me/ccrama/redditslide/ForceTouch/builder/PeekViewOptions.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.ForceTouch.builder; import android.graphics.Color; -import android.support.annotation.FloatRange; +import androidx.annotation.FloatRange; import android.view.View; public class PeekViewOptions { diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/AlbumFull.java b/app/src/main/java/me/ccrama/redditslide/Fragments/AlbumFull.java index 2829800f3d..cdc03f7fea 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/AlbumFull.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/AlbumFull.java @@ -5,9 +5,9 @@ import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/AlbumFullComments.java b/app/src/main/java/me/ccrama/redditslide/Fragments/AlbumFullComments.java index 284bd502bf..4b1784aa6e 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/AlbumFullComments.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/AlbumFullComments.java @@ -5,9 +5,9 @@ import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/BlankFragment.java b/app/src/main/java/me/ccrama/redditslide/Fragments/BlankFragment.java index 5cd1c8f4aa..503f9d9b01 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/BlankFragment.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/BlankFragment.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.Fragments; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/CommentPage.java b/app/src/main/java/me/ccrama/redditslide/Fragments/CommentPage.java index 3d93fcb3c2..1a76e01407 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/CommentPage.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/CommentPage.java @@ -13,16 +13,16 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.view.ContextThemeWrapper; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.Fragment; +import androidx.core.content.ContextCompat; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.appcompat.view.ContextThemeWrapper; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MenuItem; @@ -952,7 +952,7 @@ public void onClick(DialogInterface dialog, Snackbar.LENGTH_SHORT); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -1461,7 +1461,7 @@ public void onClick( tv = view .findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor( Color.WHITE); s.show(); @@ -1518,7 +1518,7 @@ public void onClick( Snackbar.LENGTH_SHORT); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -1587,7 +1587,7 @@ public void onClick( tv = view .findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor( Color.WHITE); s.show(); @@ -1643,7 +1643,7 @@ public void onClick( Snackbar.LENGTH_SHORT); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -2282,7 +2282,7 @@ private void changeSubscription(Subreddit subreddit, boolean isChecked) { Snackbar s = Snackbar.make(toolbar, isChecked ? getString(R.string.misc_subscribed) : getString(R.string.misc_unsubscribed), Snackbar.LENGTH_SHORT); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/ContributionsView.java b/app/src/main/java/me/ccrama/redditslide/Fragments/ContributionsView.java index 1553dbe5b1..30ed2a1da0 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/ContributionsView.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/ContributionsView.java @@ -1,10 +1,10 @@ package me.ccrama.redditslide.Fragments; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.fragment.app.Fragment; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/DrawerItemsDialog.java b/app/src/main/java/me/ccrama/redditslide/Fragments/DrawerItemsDialog.java index 4f872f35dc..998066a2a0 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/DrawerItemsDialog.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/DrawerItemsDialog.java @@ -1,8 +1,8 @@ package me.ccrama.redditslide.Fragments; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; import android.view.View; import android.widget.CheckBox; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/FolderChooserDialogCreate.java b/app/src/main/java/me/ccrama/redditslide/Fragments/FolderChooserDialogCreate.java index dedfd32321..2b252f1c71 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/FolderChooserDialogCreate.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/FolderChooserDialogCreate.java @@ -7,14 +7,14 @@ import android.os.Build; import android.os.Bundle; import android.os.Environment; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.core.app.ActivityCompat; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.appcompat.app.AppCompatActivity; import android.text.InputType; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/HistoryView.java b/app/src/main/java/me/ccrama/redditslide/Fragments/HistoryView.java index abe78a61b4..ed57d4c79d 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/HistoryView.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/HistoryView.java @@ -1,10 +1,10 @@ package me.ccrama.redditslide.Fragments; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.fragment.app.Fragment; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/Image.java b/app/src/main/java/me/ccrama/redditslide/Fragments/Image.java index 767733bfa5..38bb136608 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/Image.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/Image.java @@ -2,7 +2,7 @@ import android.graphics.Bitmap; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/InboxPage.java b/app/src/main/java/me/ccrama/redditslide/Fragments/InboxPage.java index 7edd096915..dc738f72c7 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/InboxPage.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/InboxPage.java @@ -1,10 +1,10 @@ package me.ccrama.redditslide.Fragments; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.fragment.app.Fragment; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/ManageOfflineContentFragment.java b/app/src/main/java/me/ccrama/redditslide/Fragments/ManageOfflineContentFragment.java index 47626e0422..2fe82dc449 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/ManageOfflineContentFragment.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/ManageOfflineContentFragment.java @@ -4,7 +4,7 @@ import android.content.DialogInterface; import android.content.res.Resources; import android.os.Build; -import android.support.v7.widget.SwitchCompat; +import androidx.appcompat.widget.SwitchCompat; import android.util.TypedValue; import android.view.View; import android.widget.CompoundButton; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/MediaFragment.java b/app/src/main/java/me/ccrama/redditslide/Fragments/MediaFragment.java index aa0a7a77ae..a2a03b64c3 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/MediaFragment.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/MediaFragment.java @@ -8,7 +8,7 @@ import android.os.Build; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/MediaFragmentComment.java b/app/src/main/java/me/ccrama/redditslide/Fragments/MediaFragmentComment.java index 204f8dc52d..d54576ccf7 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/MediaFragmentComment.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/MediaFragmentComment.java @@ -7,7 +7,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/ModLog.java b/app/src/main/java/me/ccrama/redditslide/Fragments/ModLog.java index 4142acd558..e41e955a4a 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/ModLog.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/ModLog.java @@ -1,9 +1,9 @@ package me.ccrama.redditslide.Fragments; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.Fragment; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/ModPage.java b/app/src/main/java/me/ccrama/redditslide/Fragments/ModPage.java index bf24417fb7..cd8030a9a9 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/ModPage.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/ModPage.java @@ -1,9 +1,9 @@ package me.ccrama.redditslide.Fragments; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.Fragment; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/MultiredditView.java b/app/src/main/java/me/ccrama/redditslide/Fragments/MultiredditView.java index 958b640cc7..ce7084bdfa 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/MultiredditView.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/MultiredditView.java @@ -6,14 +6,14 @@ import android.graphics.Color; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; -import android.support.v4.view.animation.LinearOutSlowInInterpolator; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.Fragment; +import androidx.interpolator.view.animation.LinearOutSlowInInterpolator; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -213,7 +213,7 @@ public void onClick(View v) { };*/ Snackbar s = Snackbar.make(rv, getResources().getString(R.string.posts_hidden_forever), Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/NewsView.java b/app/src/main/java/me/ccrama/redditslide/Fragments/NewsView.java index 89a4a0c47b..9358413906 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/NewsView.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/NewsView.java @@ -9,15 +9,15 @@ import android.os.Build; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; -import android.support.v4.view.MarginLayoutParamsCompat; -import android.support.v4.view.animation.LinearOutSlowInInterpolator; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.view.ContextThemeWrapper; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.Fragment; +import androidx.core.view.MarginLayoutParamsCompat; +import androidx.interpolator.view.animation.LinearOutSlowInInterpolator; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.appcompat.view.ContextThemeWrapper; +import androidx.recyclerview.widget.RecyclerView; import android.view.GestureDetector; import android.view.HapticFeedbackConstants; import android.view.LayoutInflater; @@ -255,7 +255,7 @@ public void onClick(View v) { });*/ View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/ReadLaterView.java b/app/src/main/java/me/ccrama/redditslide/Fragments/ReadLaterView.java index fdd4217980..0bc98e01c0 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/ReadLaterView.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/ReadLaterView.java @@ -1,10 +1,10 @@ package me.ccrama.redditslide.Fragments; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.fragment.app.Fragment; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/SelftextFull.java b/app/src/main/java/me/ccrama/redditslide/Fragments/SelftextFull.java index 4471b178aa..5fc1979864 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/SelftextFull.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/SelftextFull.java @@ -2,7 +2,7 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsCommentsFragment.java b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsCommentsFragment.java index 759a8929ec..72f0983731 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsCommentsFragment.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsCommentsFragment.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.Fragments; import android.app.Activity; -import android.support.v7.widget.SwitchCompat; +import androidx.appcompat.widget.SwitchCompat; import android.widget.CompoundButton; import me.ccrama.redditslide.R; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsDataFragment.java b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsDataFragment.java index fba7060639..8678fadc06 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsDataFragment.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsDataFragment.java @@ -1,8 +1,8 @@ package me.ccrama.redditslide.Fragments; import android.app.Activity; -import android.support.v7.widget.PopupMenu; -import android.support.v7.widget.SwitchCompat; +import androidx.appcompat.widget.PopupMenu; +import androidx.appcompat.widget.SwitchCompat; import android.view.MenuItem; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsFontFragment.java b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsFontFragment.java index fc980ea7b5..4835d684f4 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsFontFragment.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsFontFragment.java @@ -1,8 +1,8 @@ package me.ccrama.redditslide.Fragments; import android.app.Activity; -import android.support.v7.widget.PopupMenu; -import android.support.v7.widget.SwitchCompat; +import androidx.appcompat.widget.PopupMenu; +import androidx.appcompat.widget.SwitchCompat; import android.view.MenuItem; import android.view.View; import android.widget.CompoundButton; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsGeneralFragment.java b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsGeneralFragment.java index 0537689fa6..2b894801e8 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsGeneralFragment.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsGeneralFragment.java @@ -8,11 +8,11 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Environment; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.PopupMenu; -import android.support.v7.widget.SwitchCompat; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.PopupMenu; +import androidx.appcompat.widget.SwitchCompat; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsHandlingFragment.java b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsHandlingFragment.java index e6f75d7e06..822c0e2e60 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsHandlingFragment.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsHandlingFragment.java @@ -4,9 +4,9 @@ import android.content.Intent; import android.net.Uri; import android.os.Build; -import android.support.annotation.IdRes; -import android.support.v7.widget.PopupMenu; -import android.support.v7.widget.SwitchCompat; +import androidx.annotation.IdRes; +import androidx.appcompat.widget.PopupMenu; +import androidx.appcompat.widget.SwitchCompat; import android.view.KeyEvent; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsHistoryFragment.java b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsHistoryFragment.java index cd7e1fc475..c7da354e7a 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsHistoryFragment.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsHistoryFragment.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.Fragments; import android.app.Activity; -import android.support.v7.widget.SwitchCompat; +import androidx.appcompat.widget.SwitchCompat; import android.view.View; import android.widget.CompoundButton; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsModerationFragment.java b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsModerationFragment.java index ba1ffb04c2..d6021295a9 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsModerationFragment.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsModerationFragment.java @@ -3,7 +3,7 @@ import android.app.Activity; import android.content.DialogInterface; import android.os.AsyncTask; -import android.support.v7.widget.SwitchCompat; +import androidx.appcompat.widget.SwitchCompat; import android.view.MenuItem; import android.view.View; import android.widget.CompoundButton; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsRedditFragment.java b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsRedditFragment.java index 7dcc923b41..73f1b1f6de 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsRedditFragment.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsRedditFragment.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.Fragments; import android.app.Activity; -import android.support.v7.widget.SwitchCompat; +import androidx.appcompat.widget.SwitchCompat; import android.view.View; import android.widget.CompoundButton; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsThemeFragment.java b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsThemeFragment.java index f73c00ed81..4d99cd4f3a 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsThemeFragment.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/SettingsThemeFragment.java @@ -9,13 +9,13 @@ import android.graphics.Color; import android.net.Uri; import android.os.Build; -import android.support.annotation.ArrayRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.AppCompatSpinner; -import android.support.v7.widget.PopupMenu; -import android.support.v7.widget.SwitchCompat; +import androidx.annotation.ArrayRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.appcompat.widget.AppCompatSpinner; +import androidx.appcompat.widget.PopupMenu; +import androidx.appcompat.widget.SwitchCompat; import android.util.Pair; import android.view.LayoutInflater; import android.view.MenuItem; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/SubmissionsView.java b/app/src/main/java/me/ccrama/redditslide/Fragments/SubmissionsView.java index f9378d219b..6a8626cffe 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/SubmissionsView.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/SubmissionsView.java @@ -9,15 +9,15 @@ import android.os.Build; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; -import android.support.v4.view.MarginLayoutParamsCompat; -import android.support.v4.view.animation.LinearOutSlowInInterpolator; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.view.ContextThemeWrapper; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.Fragment; +import androidx.core.view.MarginLayoutParamsCompat; +import androidx.interpolator.view.animation.LinearOutSlowInInterpolator; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.appcompat.view.ContextThemeWrapper; +import androidx.recyclerview.widget.RecyclerView; import android.view.GestureDetector; import android.view.HapticFeedbackConstants; import android.view.LayoutInflater; @@ -315,7 +315,7 @@ public void onClick(View v) { });*/ View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/SubredditListView.java b/app/src/main/java/me/ccrama/redditslide/Fragments/SubredditListView.java index c1c6bfeba1..7d458710b4 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/SubredditListView.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/SubredditListView.java @@ -2,12 +2,12 @@ import android.content.Context; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.view.animation.LinearOutSlowInInterpolator; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.view.ContextThemeWrapper; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.Fragment; +import androidx.interpolator.view.animation.LinearOutSlowInInterpolator; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.appcompat.view.ContextThemeWrapper; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/TitleFull.java b/app/src/main/java/me/ccrama/redditslide/Fragments/TitleFull.java index ff6052ac25..387c17395e 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/TitleFull.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/TitleFull.java @@ -2,7 +2,7 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/TopFragment.java b/app/src/main/java/me/ccrama/redditslide/Fragments/TopFragment.java index f2dfdd241a..789f436653 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/TopFragment.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/TopFragment.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.Fragments; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/TumblrFull.java b/app/src/main/java/me/ccrama/redditslide/Fragments/TumblrFull.java index b6d3024a68..2d1dc8bfa1 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/TumblrFull.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/TumblrFull.java @@ -5,9 +5,9 @@ import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/WikiPage.java b/app/src/main/java/me/ccrama/redditslide/Fragments/WikiPage.java index 0ec591f338..2b72b1093a 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/WikiPage.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/WikiPage.java @@ -3,8 +3,8 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/me/ccrama/redditslide/Notifications/CheckForMail.java b/app/src/main/java/me/ccrama/redditslide/Notifications/CheckForMail.java index 07eede8f3e..f2c9d801db 100644 --- a/app/src/main/java/me/ccrama/redditslide/Notifications/CheckForMail.java +++ b/app/src/main/java/me/ccrama/redditslide/Notifications/CheckForMail.java @@ -14,8 +14,8 @@ import android.content.res.Resources; import android.net.Uri; import android.os.AsyncTask; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationManagerCompat; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; import android.text.Html; import net.dean.jraw.models.Message; diff --git a/app/src/main/java/me/ccrama/redditslide/Notifications/CheckForMailSingle.java b/app/src/main/java/me/ccrama/redditslide/Notifications/CheckForMailSingle.java index a9567a47ab..82972c0991 100644 --- a/app/src/main/java/me/ccrama/redditslide/Notifications/CheckForMailSingle.java +++ b/app/src/main/java/me/ccrama/redditslide/Notifications/CheckForMailSingle.java @@ -13,8 +13,8 @@ import android.content.res.Resources; import android.net.Uri; import android.os.AsyncTask; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationManagerCompat; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; import android.text.Html; import net.dean.jraw.models.Message; diff --git a/app/src/main/java/me/ccrama/redditslide/Notifications/ImageDownloadNotificationService.java b/app/src/main/java/me/ccrama/redditslide/Notifications/ImageDownloadNotificationService.java index ba4f80d678..06f09d3e7d 100644 --- a/app/src/main/java/me/ccrama/redditslide/Notifications/ImageDownloadNotificationService.java +++ b/app/src/main/java/me/ccrama/redditslide/Notifications/ImageDownloadNotificationService.java @@ -13,7 +13,7 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.IBinder; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import android.util.Log; import android.view.View; import android.widget.Toast; diff --git a/app/src/main/java/me/ccrama/redditslide/Notifications/NotificationPiggyback.java b/app/src/main/java/me/ccrama/redditslide/Notifications/NotificationPiggyback.java index 41fbb89540..e3dc22f751 100644 --- a/app/src/main/java/me/ccrama/redditslide/Notifications/NotificationPiggyback.java +++ b/app/src/main/java/me/ccrama/redditslide/Notifications/NotificationPiggyback.java @@ -7,7 +7,7 @@ import android.os.Build; import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.text.TextUtils; import me.ccrama.redditslide.util.LogUtil; diff --git a/app/src/main/java/me/ccrama/redditslide/OpenRedditLink.java b/app/src/main/java/me/ccrama/redditslide/OpenRedditLink.java index edbb82c86c..c945db6148 100644 --- a/app/src/main/java/me/ccrama/redditslide/OpenRedditLink.java +++ b/app/src/main/java/me/ccrama/redditslide/OpenRedditLink.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/me/ccrama/redditslide/Reddit.java b/app/src/main/java/me/ccrama/redditslide/Reddit.java index 47f10788b1..622a53580c 100644 --- a/app/src/main/java/me/ccrama/redditslide/Reddit.java +++ b/app/src/main/java/me/ccrama/redditslide/Reddit.java @@ -13,7 +13,7 @@ import android.content.res.Resources; import android.net.Uri; import android.os.*; -import android.support.multidex.MultiDexApplication; +import androidx.multidex.MultiDexApplication; import android.text.Html; import android.util.DisplayMetrics; import android.util.Log; diff --git a/app/src/main/java/me/ccrama/redditslide/SpoilerRobotoTextView.java b/app/src/main/java/me/ccrama/redditslide/SpoilerRobotoTextView.java index 6ad108e20f..d92cf23d07 100644 --- a/app/src/main/java/me/ccrama/redditslide/SpoilerRobotoTextView.java +++ b/app/src/main/java/me/ccrama/redditslide/SpoilerRobotoTextView.java @@ -9,7 +9,8 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Environment; -import android.support.v4.content.ContextCompat; +import androidx.appcompat.view.ContextThemeWrapper; +import androidx.core.content.ContextCompat; import android.text.*; import android.text.style.*; import android.util.AttributeSet; @@ -358,9 +359,9 @@ public void onLinkClick(String url, int xOffset, String subreddit, URLSpan span) Activity activity = null; if (context instanceof Activity) { activity = (Activity) context; - } else if (context instanceof android.support.v7.view.ContextThemeWrapper) { + } else if (context instanceof ContextThemeWrapper) { activity = - (Activity) ((android.support.v7.view.ContextThemeWrapper) context).getBaseContext(); + (Activity) ((ContextThemeWrapper) context).getBaseContext(); } else if (context instanceof ContextWrapper) { Context context1 = ((ContextWrapper) context).getBaseContext(); if (context1 instanceof Activity) { @@ -371,7 +372,7 @@ public void onLinkClick(String url, int xOffset, String subreddit, URLSpan span) activity = (Activity) context2; } else if (context2 instanceof ContextWrapper) { activity = - (Activity) ((android.support.v7.view.ContextThemeWrapper) context2).getBaseContext(); + (Activity) ((ContextThemeWrapper) context2).getBaseContext(); } } } else { @@ -477,9 +478,9 @@ public void onLinkLongClick(final String baseUrl, MotionEvent event) { final Context context = getContext(); if (context instanceof Activity) { activity = (Activity) context; - } else if (context instanceof android.support.v7.view.ContextThemeWrapper) { + } else if (context instanceof ContextThemeWrapper) { activity = - (Activity) ((android.support.v7.view.ContextThemeWrapper) context).getBaseContext(); + (Activity) ((ContextThemeWrapper) context).getBaseContext(); } else if (context instanceof ContextWrapper) { Context context1 = ((ContextWrapper) context).getBaseContext(); if (context1 instanceof Activity) { @@ -490,7 +491,7 @@ public void onLinkLongClick(final String baseUrl, MotionEvent event) { activity = (Activity) context2; } else if (context2 instanceof ContextWrapper) { activity = - (Activity) ((android.support.v7.view.ContextThemeWrapper) context2).getBaseContext(); + (Activity) ((ContextThemeWrapper) context2).getBaseContext(); } } } else { diff --git a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/HeaderImageLinkView.java b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/HeaderImageLinkView.java index 66ee8042c9..816cadcdb1 100644 --- a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/HeaderImageLinkView.java +++ b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/HeaderImageLinkView.java @@ -10,7 +10,8 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Handler; -import android.support.v4.content.ContextCompat; +import androidx.appcompat.view.ContextThemeWrapper; +import androidx.core.content.ContextCompat; import android.text.Html; import android.util.AttributeSet; import android.view.HapticFeedbackConstants; @@ -521,9 +522,9 @@ public void onLinkLongClick(final String url, MotionEvent event) { final Context context = getContext(); if (context instanceof Activity) { activity = (Activity) context; - } else if (context instanceof android.support.v7.view.ContextThemeWrapper) { + } else if (context instanceof ContextThemeWrapper) { activity = - (Activity) ((android.support.v7.view.ContextThemeWrapper) context).getBaseContext(); + (Activity) ((ContextThemeWrapper) context).getBaseContext(); } else if (context instanceof ContextWrapper) { Context context1 = ((ContextWrapper) context).getBaseContext(); if (context1 instanceof Activity) { @@ -534,7 +535,7 @@ public void onLinkLongClick(final String url, MotionEvent event) { activity = (Activity) context2; } else if (context2 instanceof ContextWrapper) { activity = - (Activity) ((android.support.v7.view.ContextThemeWrapper) context2).getBaseContext(); + (Activity) ((ContextThemeWrapper) context2).getBaseContext(); } } } else { diff --git a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateNewsViewHolder.java b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateNewsViewHolder.java index 972d490be2..b5645bb5e9 100644 --- a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateNewsViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateNewsViewHolder.java @@ -13,11 +13,11 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.AsyncTask; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.res.ResourcesCompat; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.ContextCompat; +import androidx.core.content.res.ResourcesCompat; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.text.InputType; import android.text.SpannableStringBuilder; @@ -256,7 +256,7 @@ public void onSingleClick(View v) { Snackbar.LENGTH_SHORT); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -723,7 +723,7 @@ public void onClick(DialogInterface dialog, int which) { Snackbar.LENGTH_SHORT); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.setAction(R.string.btn_undo, new View.OnClickListener() { @Override @@ -733,7 +733,7 @@ public void onClick(View view) { "Removed from read later", Snackbar.LENGTH_SHORT); View view2 = s2.getView(); TextView tv2 = view2.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv2.setTextColor(Color.WHITE); s2.show(); } @@ -759,7 +759,7 @@ public void onClick(View view) { Snackbar.LENGTH_SHORT); View view2 = s2.getView(); TextView tv2 = view2.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv2.setTextColor(Color.WHITE); s2.setAction(R.string.btn_undo, new View.OnClickListener() { @Override @@ -774,7 +774,7 @@ public void onClick(View view) { Snackbar.LENGTH_SHORT); View view2 = s2.getView(); TextView tv2 = view2.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); s2.show(); } OfflineSubreddit.newSubreddit(CommentCacheAsync.SAVED_SUBMISSIONS) @@ -969,7 +969,7 @@ public void hideSubmission(final Submission submission, Snackbar snack = Snackbar.make(recyclerview, R.string.submission_info_unhidden, Snackbar.LENGTH_LONG); View view = snack.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); snack.show(); } else { @@ -1008,7 +1008,7 @@ public void onClick(View v) { } }); View view = snack.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); snack.show(); } @@ -1129,7 +1129,7 @@ public boolean onLongClick(View v) { Snackbar.make(holder.itemView, mContext.getString(R.string.offline_msg), Snackbar.LENGTH_SHORT); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } else { @@ -1177,7 +1177,7 @@ protected void onPostExecute(Void aVoid) { Snackbar s = Snackbar.make(contextView, R.string.msg_report_sent, Snackbar.LENGTH_SHORT); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } diff --git a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateShadowboxInfo.java b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateShadowboxInfo.java index 072c9f3e28..f84828f00b 100644 --- a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateShadowboxInfo.java +++ b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateShadowboxInfo.java @@ -12,8 +12,8 @@ import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.AsyncTask; -import android.support.design.widget.Snackbar; -import android.support.v4.content.ContextCompat; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.ContextCompat; import android.text.Html; import android.text.InputType; import android.text.SpannableStringBuilder; @@ -663,7 +663,7 @@ protected void onPostExecute(Void aVoid) { Snackbar s = Snackbar.make(contextView, R.string.msg_report_sent, Snackbar.LENGTH_SHORT); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } diff --git a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java index 2cdaa7b070..7551b03567 100644 --- a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java @@ -11,13 +11,13 @@ import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.res.ResourcesCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.ContextCompat; +import androidx.core.content.res.ResourcesCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.text.InputType; import android.text.SpannableStringBuilder; @@ -237,7 +237,7 @@ public void onSingleClick(View v) { Snackbar.LENGTH_SHORT); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -763,7 +763,7 @@ public void onClick(DialogInterface dialog, int which) { Snackbar.LENGTH_SHORT); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.setAction(R.string.btn_undo, new View.OnClickListener() { @Override @@ -773,7 +773,7 @@ public void onClick(View view) { "Removed from read later", Snackbar.LENGTH_SHORT); View view2 = s2.getView(); TextView tv2 = view2.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv2.setTextColor(Color.WHITE); s2.show(); } @@ -799,7 +799,7 @@ public void onClick(View view) { Snackbar.LENGTH_SHORT); View view2 = s2.getView(); TextView tv2 = view2.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv2.setTextColor(Color.WHITE); s2.setAction(R.string.btn_undo, new View.OnClickListener() { @Override @@ -814,7 +814,7 @@ public void onClick(View view) { Snackbar.LENGTH_SHORT); View view2 = s2.getView(); TextView tv2 = view2.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); s2.show(); } OfflineSubreddit.newSubreddit(CommentCacheAsync.SAVED_SUBMISSIONS) @@ -1057,7 +1057,7 @@ public void onClick(View v) { } View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } catch (Exception ignored) { @@ -1161,7 +1161,7 @@ protected void onPostExecute( s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor( Color.WHITE); s.show(); @@ -1176,7 +1176,7 @@ protected void onPostExecute( s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor( Color.WHITE); s.show(); @@ -1214,7 +1214,7 @@ protected void onPostExecute(Boolean done) { Snackbar.LENGTH_SHORT); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -1225,7 +1225,7 @@ protected void onPostExecute(Boolean done) { Snackbar.LENGTH_SHORT); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -1257,7 +1257,7 @@ public void hideSubmission(final Submission submission, Snackbar snack = Snackbar.make(recyclerview, R.string.submission_info_unhidden, Snackbar.LENGTH_LONG); View view = snack.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); snack.show(); } else { @@ -1296,7 +1296,7 @@ public void onClick(View v) { } }); View view = snack.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); snack.show(); } @@ -1547,7 +1547,7 @@ public void onComplete(boolean success) { Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -1657,7 +1657,7 @@ public void onPostExecute(Boolean b) { Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -1718,7 +1718,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, R.string.submission_removed, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -1862,7 +1862,7 @@ protected void onPostExecute(Boolean done) { } if (s != null) { View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -1918,7 +1918,7 @@ public void onPostExecute(Boolean b) { Snackbar.make(holder.itemView, R.string.really_pin_submission_message, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -1954,7 +1954,7 @@ public void onPostExecute(Boolean b) { Snackbar.make(holder.itemView, R.string.really_unpin_submission_message, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -1989,7 +1989,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, R.string.mod_locked, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -2024,7 +2024,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, R.string.mod_unlocked, Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -2059,7 +2059,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, "Submission distinguished", Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -2095,7 +2095,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, "Submission distinguish removed", Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -2131,7 +2131,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, "NSFW status set", Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -2168,7 +2168,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, "NSFW status removed", Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -2204,7 +2204,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, "Spoiler status set", Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -2241,7 +2241,7 @@ public void onPostExecute(Boolean b) { Snackbar s = Snackbar.make(holder.itemView, "Spoiler status removed", Snackbar.LENGTH_LONG); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); @@ -2298,7 +2298,7 @@ public void onPostExecute(Boolean b) { Snackbar.LENGTH_LONG); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } catch (Exception ignored) { @@ -2473,7 +2473,7 @@ public void onClick(View v) { { View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -2751,7 +2751,7 @@ public boolean onLongClick(View v) { Snackbar.make(holder.itemView, mContext.getString(R.string.offline_msg), Snackbar.LENGTH_SHORT); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } else { @@ -3332,7 +3332,7 @@ protected void onPostExecute( tv = view .findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor( Color.WHITE); s.show(); @@ -3406,7 +3406,7 @@ protected void onPostExecute( TextView tv = view .findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor( Color.WHITE); s.show(); @@ -3541,7 +3541,7 @@ protected void onPostExecute(Void aVoid) { try { Snackbar s = Snackbar.make(contextView, R.string.msg_report_sent, Snackbar.LENGTH_SHORT); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } catch (Exception ignored) { diff --git a/app/src/main/java/me/ccrama/redditslide/SwipeLayout/SwipeBackLayout.java b/app/src/main/java/me/ccrama/redditslide/SwipeLayout/SwipeBackLayout.java index 6e682d3e56..0b7f08a007 100644 --- a/app/src/main/java/me/ccrama/redditslide/SwipeLayout/SwipeBackLayout.java +++ b/app/src/main/java/me/ccrama/redditslide/SwipeLayout/SwipeBackLayout.java @@ -6,7 +6,7 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/SwipeLayout/app/SwipeBackActivity.java b/app/src/main/java/me/ccrama/redditslide/SwipeLayout/app/SwipeBackActivity.java index 2aa4c05f40..439e8f70ee 100644 --- a/app/src/main/java/me/ccrama/redditslide/SwipeLayout/app/SwipeBackActivity.java +++ b/app/src/main/java/me/ccrama/redditslide/SwipeLayout/app/SwipeBackActivity.java @@ -2,7 +2,7 @@ package me.ccrama.redditslide.SwipeLayout.app; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import me.ccrama.redditslide.SwipeLayout.SwipeBackLayout; diff --git a/app/src/main/java/me/ccrama/redditslide/Toolbox/ToolboxUI.java b/app/src/main/java/me/ccrama/redditslide/Toolbox/ToolboxUI.java index 8b1e501a72..bf43150049 100644 --- a/app/src/main/java/me/ccrama/redditslide/Toolbox/ToolboxUI.java +++ b/app/src/main/java/me/ccrama/redditslide/Toolbox/ToolboxUI.java @@ -4,8 +4,8 @@ import android.content.Intent; import android.graphics.Color; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.Spanned; diff --git a/app/src/main/java/me/ccrama/redditslide/Toolbox/Usernotes.java b/app/src/main/java/me/ccrama/redditslide/Toolbox/Usernotes.java index bdc714ab0b..562cacb87e 100644 --- a/app/src/main/java/me/ccrama/redditslide/Toolbox/Usernotes.java +++ b/app/src/main/java/me/ccrama/redditslide/Toolbox/Usernotes.java @@ -1,6 +1,6 @@ package me.ccrama.redditslide.Toolbox; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; import android.util.Base64; import com.google.android.exoplayer2.util.ColorParser; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/AnimateHelper.java b/app/src/main/java/me/ccrama/redditslide/Views/AnimateHelper.java index 45db352a3b..af059e5482 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/AnimateHelper.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/AnimateHelper.java @@ -2,7 +2,7 @@ import android.animation.Animator; import android.animation.ObjectAnimator; -import android.support.v4.view.animation.FastOutSlowInInterpolator; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import android.view.View; import android.view.animation.AccelerateDecelerateInterpolator; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/AutoHideFAB.java b/app/src/main/java/me/ccrama/redditslide/Views/AutoHideFAB.java index 9c4012d928..f04c90ffef 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/AutoHideFAB.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/AutoHideFAB.java @@ -1,9 +1,9 @@ package me.ccrama.redditslide.Views; import android.content.Context; -import android.support.design.widget.CoordinatorLayout; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.view.ViewCompat; +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.core.view.ViewCompat; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/CatchStaggeredGridLayoutManager.java b/app/src/main/java/me/ccrama/redditslide/Views/CatchStaggeredGridLayoutManager.java index 2b214bd62d..9d7ebb3e88 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/CatchStaggeredGridLayoutManager.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/CatchStaggeredGridLayoutManager.java @@ -1,8 +1,8 @@ package me.ccrama.redditslide.Views; import android.content.Context; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.StaggeredGridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; import android.util.AttributeSet; import me.ccrama.redditslide.util.LogUtil; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/CreateCardView.java b/app/src/main/java/me/ccrama/redditslide/Views/CreateCardView.java index 5738bd070e..133819b1e1 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/CreateCardView.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/CreateCardView.java @@ -6,8 +6,8 @@ import android.graphics.Color; import android.graphics.PorterDuff; import android.os.Build; -import android.support.v4.view.animation.FastOutSlowInInterpolator; -import android.support.v7.widget.CardView; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; +import androidx.cardview.widget.CardView; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/DoEditorActions.java b/app/src/main/java/me/ccrama/redditslide/Views/DoEditorActions.java index de4908a376..e228e210fb 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/DoEditorActions.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/DoEditorActions.java @@ -7,12 +7,12 @@ import android.graphics.Color; import android.net.Uri; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.core.content.ContextCompat; import android.text.Editable; import android.util.Base64; import android.view.LayoutInflater; @@ -151,7 +151,7 @@ public void onClick(View v) { Snackbar s = Snackbar.make(baseView.findViewById(R.id.savedraft), "Draft saved", Snackbar.LENGTH_SHORT); View view = s.getView(); - TextView tv = view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.setAction(R.string.btn_discard, new View.OnClickListener() { @Override diff --git a/app/src/main/java/me/ccrama/redditslide/Views/GeneralSwipeRefreshLayout.java b/app/src/main/java/me/ccrama/redditslide/Views/GeneralSwipeRefreshLayout.java index ec3b5f0e2a..efd89d5144 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/GeneralSwipeRefreshLayout.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/GeneralSwipeRefreshLayout.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.Views; import android.content.Context; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.util.AttributeSet; /** diff --git a/app/src/main/java/me/ccrama/redditslide/Views/ImageInsertEditText.java b/app/src/main/java/me/ccrama/redditslide/Views/ImageInsertEditText.java index 0b36b8258c..653ead0fe8 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/ImageInsertEditText.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/ImageInsertEditText.java @@ -4,9 +4,9 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.v13.view.inputmethod.EditorInfoCompat; -import android.support.v13.view.inputmethod.InputConnectionCompat; -import android.support.v13.view.inputmethod.InputContentInfoCompat; +import androidx.core.view.inputmethod.EditorInfoCompat; +import androidx.core.view.inputmethod.InputConnectionCompat; +import androidx.core.view.inputmethod.InputContentInfoCompat; import android.util.AttributeSet; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputConnection; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/NestedWebView.java b/app/src/main/java/me/ccrama/redditslide/Views/NestedWebView.java index 6ae233aeb6..81f1ecf586 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/NestedWebView.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/NestedWebView.java @@ -1,11 +1,11 @@ package me.ccrama.redditslide.Views; import android.content.Context; -import android.support.v4.view.MotionEventCompat; -import android.support.v4.view.NestedScrollingChild; -import android.support.v4.view.NestedScrollingChildHelper; -import android.support.v4.view.NestedScrollingParent; -import android.support.v4.view.ViewCompat; +import androidx.core.view.MotionEventCompat; +import androidx.core.view.NestedScrollingChild; +import androidx.core.view.NestedScrollingChildHelper; +import androidx.core.view.NestedScrollingParent; +import androidx.core.view.ViewCompat; import android.util.AttributeSet; import android.util.Log; import android.view.MotionEvent; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/PreCachingLayoutManager.java b/app/src/main/java/me/ccrama/redditslide/Views/PreCachingLayoutManager.java index 8d07625b6d..cd60f93f1c 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/PreCachingLayoutManager.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/PreCachingLayoutManager.java @@ -1,8 +1,8 @@ package me.ccrama.redditslide.Views; import android.content.Context; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import me.ccrama.redditslide.util.LogUtil; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/PreCachingLayoutManagerComments.java b/app/src/main/java/me/ccrama/redditslide/Views/PreCachingLayoutManagerComments.java index 84bf1915ac..a2f9c67321 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/PreCachingLayoutManagerComments.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/PreCachingLayoutManagerComments.java @@ -1,8 +1,8 @@ package me.ccrama.redditslide.Views; import android.content.Context; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import me.ccrama.redditslide.util.LogUtil; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/RedditItemView.java b/app/src/main/java/me/ccrama/redditslide/Views/RedditItemView.java index 0c6e0d46f3..c0850fb9cd 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/RedditItemView.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/RedditItemView.java @@ -7,7 +7,7 @@ import android.graphics.Typeface; import android.net.Uri; import android.os.AsyncTask; -import android.support.v7.widget.AppCompatCheckBox; +import androidx.appcompat.widget.AppCompatCheckBox; import android.text.Html; import android.text.SpannableStringBuilder; import android.text.Spanned; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/RoundImageTriangleView.java b/app/src/main/java/me/ccrama/redditslide/Views/RoundImageTriangleView.java index fb27a4d1ce..59944637fd 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/RoundImageTriangleView.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/RoundImageTriangleView.java @@ -5,7 +5,7 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.Path; -import android.support.annotation.ColorRes; +import androidx.annotation.ColorRes; import android.util.AttributeSet; import com.makeramen.roundedimageview.RoundedImageView; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/RoundedBackgroundSpan.java b/app/src/main/java/me/ccrama/redditslide/Views/RoundedBackgroundSpan.java index 384ce614b5..185c309403 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/RoundedBackgroundSpan.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/RoundedBackgroundSpan.java @@ -4,8 +4,8 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.RectF; -import android.support.annotation.ColorInt; -import android.support.annotation.ColorRes; +import androidx.annotation.ColorInt; +import androidx.annotation.ColorRes; import android.text.style.ReplacementSpan; import com.devspark.robototextview.RobotoTypefaces; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/ScalableTextureView.java b/app/src/main/java/me/ccrama/redditslide/Views/ScalableTextureView.java index ef09e91823..5253fe0121 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/ScalableTextureView.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/ScalableTextureView.java @@ -6,7 +6,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.AttributeSet; import android.util.Log; import android.util.TypedValue; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/SidebarLayout.java b/app/src/main/java/me/ccrama/redditslide/Views/SidebarLayout.java index 50f8a3640f..98c15ff20c 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/SidebarLayout.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/SidebarLayout.java @@ -2,7 +2,7 @@ import android.content.Context; import android.graphics.Rect; -import android.support.v4.widget.DrawerLayout; +import androidx.drawerlayout.widget.DrawerLayout; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/SubsamplingScaleImageView.java b/app/src/main/java/me/ccrama/redditslide/Views/SubsamplingScaleImageView.java index 4d929fdfd9..7ac83a13e1 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/SubsamplingScaleImageView.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/SubsamplingScaleImageView.java @@ -39,8 +39,8 @@ import android.os.Handler; import android.os.Message; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.v4.view.animation.FastOutSlowInInterpolator; +import androidx.annotation.NonNull; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.Log; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/ToggleSwipeViewPager.java b/app/src/main/java/me/ccrama/redditslide/Views/ToggleSwipeViewPager.java index 30aea81fa9..da3eb83eb1 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/ToggleSwipeViewPager.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/ToggleSwipeViewPager.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.Views; import android.content.Context; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/ToolbarColorizeHelper.java b/app/src/main/java/me/ccrama/redditslide/Views/ToolbarColorizeHelper.java index c92cc24b52..fb22e60fa7 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/ToolbarColorizeHelper.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/ToolbarColorizeHelper.java @@ -17,9 +17,9 @@ import android.app.Activity; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; -import android.support.v7.view.menu.ActionMenuItemView; -import android.support.v7.widget.ActionMenuView; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.view.menu.ActionMenuItemView; +import androidx.appcompat.widget.ActionMenuView; +import androidx.appcompat.widget.Toolbar; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; diff --git a/app/src/main/java/me/ccrama/redditslide/Views/VerticalViewPager.java b/app/src/main/java/me/ccrama/redditslide/Views/VerticalViewPager.java index 36fbf5eb55..f0b4a125ba 100644 --- a/app/src/main/java/me/ccrama/redditslide/Views/VerticalViewPager.java +++ b/app/src/main/java/me/ccrama/redditslide/Views/VerticalViewPager.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.Views; import android.content.Context; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/java/me/ccrama/redditslide/Visuals/GetClosestColor.java b/app/src/main/java/me/ccrama/redditslide/Visuals/GetClosestColor.java index d8958f171f..f042f11e7f 100644 --- a/app/src/main/java/me/ccrama/redditslide/Visuals/GetClosestColor.java +++ b/app/src/main/java/me/ccrama/redditslide/Visuals/GetClosestColor.java @@ -3,7 +3,7 @@ import android.content.Context; import android.graphics.Color; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import java.util.Map; import java.util.TreeMap; diff --git a/app/src/main/java/me/ccrama/redditslide/Vote.java b/app/src/main/java/me/ccrama/redditslide/Vote.java index 24a90cc0f0..f98baf5391 100644 --- a/app/src/main/java/me/ccrama/redditslide/Vote.java +++ b/app/src/main/java/me/ccrama/redditslide/Vote.java @@ -4,7 +4,7 @@ import android.content.Context; import android.graphics.Color; import android.os.AsyncTask; -import android.support.design.widget.Snackbar; +import com.google.android.material.snackbar.Snackbar; import android.view.View; import android.widget.TextView; @@ -52,7 +52,7 @@ public void run() { if (v != null && c != null && v.getContext() != null) { Snackbar s = Snackbar.make(v, R.string.vote_err, Snackbar.LENGTH_SHORT); View view = s.getView(); - TextView tv = (TextView) view.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = (TextView) view.findViewById(com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } @@ -72,7 +72,7 @@ public void run() { if (v != null && c != null && v.getContext() != null) { Snackbar s = Snackbar.make(v, R.string.vote_err_login, Snackbar.LENGTH_SHORT); View view = s.getView(); - TextView tv = (TextView) view.findViewById(android.support.design.R.id.snackbar_text); + TextView 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/me/ccrama/redditslide/handler/ToolbarScrollHideHandler.java b/app/src/main/java/me/ccrama/redditslide/handler/ToolbarScrollHideHandler.java index 8c87b7cc35..01bfe355b5 100644 --- a/app/src/main/java/me/ccrama/redditslide/handler/ToolbarScrollHideHandler.java +++ b/app/src/main/java/me/ccrama/redditslide/handler/ToolbarScrollHideHandler.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.handler; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.View; import android.view.animation.LinearInterpolator; diff --git a/app/src/main/java/me/ccrama/redditslide/util/AdBlocker.java b/app/src/main/java/me/ccrama/redditslide/util/AdBlocker.java index c0ca2b1bbc..af725781c7 100644 --- a/app/src/main/java/me/ccrama/redditslide/util/AdBlocker.java +++ b/app/src/main/java/me/ccrama/redditslide/util/AdBlocker.java @@ -2,7 +2,7 @@ import android.content.Context; import android.os.AsyncTask; -import android.support.annotation.WorkerThread; +import androidx.annotation.WorkerThread; import android.webkit.WebResourceResponse; import java.io.ByteArrayInputStream; diff --git a/app/src/main/java/me/ccrama/redditslide/util/FileUtil.java b/app/src/main/java/me/ccrama/redditslide/util/FileUtil.java index 6a1a226e51..4e1c9396a5 100644 --- a/app/src/main/java/me/ccrama/redditslide/util/FileUtil.java +++ b/app/src/main/java/me/ccrama/redditslide/util/FileUtil.java @@ -3,7 +3,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; import java.io.File; diff --git a/app/src/main/java/me/ccrama/redditslide/util/GifUtils.java b/app/src/main/java/me/ccrama/redditslide/util/GifUtils.java index 742c0fede8..0eb23b479b 100644 --- a/app/src/main/java/me/ccrama/redditslide/util/GifUtils.java +++ b/app/src/main/java/me/ccrama/redditslide/util/GifUtils.java @@ -16,8 +16,8 @@ import android.os.AsyncTask; import android.os.Environment; import android.os.Looper; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; diff --git a/app/src/main/java/me/ccrama/redditslide/util/HttpUtil.java b/app/src/main/java/me/ccrama/redditslide/util/HttpUtil.java index e0c3ccf54f..c8392eb4c9 100644 --- a/app/src/main/java/me/ccrama/redditslide/util/HttpUtil.java +++ b/app/src/main/java/me/ccrama/redditslide/util/HttpUtil.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.util; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.google.gson.Gson; diff --git a/app/src/main/java/me/ccrama/redditslide/util/LinkUtil.java b/app/src/main/java/me/ccrama/redditslide/util/LinkUtil.java index 285c194985..665774d393 100644 --- a/app/src/main/java/me/ccrama/redditslide/util/LinkUtil.java +++ b/app/src/main/java/me/ccrama/redditslide/util/LinkUtil.java @@ -11,10 +11,10 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.customtabs.*; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.browser.customtabs.*; +import androidx.core.content.ContextCompat; import android.text.Html; import android.util.Log; import android.widget.Toast; diff --git a/app/src/main/res/layout/account_pop.xml b/app/src/main/res/layout/account_pop.xml index 35e5151669..0cd32c02fd 100644 --- a/app/src/main/res/layout/account_pop.xml +++ b/app/src/main/res/layout/account_pop.xml @@ -1,4 +1,4 @@ - - + diff --git a/app/src/main/res/layout/activity_createmulti.xml b/app/src/main/res/layout/activity_createmulti.xml index 441019e907..4f0755f953 100644 --- a/app/src/main/res/layout/activity_createmulti.xml +++ b/app/src/main/res/layout/activity_createmulti.xml @@ -6,7 +6,7 @@ android:background="?attr/activity_background" android:orientation="vertical"> - - + - - + - - + - - @@ -48,9 +48,9 @@ android:imeOptions="flagNavigateNext" android:textColor="?attr/fontColor" android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-" /> - + - @@ -64,7 +64,7 @@ android:inputType="text|textCapSentences" android:maxLines="1" android:maxLength="300" /> - + - - + @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - @@ -99,7 +99,7 @@ android:textCursorDrawable="@drawable/cursor" android:backgroundTint="?attr/tintColor" android:hint="@string/btn_crosspost" /> - + - + - - - - - @@ -15,7 +15,7 @@ android:layout_gravity="center_vertical|right" android:adjustViewBounds="true" android:background="@drawable/circle" /> - + - - + - - - - + diff --git a/app/src/main/res/layout/activity_inbox.xml b/app/src/main/res/layout/activity_inbox.xml index 1a206dad56..477d91897c 100644 --- a/app/src/main/res/layout/activity_inbox.xml +++ b/app/src/main/res/layout/activity_inbox.xml @@ -5,12 +5,12 @@ android:layout_height="match_parent" android:background="?attr/activity_background"> - - - - + - - + diff --git a/app/src/main/res/layout/activity_livethread.xml b/app/src/main/res/layout/activity_livethread.xml index 7ac4d13ae8..9dda6d590a 100644 --- a/app/src/main/res/layout/activity_livethread.xml +++ b/app/src/main/res/layout/activity_livethread.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - @@ -18,14 +18,14 @@ android:layout_marginEnd="3dp" android:layout_marginTop="4dp" /> - - - - - + + - - - - - - - - + - + diff --git a/app/src/main/res/layout/activity_news.xml b/app/src/main/res/layout/activity_news.xml index 266a3a9fff..6cd3d0f44f 100644 --- a/app/src/main/res/layout/activity_news.xml +++ b/app/src/main/res/layout/activity_news.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/activity_overview.xml b/app/src/main/res/layout/activity_overview.xml index b1d0ab76c1..d8f7534ce4 100644 --- a/app/src/main/res/layout/activity_overview.xml +++ b/app/src/main/res/layout/activity_overview.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:background="?attr/activity_background"> - @@ -23,12 +23,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - - - + - + - - - + + - - - - - - + - - - + + diff --git a/app/src/main/res/layout/activity_read_later.xml b/app/src/main/res/layout/activity_read_later.xml index ab738c4a8b..9cd546a924 100644 --- a/app/src/main/res/layout/activity_read_later.xml +++ b/app/src/main/res/layout/activity_read_later.xml @@ -1,5 +1,5 @@ - - - - - - - + + + diff --git a/app/src/main/res/layout/activity_reader.xml b/app/src/main/res/layout/activity_reader.xml index f8dec8d9f0..70dab22b59 100644 --- a/app/src/main/res/layout/activity_reader.xml +++ b/app/src/main/res/layout/activity_reader.xml @@ -1,24 +1,24 @@ - - - - + app:layout_scrollFlags="scroll|enterAlways"> - + - @@ -48,7 +48,7 @@ android:paddingTop="16dp" android:textColor="?attr/fontColor" android:textSize="?attr/font_commentbody"/> - - - + + + diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 104c9d579a..1658578e5d 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -1,5 +1,5 @@ - - - + - - - - + + diff --git a/app/src/main/res/layout/activity_sendmessage.xml b/app/src/main/res/layout/activity_sendmessage.xml index 47e09ef5e7..95287f4284 100644 --- a/app/src/main/res/layout/activity_sendmessage.xml +++ b/app/src/main/res/layout/activity_sendmessage.xml @@ -6,7 +6,7 @@ android:background="?attr/activity_background" android:orientation="vertical"> - - + - - - + - @@ -93,14 +93,14 @@ android:inputType="text|textCapSentences|textAutoComplete|textAutoCorrect" android:textColor="?attr/fontColor"> - + - @@ -114,7 +114,7 @@ android:imeOptions="actionDone|flagNoEnterAction" android:inputType="textMultiLine|textAutoCorrect|textCapSentences|textAutoComplete" android:textColor="?attr/fontColor" /> - + - + - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_settings_comments_child.xml b/app/src/main/res/layout/activity_settings_comments_child.xml index a998dd6033..cbfcb13ad0 100644 --- a/app/src/main/res/layout/activity_settings_comments_child.xml +++ b/app/src/main/res/layout/activity_settings_comments_child.xml @@ -40,7 +40,7 @@ android:textSize="14sp" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + cardview:cardCornerRadius="2dp" /> - - - - - - - - - - - - - - - - - - @@ -23,7 +23,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - - - - + + - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_slide_popup.xml b/app/src/main/res/layout/activity_slide_popup.xml index 27e0f7970d..097f5d2eb6 100644 --- a/app/src/main/res/layout/activity_slide_popup.xml +++ b/app/src/main/res/layout/activity_slide_popup.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent"> - - - - - + - - + - + diff --git a/app/src/main/res/layout/activity_sort.xml b/app/src/main/res/layout/activity_sort.xml index dbac60bde3..7da5f39e09 100644 --- a/app/src/main/res/layout/activity_sort.xml +++ b/app/src/main/res/layout/activity_sort.xml @@ -7,7 +7,7 @@ android:background="?attr/card_background" android:orientation="vertical"> - - + - - + - - + - - @@ -84,9 +84,9 @@ android:imeOptions="flagNavigateNext" android:textColor="?attr/fontColor" android:digits="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-" /> - + - @@ -100,7 +100,7 @@ android:inputType="text|textAutoCorrect|textCapSentences" android:maxLines="1" android:maxLength="300" /> - + - @@ -122,7 +122,7 @@ android:imeOptions="actionDone|flagNoEnterAction" android:inputType="textMultiLine|textAutoCorrect|textCapSentences" android:textColor="?attr/fontColor" /> - + @@ -174,7 +174,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - @@ -185,7 +185,7 @@ android:textCursorDrawable="@drawable/cursor" android:backgroundTint="?attr/tintColor" android:hint="@string/editor_url" /> - + - + - - - diff --git a/app/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml index 0200fae6a5..a6264ceaed 100644 --- a/app/src/main/res/layout/activity_web.xml +++ b/app/src/main/res/layout/activity_web.xml @@ -1,18 +1,18 @@ - - - - + - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/album.xml b/app/src/main/res/layout/album.xml index 4c8930f448..0f31745002 100644 --- a/app/src/main/res/layout/album.xml +++ b/app/src/main/res/layout/album.xml @@ -7,7 +7,7 @@ android:orientation="vertical"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/album_pager.xml b/app/src/main/res/layout/album_pager.xml index e64311145e..f2525e7f5f 100644 --- a/app/src/main/res/layout/album_pager.xml +++ b/app/src/main/res/layout/album_pager.xml @@ -5,7 +5,7 @@ android:background="#b3000000" android:orientation="vertical"> - - + - - - + diff --git a/app/src/main/res/layout/chooseaccent.xml b/app/src/main/res/layout/chooseaccent.xml index c8777c1556..17e4e5d764 100644 --- a/app/src/main/res/layout/chooseaccent.xml +++ b/app/src/main/res/layout/chooseaccent.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/choosemain.xml b/app/src/main/res/layout/choosemain.xml index 06ab148c47..bd5e902804 100644 --- a/app/src/main/res/layout/choosemain.xml +++ b/app/src/main/res/layout/choosemain.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/choosethemesmall.xml b/app/src/main/res/layout/choosethemesmall.xml index 635cf90b52..2ed29031ba 100644 --- a/app/src/main/res/layout/choosethemesmall.xml +++ b/app/src/main/res/layout/choosethemesmall.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/colorprofile.xml b/app/src/main/res/layout/colorprofile.xml index ccf9b173d4..7810ef22cf 100644 --- a/app/src/main/res/layout/colorprofile.xml +++ b/app/src/main/res/layout/colorprofile.xml @@ -319,7 +319,7 @@ android:layout_marginEnd="24dp" app:selectedColorIndex="5" /> - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/commenttime.xml b/app/src/main/res/layout/commenttime.xml index f638f69124..05f0ebc507 100644 --- a/app/src/main/res/layout/commenttime.xml +++ b/app/src/main/res/layout/commenttime.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + diff --git a/app/src/main/res/layout/drawer_loggedin.xml b/app/src/main/res/layout/drawer_loggedin.xml index 32b3592568..6d5cb8722d 100644 --- a/app/src/main/res/layout/drawer_loggedin.xml +++ b/app/src/main/res/layout/drawer_loggedin.xml @@ -572,7 +572,7 @@ android:orientation="vertical" android:visibility="gone"> - - - - - - - - - - - - - - - - - - - - - + - - - - - - + - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/image.xml b/app/src/main/res/layout/image.xml index 06a5978f4e..26ac19db3a 100644 --- a/app/src/main/res/layout/image.xml +++ b/app/src/main/res/layout/image.xml @@ -2,7 +2,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - diff --git a/app/src/main/res/layout/image_sheet_dialog.xml b/app/src/main/res/layout/image_sheet_dialog.xml index 15ecf5fff1..11f50dc534 100644 --- a/app/src/main/res/layout/image_sheet_dialog.xml +++ b/app/src/main/res/layout/image_sheet_dialog.xml @@ -19,7 +19,7 @@ /> - - - + diff --git a/app/src/main/res/layout/live_list_item.xml b/app/src/main/res/layout/live_list_item.xml index 7009ec7110..2dd9d32ab4 100644 --- a/app/src/main/res/layout/live_list_item.xml +++ b/app/src/main/res/layout/live_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/message_reply.xml b/app/src/main/res/layout/message_reply.xml index a641e2a3b9..19d70da700 100644 --- a/app/src/main/res/layout/message_reply.xml +++ b/app/src/main/res/layout/message_reply.xml @@ -1,4 +1,4 @@ - - + diff --git a/app/src/main/res/layout/mod_action.xml b/app/src/main/res/layout/mod_action.xml index 3c73936af3..ae1bf12f06 100644 --- a/app/src/main/res/layout/mod_action.xml +++ b/app/src/main/res/layout/mod_action.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/nightmode.xml b/app/src/main/res/layout/nightmode.xml index 538ab22605..e730b2507f 100644 --- a/app/src/main/res/layout/nightmode.xml +++ b/app/src/main/res/layout/nightmode.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - + - - + - - + diff --git a/app/src/main/res/layout/peek_media_view.xml b/app/src/main/res/layout/peek_media_view.xml index e846ba34b3..724c30f4be 100644 --- a/app/src/main/res/layout/peek_media_view.xml +++ b/app/src/main/res/layout/peek_media_view.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/postmenu.xml b/app/src/main/res/layout/postmenu.xml index 4555ff11f2..8ed9c21ea2 100644 --- a/app/src/main/res/layout/postmenu.xml +++ b/app/src/main/res/layout/postmenu.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + diff --git a/app/src/main/res/layout/profile_comment.xml b/app/src/main/res/layout/profile_comment.xml index f99a76cd43..85f4874f4a 100644 --- a/app/src/main/res/layout/profile_comment.xml +++ b/app/src/main/res/layout/profile_comment.xml @@ -1,4 +1,4 @@ - - + diff --git a/app/src/main/res/layout/settings_toolbar.xml b/app/src/main/res/layout/settings_toolbar.xml index 77e40716b9..ac5ecce756 100644 --- a/app/src/main/res/layout/settings_toolbar.xml +++ b/app/src/main/res/layout/settings_toolbar.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/sharemenu.xml b/app/src/main/res/layout/sharemenu.xml index 0ee61c063f..68930264c8 100644 --- a/app/src/main/res/layout/sharemenu.xml +++ b/app/src/main/res/layout/sharemenu.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + diff --git a/app/src/main/res/layout/subforsublistdrag.xml b/app/src/main/res/layout/subforsublistdrag.xml index 096d6e4a80..02c29e4618 100644 --- a/app/src/main/res/layout/subforsublistdrag.xml +++ b/app/src/main/res/layout/subforsublistdrag.xml @@ -60,7 +60,7 @@ android:textColor="?attr/fontColor" android:textSize="16sp" android:text="Android"/> - - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/submission_largecard.xml b/app/src/main/res/layout/submission_largecard.xml index 2759c40f49..37f0dfaad3 100644 --- a/app/src/main/res/layout/submission_largecard.xml +++ b/app/src/main/res/layout/submission_largecard.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/submission_largecard_middle.xml b/app/src/main/res/layout/submission_largecard_middle.xml index 244e03abb5..f0f3f7e26c 100644 --- a/app/src/main/res/layout/submission_largecard_middle.xml +++ b/app/src/main/res/layout/submission_largecard_middle.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/submission_list.xml b/app/src/main/res/layout/submission_list.xml index e56beeaa3c..824188ff58 100644 --- a/app/src/main/res/layout/submission_list.xml +++ b/app/src/main/res/layout/submission_list.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/submission_list_desktop.xml b/app/src/main/res/layout/submission_list_desktop.xml index 25dea05174..26f0ecfeeb 100644 --- a/app/src/main/res/layout/submission_list_desktop.xml +++ b/app/src/main/res/layout/submission_list_desktop.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/submission_news.xml b/app/src/main/res/layout/submission_news.xml index 3753cd6966..e3024b050f 100644 --- a/app/src/main/res/layout/submission_news.xml +++ b/app/src/main/res/layout/submission_news.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/subreddit_pop.xml b/app/src/main/res/layout/subreddit_pop.xml index 67700918ea..805f9d6322 100644 --- a/app/src/main/res/layout/subreddit_pop.xml +++ b/app/src/main/res/layout/subreddit_pop.xml @@ -1,4 +1,4 @@ - - - + diff --git a/app/src/main/res/layout/tabletui.xml b/app/src/main/res/layout/tabletui.xml index 830b505b22..083816e5b3 100644 --- a/app/src/main/res/layout/tabletui.xml +++ b/app/src/main/res/layout/tabletui.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - - + diff --git a/app/src/main/res/layout/top_level_message.xml b/app/src/main/res/layout/top_level_message.xml index 004f2f3cf8..7e6f0010c4 100644 --- a/app/src/main/res/layout/top_level_message.xml +++ b/app/src/main/res/layout/top_level_message.xml @@ -1,4 +1,4 @@ - - + diff --git a/app/src/noGPlay/java/me/ccrama/redditslide/Activities/SettingsBackup.java b/app/src/noGPlay/java/me/ccrama/redditslide/Activities/SettingsBackup.java index 8efd6962ea..1c045783e7 100644 --- a/app/src/noGPlay/java/me/ccrama/redditslide/Activities/SettingsBackup.java +++ b/app/src/noGPlay/java/me/ccrama/redditslide/Activities/SettingsBackup.java @@ -7,7 +7,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; -import android.support.design.widget.Snackbar; +import com.google.android.material.snackbar.Snackbar; import android.util.Log; import android.view.View; import android.widget.TextView; @@ -350,7 +350,7 @@ public void onClick(DialogInterface dialog, int which) { Snackbar.LENGTH_INDEFINITE); View view = s.getView(); TextView tv = view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } diff --git a/app/src/test/java/me/ccrama/redditslide/test/TestUtils.java b/app/src/test/java/me/ccrama/redditslide/test/TestUtils.java index 8a5dca931c..a11e00971b 100644 --- a/app/src/test/java/me/ccrama/redditslide/test/TestUtils.java +++ b/app/src/test/java/me/ccrama/redditslide/test/TestUtils.java @@ -1,7 +1,7 @@ package me.ccrama.redditslide.test; import android.content.SharedPreferences; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.apache.commons.io.IOUtils; diff --git a/app/src/withGPlay/java/me/ccrama/redditslide/Activities/SettingsBackup.java b/app/src/withGPlay/java/me/ccrama/redditslide/Activities/SettingsBackup.java index 32f72ef63f..9befb20f1c 100644 --- a/app/src/withGPlay/java/me/ccrama/redditslide/Activities/SettingsBackup.java +++ b/app/src/withGPlay/java/me/ccrama/redditslide/Activities/SettingsBackup.java @@ -8,7 +8,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; -import android.support.design.widget.Snackbar; +import com.google.android.material.snackbar.Snackbar; import android.util.Log; import android.view.View; import android.widget.TextView; @@ -679,7 +679,7 @@ public void onClick(DialogInterface dialog, int which) { Snackbar.LENGTH_INDEFINITE); View view = s.getView(); TextView tv = (TextView) view.findViewById( - android.support.design.R.id.snackbar_text); + com.google.android.material.R.id.snackbar_text); tv.setTextColor(Color.WHITE); s.show(); } diff --git a/gradle.properties b/gradle.properties index 9516cf5993..93a138ccc2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,6 +10,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx10248m -XX:MaxPermSize=256m +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode.