Merge branch 'vikiCoder-master'
This commit is contained in:
commit
af778b0f4b
7
libs/MemorizingTrustManager/res/values-v21/themes.xml
Normal file
7
libs/MemorizingTrustManager/res/values-v21/themes.xml
Normal file
|
@ -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>
|
4
libs/MemorizingTrustManager/res/values/defaults.xml
Normal file
4
libs/MemorizingTrustManager/res/values/defaults.xml
Normal file
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="theme">light</string>
|
||||
</resources>
|
7
libs/MemorizingTrustManager/res/values/themes.xml
Normal file
7
libs/MemorizingTrustManager/res/values/themes.xml
Normal file
|
@ -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>
|
|
@ -24,20 +24,24 @@
|
|||
package de.duenndns.ssl;
|
||||
|
||||
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.AlertDialog;
|
||||
import android.content.DialogInterface;
|
||||
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;
|
||||
|
||||
public class MemorizingActivity extends Activity
|
||||
implements OnClickListener,OnCancelListener {
|
||||
|
||||
private final static Logger LOGGER = Logger.getLogger(MemorizingActivity.class.getName());
|
||||
public static final String THEME = "theme";
|
||||
|
||||
int decisionId;
|
||||
|
||||
|
@ -46,6 +50,7 @@ public class MemorizingActivity extends Activity
|
|||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
LOGGER.log(Level.FINE, "onCreate");
|
||||
setTheme(findTheme());
|
||||
super.onCreate(savedInstanceState);
|
||||
}
|
||||
|
||||
|
@ -80,6 +85,15 @@ 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;
|
||||
|
|
Loading…
Reference in a new issue