diff options
Diffstat (limited to 'libs')
4 files changed, 30 insertions, 1 deletions
diff --git a/libs/MemorizingTrustManager/res/values-v21/themes.xml b/libs/MemorizingTrustManager/res/values-v21/themes.xml new file mode 100644 index 000000000..c2bd573f0 --- /dev/null +++ b/libs/MemorizingTrustManager/res/values-v21/themes.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar" /> + <style name="ConversationsTheme.Dark" parent="android:Theme.Material" /> + +</resources>
\ No newline at end of file diff --git a/libs/MemorizingTrustManager/res/values/defaults.xml b/libs/MemorizingTrustManager/res/values/defaults.xml new file mode 100644 index 000000000..6fea62719 --- /dev/null +++ b/libs/MemorizingTrustManager/res/values/defaults.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="theme">light</string> +</resources> diff --git a/libs/MemorizingTrustManager/res/values/themes.xml b/libs/MemorizingTrustManager/res/values/themes.xml new file mode 100644 index 000000000..2b0643154 --- /dev/null +++ b/libs/MemorizingTrustManager/res/values/themes.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <style name="ConversationsTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar" /> + <style name="ConversationsTheme.Dark" parent="@android:style/Theme.Holo" /> + +</resources>
\ No newline at end of file diff --git a/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java b/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java index c917c5d08..dd1649c94 100644 --- a/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java +++ b/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java @@ -30,7 +30,9 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnCancelListener; import android.content.DialogInterface.OnClickListener; import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; +import android.preference.PreferenceManager; import java.util.logging.Level; import java.util.logging.Logger; @@ -38,8 +40,8 @@ import java.util.logging.Logger; public class MemorizingActivity extends Activity implements OnClickListener, OnCancelListener { + public static final String THEME = "theme"; private final static Logger LOGGER = Logger.getLogger(MemorizingActivity.class.getName()); - int decisionId; AlertDialog dialog; @@ -47,6 +49,7 @@ public class MemorizingActivity extends Activity @Override public void onCreate(Bundle savedInstanceState) { LOGGER.log(Level.FINE, "onCreate"); + setTheme(findTheme()); super.onCreate(savedInstanceState); } @@ -81,6 +84,14 @@ public class MemorizingActivity extends Activity finish(); } + protected int findTheme() { + return getPreferences().getString(THEME, getResources().getString(R.string.theme)).equals("dark") ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme; + } + + protected SharedPreferences getPreferences() { + return PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + } + // react on AlertDialog button press public void onClick(DialogInterface dialog, int btnId) { int decision; |