X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryApplication.java;h=d7109a062cc39d8376c155ce939e9f8439ecd839;hb=d80531dd96b68d3c05c3825bbe732275b0f9fe02;hp=4b62c7bf94bf3a3bc22d0cf279e5e410e76c2551;hpb=98518a3277e3083a4bef9888042571f2dbe22b15;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index 4b62c7b..d7109a0 100644
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -14,15 +14,14 @@
 
 package com.hughes.android.dictionary;
 
-import com.hughes.android.dictionary.engine.TransliteratorManager;
-
-import android.app.Activity;
 import android.app.Application;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
+import com.hughes.android.dictionary.engine.TransliteratorManager;
+
 public class DictionaryApplication extends Application {
   
   @Override
@@ -31,24 +30,30 @@ public class DictionaryApplication extends Application {
     Log.d("QuickDic", "Application: onCreate");
     TransliteratorManager.init(null);
     
+    setTheme(getSelectedTheme().themeId);
+
+    
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
     prefs.registerOnSharedPreferenceChangeListener(new OnSharedPreferenceChangeListener() {
       @Override
       public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
           String key) {
         Log.d("THAD", "prefs changed: " + key);
+        
+        if (key.equals(getString(R.string.themeKey))) {
+          setTheme(getSelectedTheme().themeId);
+        }
       }
     });
   }
   
-  public void applyTheme(final Activity activity) {
+  public C.Theme getSelectedTheme() {
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
     final String theme = prefs.getString(getString(R.string.themeKey), "themeLight");
-    Log.d("QuickDic", "Setting theme to: " + theme);
     if (theme.equals("themeLight")) {
-      activity.setTheme(R.style.Theme_Light);
+      return C.Theme.LIGHT;
     } else {
-      activity.setTheme(R.style.Theme_Default);      
+      return C.Theme.DEFAULT;
     }
   }
 }