diff options
16 files changed, 30 insertions, 27 deletions
diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index 4cc14660..f2d9a87e 100755 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -75,9 +75,9 @@ dependencies { implementation 'me.relex:circleindicator:1.2.2@aar' implementation 'com.nineoldandroids:library:2.4.0' implementation 'com.github.amulyakhare:TextDrawable:558677ea31' - implementation 'frankiesardo:icepick:3.2.0' - compileOnly 'frankiesardo:icepick-processor:3.2.0' - annotationProcessor 'frankiesardo:icepick-processor:3.2.0' + implementation 'com.evernote:android-state:1.4.1' + compileOnly 'com.evernote:android-state:1.4.1' + annotationProcessor 'com.evernote:android-state:1.4.1' implementation 'com.github.livefront:bridge:v1.1.1' implementation files('libs/YouTubeAndroidPlayerApi.jar') implementation 'com.github.javiersantos:AppUpdater:2.7' diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java index 94857855..a8c4ab00 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java @@ -2,6 +2,7 @@ package org.fox.ttrss; import android.os.Bundle; +import com.evernote.android.state.StateSaver; import com.livefront.bridge.Bridge; import com.livefront.bridge.SavedStateHandler; @@ -13,8 +14,6 @@ import androidx.annotation.Nullable; import java.util.LinkedHashMap; -import icepick.Icepick; - public class Application extends android.app.Application { private static Application m_singleton; @@ -37,12 +36,12 @@ public class Application extends android.app.Application { Bridge.initialize(getApplicationContext(), new SavedStateHandler() { @Override public void saveInstanceState(@NonNull Object target, @NonNull Bundle state) { - Icepick.saveInstanceState(target, state); + StateSaver.saveInstanceState(target, state); } @Override public void restoreInstanceState(@NonNull Object target, @Nullable Bundle state) { - Icepick.restoreInstanceState(target, state); + StateSaver.restoreInstanceState(target, state); } }); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index 995e0074..0523c144 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -34,6 +34,8 @@ import android.widget.TextView; import androidx.core.text.HtmlCompat; +import com.evernote.android.state.State; + import org.fox.ttrss.types.Article; import org.fox.ttrss.types.Attachment; @@ -43,13 +45,12 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; -import icepick.State; - public class ArticleFragment extends StateSavedFragment { private final String TAG = this.getClass().getSimpleName(); private SharedPreferences m_prefs; - @State protected Article m_article; + @State + protected Article m_article; private DetailActivity m_activity; private WebView m_web; protected View m_customView; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java index 86feeaed..9f90df84 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java @@ -28,7 +28,7 @@ import org.fox.ttrss.util.HeadlinesRequest; import java.util.HashMap; -import icepick.State; +import com.evernote.android.state.State; public class ArticlePager extends StateSavedFragment { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index 1933fe6a..13c4490a 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -47,6 +47,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.animation.GlideAnimation; import com.bumptech.glide.request.target.SimpleTarget; +import com.evernote.android.state.State; import com.google.android.material.snackbar.Snackbar; import com.livefront.bridge.Bridge; @@ -63,8 +64,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import icepick.State; - public class CommonActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener { private final String TAG = this.getClass().getSimpleName(); @@ -91,7 +90,8 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc //private SQLiteDatabase m_writableDb; private boolean m_smallScreenMode = true; - @State protected String m_theme; + @State + protected String m_theme; private boolean m_needRestart; private static String s_customTabPackageName; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java index 97819411..8ef07abf 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java @@ -13,6 +13,7 @@ import android.util.Log; import android.view.MenuItem; import android.view.View; +import com.evernote.android.state.State; import com.google.android.material.floatingactionbutton.FloatingActionButton; import org.fox.ttrss.types.Article; @@ -21,11 +22,11 @@ import org.fox.ttrss.types.Feed; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.FragmentTransaction; -import icepick.State; public class DetailActivity extends OnlineActivity implements HeadlinesEventListener { private final String TAG = this.getClass().getSimpleName(); - @State protected ArticleList m_articles = new ArticleList(); + @State + protected ArticleList m_articles = new ArticleList(); protected SharedPreferences m_prefs; private Article m_activeArticle; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java index 0feda5d9..3ef4fdd5 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java @@ -43,7 +43,7 @@ import java.util.List; import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import icepick.State; +import com.evernote.android.state.State; public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnItemClickListener, OnSharedPreferenceChangeListener, LoaderManager.LoaderCallbacks<JsonElement> { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index 60020086..5199d299 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -48,7 +48,7 @@ import java.util.List; import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import icepick.State; +import com.evernote.android.state.State; public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickListener, OnSharedPreferenceChangeListener, LoaderManager.LoaderCallbacks<JsonElement> { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java index 9645ad80..570a586c 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; -import icepick.State; +import com.evernote.android.state.State; import me.relex.circleindicator.CircleIndicator; public class GalleryActivity extends CommonActivity { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java index e058ca7b..44dbea12 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java @@ -19,7 +19,7 @@ import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.GlideDrawableImageViewTarget; import com.bumptech.glide.request.target.Target; -import icepick.State; +import com.evernote.android.state.State; public class GalleryImageFragment extends GalleryBaseFragment { private final String TAG = this.getClass().getSimpleName(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java index c2f8841d..751975d3 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java @@ -19,7 +19,7 @@ import java.io.IOException; import androidx.core.app.ActivityCompat; import androidx.core.view.ViewCompat; -import icepick.State; +import com.evernote.android.state.State; public class GalleryVideoFragment extends GalleryBaseFragment { private final String TAG = this.getClass().getSimpleName(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index fb43f7ca..f6990207 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -69,6 +69,7 @@ import com.bumptech.glide.load.resource.drawable.GlideDrawable; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.GlideDrawableImageViewTarget; import com.bumptech.glide.request.target.Target; +import com.evernote.android.state.State; import com.google.android.material.snackbar.Snackbar; import com.google.gson.JsonElement; @@ -91,7 +92,7 @@ import java.util.List; import java.util.TimeZone; import java.util.concurrent.TimeUnit; -import icepick.State; +import com.evernote.android.state.State; import jp.wasabeef.glide.transformations.CropCircleTransformation; public class HeadlinesFragment extends StateSavedFragment { @@ -105,7 +106,8 @@ public class HeadlinesFragment extends StateSavedFragment { private final String TAG = this.getClass().getSimpleName(); - @State Feed m_feed; + @State + Feed m_feed; @State Article m_activeArticle; @State String m_searchQuery = ""; private boolean m_refreshInProgress = false; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java index c9cbcbf9..037e4d7c 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.widget.Toolbar; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import icepick.State; +import com.evernote.android.state.State; public class LogcatActivity extends CommonActivity { private static final int MAX_LOG_ENTRIES = 500; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java index 50a0e7f2..520fdded 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -34,7 +34,7 @@ import java.util.Date; import java.util.HashMap; import java.util.LinkedHashMap; -import icepick.State; +import com.evernote.android.state.State; public class MasterActivity extends OnlineActivity implements HeadlinesEventListener { private final String TAG = this.getClass().getSimpleName(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java index 81afbf0e..4147ab91 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java @@ -15,7 +15,7 @@ import com.google.android.youtube.player.YouTubePlayerSupportFragment; import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.widget.Toolbar; -import icepick.State; +import com.evernote.android.state.State; public class YoutubePlayerActivity extends CommonActivity implements YouTubePlayer.OnInitializedListener { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java index b6a989b1..a1044988 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java @@ -16,7 +16,7 @@ import org.fox.ttrss.PreferencesActivity; import org.fox.ttrss.R; import org.fox.ttrss.util.SimpleLoginManager; -import icepick.State; +import com.evernote.android.state.State; public abstract class CommonShareActivity extends CommonActivity { |