diff options
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 3 | ||||
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 11 |
4 files changed, 14 insertions, 7 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4ce9964f..1dbcc850 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="17" - android:versionName="0.1.16"> + android:versionCode="18" + android:versionName="0.1.17"> <uses-sdk android:minSdkVersion="8" /> <!-- <supports-screens android:smallScreens="false" android:normalScreens="false" /> --> diff --git a/res/values/strings.xml b/res/values/strings.xml index edbb8db6..a8e8757b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -51,7 +51,8 @@ <string name="set_unread">Mark unread</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="password_summary">Your tt-rss password</string> + <string name="enable_ads">Enable ads</string> + <string name="enable_ads_summary">Showing ads to you supports the project</string> <string name="ttrss_url_summary">URL of your tt-rss installation directory, e.g. http://site.com/tt-rss/</string> </resources> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 3bc482f3..2dedf632 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -6,7 +6,7 @@ <PreferenceCategory android:title="@string/connection">
<EditTextPreference android:summary="@string/login_summary" android:title="@string/login" android:key="login" android:singleLine="true"></EditTextPreference>
- <EditTextPreference android:summary="@string/password_summary" android:title="@string/password" android:key="password" android:singleLine="true" android:password="true"></EditTextPreference>
+ <EditTextPreference android:title="@string/password" android:key="password" android:singleLine="true" android:password="true"></EditTextPreference>
<EditTextPreference android:summary="@string/ttrss_url_summary" android:key="ttrss_url" android:title="@string/ttrss_url" android:singleLine="true" textUri="true" android:hint="@string/default_url"></EditTextPreference>
<CheckBoxPreference android:defaultValue="false" android:title="@string/ssl_trust_any" android:key="ssl_trust_any" />
</PreferenceCategory>
@@ -25,6 +25,7 @@ android:entryValues="@array/pref_theme_values" android:summary="@string/pref_theme_long"/>
<CheckBoxPreference android:title="@string/sort_feeds_by_unread" android:key="sort_feeds_by_unread"/>
+ <CheckBoxPreference android:defaultValue="false" android:summary="@string/enable_ads_summary" android:title="@string/enable_ads" android:key="enable_ads" />
</PreferenceCategory>
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index 46d530c2..4a84aef2 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -95,11 +95,16 @@ public class ArticleFragment extends Fragment { }
AdView av = (AdView)view.findViewById(R.id.ad);
+ boolean enableAds = m_prefs.getBoolean("enable_ads", false);
if (av != null) {
- AdRequest request = new AdRequest();
- request.addTestDevice(AdRequest.TEST_EMULATOR);
- av.loadAd(request);
+ if (enableAds) {
+ AdRequest request = new AdRequest();
+ request.addTestDevice(AdRequest.TEST_EMULATOR);
+ av.loadAd(request);
+ } else {
+ av.setVisibility(View.GONE);
+ }
}
}
|