offline up arrow fixes; bump version; make amount of articles downloaded

in offline mode configurable
This commit is contained in:
Andrew Dolgov 2012-12-04 11:04:08 +04:00
parent 1b40669cc5
commit 25a8c94c81
6 changed files with 21 additions and 10 deletions

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="115" android:versionCode="116"
android:versionName="0.8.14" > android:versionName="0.9" >
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"

View File

@ -25,5 +25,9 @@
<item>HEADLINES</item> <item>HEADLINES</item>
<item>ARTICLES</item> <item>ARTICLES</item>
</string-array> </string-array>
<string-array name="pref_offline_amounts">
<item>150</item>
<item>250</item>
<item>500</item>
</string-array>
</resources> </resources>

View File

@ -52,7 +52,7 @@
<string name="http_login_summary">Optional. Fill this if your tt-rss installation is protected by HTTP Basic authentication</string> <string name="http_login_summary">Optional. Fill this if your tt-rss installation is protected by HTTP Basic authentication</string>
<string name="login_summary">Your tt-rss login. Not needed for single user mode</string> <string name="login_summary">Your tt-rss login. Not needed for single user mode</string>
<string name="ttrss_url_summary">URL of your tt-rss installation directory, e.g. http://site.com/tt-rss/</string> <string name="ttrss_url_summary">URL of your tt-rss installation directory, e.g. http://site.com/tt-rss/</string>
<string name="download_feed_icons">Download and display feed icons</string> <string name="download_feed_icons">Enable feed icons</string>
<string name="enable_cats">Enable feed categories</string> <string name="enable_cats">Enable feed categories</string>
<string name="no_feeds_to_display">No feeds to display</string> <string name="no_feeds_to_display">No feeds to display</string>
<string name="no_headlines_to_display">No headlines to display</string> <string name="no_headlines_to_display">No headlines to display</string>
@ -144,6 +144,7 @@
<string name="ssl">SSL</string> <string name="ssl">SSL</string>
<string name="error_ssl_hostname_rejected">Error: SSL hostname not verified</string> <string name="error_ssl_hostname_rejected">Error: SSL hostname not verified</string>
<string name="offline_oldest_first">Show oldest articles first</string> <string name="offline_oldest_first">Show oldest articles first</string>
<string name="prefs_dim_status_bar">Dim status bar when reading</string> <string name="prefs_dim_status_bar">Dim status bar</string>
<string name="prefs_dim_status_bar_long">Dim status bar when reading</string>
<string name="article_comments">%1$d comments</string> <string name="article_comments">%1$d comments</string>
</resources> </resources>

View File

@ -111,14 +111,20 @@
android:key="use_volume_keys" android:key="use_volume_keys"
android:summary="@string/use_volume_keys_long" android:summary="@string/use_volume_keys_long"
android:title="@string/use_volume_keys" /> android:title="@string/use_volume_keys" />
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="false" android:defaultValue="false"
android:key="dim_status_bar" android:key="dim_status_bar"
android:summary="@string/prefs_dim_status_bar_long"
android:title="@string/prefs_dim_status_bar" /> android:title="@string/prefs_dim_status_bar" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/offline_mode" > <PreferenceCategory android:title="@string/offline_mode" >
<ListPreference
android:defaultValue="250"
android:entries="@array/pref_offline_amounts"
android:entryValues="@array/pref_offline_amounts"
android:key="offline_sync_max"
android:summary="How many articles to download (newest first)"
android:title="Download articles" />
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="false" android:defaultValue="false"
android:key="offline_image_cache_enabled" android:key="offline_image_cache_enabled"

View File

@ -82,7 +82,7 @@ public class OfflineDownloadService extends Service {
.getDefaultSharedPreferences(getApplicationContext()); .getDefaultSharedPreferences(getApplicationContext());
m_downloadImages = m_prefs.getBoolean("offline_image_cache_enabled", false); m_downloadImages = m_prefs.getBoolean("offline_image_cache_enabled", false);
m_syncMax = m_prefs.getInt("offline_sync_max", OFFLINE_SYNC_MAX); m_syncMax = Integer.parseInt(m_prefs.getString("offline_sync_max", String.valueOf(OFFLINE_SYNC_MAX)));
initDatabase(); initDatabase();
} }

View File

@ -56,7 +56,7 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead
if (!isCompatMode()) { if (!isCompatMode()) {
getActionBar().setDisplayHomeAsUpEnabled(true); getActionBar().setDisplayHomeAsUpEnabled(true);
m_actionbarUpEnabled = true;
} }
FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); FragmentTransaction ft = getSupportFragmentManager().beginTransaction();