From 162f17a7a01b9518c2a36940ce68620c59f20d5e Mon Sep 17 00:00:00 2001
From: jaguillo
Date: Thu, 29 Oct 2015 12:49:40 +0100
Subject: Move configs to Config object

---
 srcs/juloo.keyboard2/Keyboard2.java | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'srcs/juloo.keyboard2/Keyboard2.java')

diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index e180ae2..3d4fda5 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -22,6 +22,8 @@ public class Keyboard2 extends InputMethodService
 	private ViewGroup		_emojiPane = null;
 	private Typeface		_specialKeyFont = null;
 
+	private Config			_config;
+
 	@Override
 	public void				onCreate()
 	{
@@ -29,9 +31,15 @@ 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);
 		updateConfig();
 		_keyboardView = (Keyboard2View)getLayoutInflater().inflate(R.layout.keyboard, null);
-		_keyboardView.reset_prefs();
+		_keyboardView.reset();
+	}
+
+	public Config			getConfig()
+	{
+		return (_config);
 	}
 
 	public Typeface			getSpecialKeyFont()
@@ -61,8 +69,9 @@ public class Keyboard2 extends InputMethodService
 	@Override
 	public void				onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key)
 	{
+		_config.refresh();
 		updateConfig();
-		_keyboardView.reset_prefs();
+		_keyboardView.reset();
 	}
 
 	@Override
@@ -71,6 +80,9 @@ public class Keyboard2 extends InputMethodService
 		_keyboardView.reset();
 	}
 
+	/*
+	** TODO: move this to Config object
+	*/
 	private void			updateConfig()
 	{
 		SharedPreferences	prefs = PreferenceManager.getDefaultSharedPreferences(this);
-- 
cgit v1.2.3