refactor(Config): minor refactor of the getter holder classes

Author: WhiredPlanck

app/src/main/java/com/osfans/trime/data/theme/Config.java

@@ -65,6 +65,7 @@ public static Config get() {
   private static final String defaultThemeName = "trime";
   private String currentSchemaId, currentColorSchemeId;
 
+  private Map<String, Object> generalStyle;
   private Map<String, String> fallbackColors;
   private Map<String, Map<String, String>> presetColorSchemes;
   private Map<String, Map<String, Object>> presetKeyboards;
@@ -163,15 +164,16 @@ public void init(boolean skipDeployment) {
       Objects.requireNonNull(fullThemeConfigMap, "The theme file cannot be empty!");
       Timber.d("Fetching done");
 
-      style = new Style((Map<String, Object>) fullThemeConfigMap.get("style"));
+      generalStyle = (Map<String, Object>) fullThemeConfigMap.get("style");
       fallbackColors = (Map<String, String>) fullThemeConfigMap.get("fallback_colors");
       Key.presetKeys = (Map<String, Map<String, Object>>) fullThemeConfigMap.get("preset_keys");
       presetColorSchemes =
           (Map<String, Map<String, String>>) fullThemeConfigMap.get("preset_color_schemes");
       presetKeyboards =
           (Map<String, Map<String, Object>>) fullThemeConfigMap.get("preset_keyboards");
       liquidKeyboard = (Map<String, Object>) fullThemeConfigMap.get("liquid_keyboard");
-      liquid = new Liquid(liquidKeyboard);
+      style = new Style(this);
+      liquid = new Liquid(this);
       long end = System.currentTimeMillis();
       Timber.d("Setting up all theme config map takes %s ms", end - start);
       initLiquidKeyboard();
@@ -269,46 +271,46 @@ public static boolean obtainBoolean(Map<String, Object> map, @NonNull String key
   }
 
   public static class Style {
-    private final Map<String, Object> styleConfigMap;
+    private final Config theme;
 
-    public Style(final Map<String, Object> styleConfigMap) {
-      this.styleConfigMap = styleConfigMap;
+    public Style(@NonNull final Config theme) {
+      this.theme = theme;
     }
 
     public String getString(@NonNull String key) {
-      return obtainString(styleConfigMap, key);
+      return obtainString(theme.generalStyle, key);
     }
 
     public int getInt(@NonNull String key) {
-      return obtainInt(styleConfigMap, key);
+      return obtainInt(theme.generalStyle, key);
     }
 
     public float getFloat(@NonNull String key) {
-      return obtainFloat(styleConfigMap, key);
+      return obtainFloat(theme.generalStyle, key);
     }
 
     public boolean getBoolean(@NonNull String key) {
-      return obtainBoolean(styleConfigMap, key);
+      return obtainBoolean(theme.generalStyle, key);
     }
 
     public Object getObject(@NonNull String key) {
-      return obtainValue(styleConfigMap, key);
+      return obtainValue(theme.generalStyle, key);
     }
   }
 
   public static class Liquid {
-    private final Map<String, Object> liquidConfigMap;
+    private final Config theme;
 
-    public Liquid(@NonNull Map<String, Object> liquidConfigMap) {
-      this.liquidConfigMap = liquidConfigMap;
+    public Liquid(@NonNull final Config theme) {
+      this.theme = theme;
     }
 
     public int getInt(@NonNull String key) {
-      return obtainInt(liquidConfigMap, key);
+      return obtainInt(theme.liquidKeyboard, key);
     }
 
     public float getFloat(@NonNull String key) {
-      return obtainFloat(liquidConfigMap, key, self.style.getFloat(key));
+      return obtainFloat(theme.liquidKeyboard, key, theme.style.getFloat(key));
     }
   }