Turn Config into a singleton object

The goal is to remove a cast of the 'context' into 'Keyboard2'.

1 files changed, 4 insertions, 8 deletions

diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index b1bafbd..7a57def 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -54,16 +54,12 @@ public class Keyboard2 extends InputMethodService
     _specialKeyFont = Typeface.createFromAsset(getAssets(), "fonts/keys.ttf");
     PreferenceManager.setDefaultValues(this, R.xml.settings, false);
     PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
-    _config = new Config(this);
+    Config.initGlobalConfig(this);
+    _config = Config.globalConfig();
     _keyboardView = (Keyboard2View)getLayoutInflater().inflate(R.layout.keyboard, null);
     _keyboardView.reset();
   }
 
-  public Config getConfig()
-  {
-    return (_config);
-  }
-
   public Typeface getSpecialKeyFont()
   {
     return (_specialKeyFont);
@@ -186,9 +182,9 @@ public class Keyboard2 extends InputMethodService
   @Override
   public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key)
   {
-    _config.refresh();
+    _config.refresh(this);
     refreshSubtypeImm();
-    _keyboardView.refreshConfig(_config, getLayout(_currentTextLayout));
+    _keyboardView.refreshConfig(getLayout(_currentTextLayout));
   }
 
   @Override