Apply new activity delegate

Author: akexorcist

app/src/main/java/com/akexorcist/localizationapp/customactivity/CustomActivity.java

@@ -2,9 +2,10 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.res.Resources;
 import android.os.Bundle;
 
-import com.akexorcist.localizationactivity.LocalizationDelegate;
+import com.akexorcist.localizationactivity.LocalizationActivityDelegate;
 import com.akexorcist.localizationactivity.OnLocaleChangedListener;
 
 import java.util.Locale;
@@ -14,7 +15,7 @@
  */
 public abstract class CustomActivity extends Activity implements OnLocaleChangedListener {
 
-    private LocalizationDelegate localizationDelegate = new LocalizationDelegate(this);
+    private LocalizationActivityDelegate localizationDelegate = new LocalizationActivityDelegate(this);
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -26,40 +27,42 @@ public void onCreate(Bundle savedInstanceState) {
     @Override
     public void onResume() {
         super.onResume();
-        localizationDelegate.onResume();
+        localizationDelegate.onResume(this);
     }
 
     @Override
     protected void attachBaseContext(Context newBase) {
         super.attachBaseContext(localizationDelegate.attachBaseContext(newBase));
     }
 
-    public final void setLanguage(String language) {
-        localizationDelegate.setLanguage(language);
+    @Override
+    public Context getApplicationContext() {
+        return localizationDelegate.getApplicationContext(super.getApplicationContext());
+    }
+
+    @Override
+    public Resources getResources() {
+        return localizationDelegate.getResources(super.getResources());
     }
 
-    public final void setLanguage(String language, String country) {
-        localizationDelegate.setLanguage(language, country);
+    public final void setLanguage(String language) {
+        localizationDelegate.setLanguage(this, language);
     }
 
     public final void setLanguage(Locale locale) {
-        localizationDelegate.setLanguage(locale);
+        localizationDelegate.setLanguage(this, locale);
     }
 
     public final void setDefaultLanguage(String language) {
         localizationDelegate.setDefaultLanguage(language);
     }
 
-    public final void setDefaultLanguage(String language, String country) {
-        localizationDelegate.setDefaultLanguage(language, country);
-    }
-
     public final void setDefaultLanguage(Locale locale) {
         localizationDelegate.setDefaultLanguage(locale);
     }
 
-    public final Locale getLanguage() {
-        return localizationDelegate.getLanguage();
+    public final Locale getCurrentLanguage() {
+        return localizationDelegate.getLanguage(this);
     }
 
     // Just override method locale change event

localizationActivity/src/main/java/com/akexorcist/localizationactivity/LocalizationActivity.java

@@ -23,17 +23,21 @@
 package com.akexorcist.localizationactivity;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 
+import com.akexorcist.localizationactivity.LocalizationActivityDelegate;
+import com.akexorcist.localizationactivity.OnLocaleChangedListener;
+
 import java.util.Locale;
 
 /**
  * Created by Akexorcist on 7/20/15 AD.
  */
 public abstract class LocalizationActivity extends AppCompatActivity implements OnLocaleChangedListener {
 
-    private LocalizationDelegate localizationDelegate = new LocalizationDelegate(this);
+    private LocalizationActivityDelegate localizationDelegate = new LocalizationActivityDelegate(this);
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -45,20 +49,30 @@ public void onCreate(Bundle savedInstanceState) {
     @Override
     public void onResume() {
         super.onResume();
-        localizationDelegate.onResume();
+        localizationDelegate.onResume(this);
     }
 
     @Override
     protected void attachBaseContext(Context newBase) {
         super.attachBaseContext(localizationDelegate.attachBaseContext(newBase));
     }
 
+    @Override
+    public Context getApplicationContext() {
+        return localizationDelegate.getApplicationContext(super.getApplicationContext());
+    }
+
+    @Override
+    public Resources getResources() {
+        return localizationDelegate.getResources(super.getResources());
+    }
+
     public final void setLanguage(String language) {
-        localizationDelegate.setLanguage(language);
+        localizationDelegate.setLanguage(this, language);
     }
 
     public final void setLanguage(Locale locale) {
-        localizationDelegate.setLanguage(locale);
+        localizationDelegate.setLanguage(this, locale);
     }
 
     public final void setDefaultLanguage(String language) {
@@ -70,7 +84,7 @@ public final void setDefaultLanguage(Locale locale) {
     }
 
     public final Locale getCurrentLanguage() {
-        return localizationDelegate.getLanguage();
+        return localizationDelegate.getLanguage(this);
     }
 
     // Just override method locale change event