From ff0d4c600518ca7859d9e0b5261f9a3450f7a154 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 9 Feb 2015 17:03:35 +0300 Subject: add version to preference xml --- .../main/java/org/fox/ttrss/PreferencesActivity.java | 17 +++++++++++++++++ org.fox.ttrss/src/main/res/values/strings.xml | 1 + org.fox.ttrss/src/main/res/xml/preferences.xml | 5 +++++ 3 files changed, 23 insertions(+) (limited to 'org.fox.ttrss') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java index e6d300f0..09a514f4 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java @@ -1,6 +1,9 @@ package org.fox.ttrss; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; import android.os.Bundle; +import android.preference.Preference; import android.preference.PreferenceActivity; public class PreferencesActivity extends PreferenceActivity { @@ -19,6 +22,20 @@ public class PreferencesActivity extends PreferenceActivity { if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) { findPreference("enable_condensed_fonts").setEnabled(false); } + + Preference versionPref = (Preference)findPreference("version"); + String version = null; + int versionCode = -1; + try { + PackageInfo packageInfo = getPackageManager().getPackageInfo(getPackageName(), 0); + + version = packageInfo.versionName; + versionCode = packageInfo.versionCode; + + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + versionPref.setTitle(getString(R.string.version, version, versionCode)); } } diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index bdfaaad6..9df0f0ec 100644 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -263,4 +263,5 @@ Default No images Compact + Version: %1$s (%2$d) diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index b9087b22..dc9216f9 100644 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -189,4 +189,9 @@ android:title="@string/transport_debugging" /> + + -- cgit v1.2.3