Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update lists #403

Merged
merged 13 commits into from
Jan 28, 2017
Merged

Update lists #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3c70f86
Use EndlessRecyclerViewScrollListener in ArticlesListFragment
di72nn Jan 19, 2017
7dcc4f7
Remove list limit option
di72nn Jan 19, 2017
27114dd
Change ArticlesListFragment log level
di72nn Jan 19, 2017
2ffc0d3
Use DiffUtil to update lists
di72nn Jan 19, 2017
76c84f2
Add logging when "fragment is null"
di72nn Jan 19, 2017
06af46a
Add basic search
di72nn Jan 19, 2017
2630998
Try to restore fragments from FragmentManager
di72nn Jan 19, 2017
3466019
Simplify update animation logic
di72nn Jan 22, 2017
3a1cea2
Don't keep article content in ArticleListFragment
di72nn Jan 22, 2017
d7ecae8
Schedule "queue sync" before "full update"
di72nn Jan 25, 2017
8a2dd56
Add an option to reverse list order
di72nn Jan 25, 2017
ff2df73
Save sort order parameter
di72nn Jan 25, 2017
c0ce77a
Improve search implementation
di72nn Jan 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@
<activity android:name="fr.gaulupeau.apps.Poche.ui.ArticlesListActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.SEARCH" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity>
<activity
android:name="fr.gaulupeau.apps.Poche.ui.ReadArticleActivity"
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/java/fr/gaulupeau/apps/Poche/data/LegacySettingsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ class LegacySettingsHelper {
static final String CUSTOM_SSL_SETTINGS = "custom_ssl_settings";
static final String FONT_SIZE = "font_size";
static final String SERIF_FONT = "serif_font";
static final String LIST_LIMIT = "list_limit";
static final String USERNAME = "username";
static final String PASSWORD = "password";
static final String HTTP_AUTH_USERNAME = "http_auth_username";
Expand Down Expand Up @@ -74,8 +73,6 @@ static boolean migrateLegacySettings(Context cx, SharedPreferences pref) {
}
migrateBooleanPref(cx, SERIF_FONT, R.string.pref_key_ui_article_fontSerif, legacyPref, prefEditor);

migrateIntPref(cx, LIST_LIMIT, R.string.pref_key_ui_lists_limit, legacyPref, prefEditor, 50);

migrateStringPref(cx, THEME, R.string.pref_key_ui_theme, legacyPref, prefEditor);

migrateBooleanPref(cx, TTS_VISIBLE, R.string.pref_key_tts_visible, legacyPref, prefEditor);
Expand Down
18 changes: 14 additions & 4 deletions app/src/main/java/fr/gaulupeau/apps/Poche/data/Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import fr.gaulupeau.apps.Poche.App;
import fr.gaulupeau.apps.Poche.network.ConnectivityChangeReceiver;
import fr.gaulupeau.apps.Poche.service.WallabagJobService;
import fr.gaulupeau.apps.Poche.ui.ArticlesListFragment;
import fr.gaulupeau.apps.Poche.ui.HttpSchemeHandlerActivity;
import fr.gaulupeau.apps.Poche.ui.Themes;
import fr.gaulupeau.apps.Poche.ui.preferences.ConnectionWizardActivity;
Expand Down Expand Up @@ -350,12 +351,21 @@ public void setArticleFontSerif(boolean value) {
setBoolean(R.string.pref_key_ui_article_fontSerif, value);
}

public int getArticlesListLimit() {
return getInt(R.string.pref_key_ui_lists_limit, 100);
public ArticlesListFragment.SortOrder getListSortOrder() {
String sortOrderParam = getString(R.string.pref_key_ui_lists_sortOrder);

ArticlesListFragment.SortOrder sortOrder = null;
if(sortOrderParam != null) {
try {
sortOrder = ArticlesListFragment.SortOrder.valueOf(sortOrderParam);
} catch(IllegalArgumentException ignored) {}
}

return sortOrder != null ? sortOrder : ArticlesListFragment.SortOrder.DESC;
}

public void setArticlesListLimit(int limit) {
setInt(R.string.pref_key_ui_lists_limit, limit);
public void setListSortOrder(ArticlesListFragment.SortOrder sortOrder) {
setString(R.string.pref_key_ui_lists_sortOrder, sortOrder.toString());
}

public Themes.Theme getTheme() {
Expand Down
Loading