[new] quick and dirty localization support on sdk..ideally the SDK would not need any strings and they would all be provided by the parent app

Author: Ricardo Moutinho

oneallsdk/src/main/java/com/oneall/oneallsdk/OAManager.java

@@ -86,6 +86,12 @@ public interface OAManagerPostHandler {
 
     // endregion
 
+    // region Localization
+
+    private String loading;
+
+    // endregion
+
     // region Lifecycle
 
     /**
@@ -151,6 +157,9 @@ public void setup(
             throw new IllegalArgumentException("Subdomain cannot be empty");
         }
 
+        // init localization strings
+        localize(context.getString(R.string.web_login_progress_title));
+
         // make sure the ref we hold is from the application context
         mAppContext = context.getApplicationContext();
 
@@ -175,6 +184,19 @@ public void setup(
         ProviderManager.getInstance().refreshProviders(mAppContext);
     }
 
+    /**
+     * The SDK needs a few strings that are shown to the user
+     * during certain tasks. This calls allows you to override the
+     * default locale strings.
+     * Be sure to call this after {@link #setup(Context, String, String, String)}.
+     *
+     * @param loading Shown on progress dialogs while loading web pages or obtaining
+     *                user info.
+     */
+    public void localize(String loading) {
+        this.loading = loading;
+    }
+
     /**
      * Starts authentication with OneAll using selected social network. If additional information is
      * required for provider, the user is shown a dialog with request for additional data. When all
@@ -454,6 +476,7 @@ private void webLoginWithLoginData(Activity activity, String userInput) {
                 "Web login with provider %s and url: %s", selectedProvider.getKey(), url));
         Intent i = new Intent(activity, WebLoginActivity.class);
         i.putExtra(WebLoginActivity.INTENT_EXTRA_URL, url);
+        i.putExtra(WebLoginActivity.INTENT_EXTRA_LOADING_STRING, loading);
 
         activity.startActivityForResult(i, INTENT_REQUEST_CODE_LOGIN);
     }
@@ -578,7 +601,7 @@ private void retrieveConnectionInfo(
             final ProgressDialog pd = ProgressDialog.show(
                     guiContext,
                     "",
-                    guiContext.getString(R.string.web_login_progress_title),
+                    loading,
                     true,
                     true);
 

oneallsdk/src/main/java/com/oneall/oneallsdk/WebLoginActivity.java

@@ -22,13 +22,20 @@ public class WebLoginActivity extends AppCompatActivity {
     // region Properties
 
     private ProgressDialog progressDialog;
-    private WebView mWebView;
+    private WebView webView;
+
+    // endregion
+
+    // region l10n
+
+    private String loading;
 
     // endregion
 
     // region Constants
 
     public final static String INTENT_EXTRA_URL = "url";
+    public final static String INTENT_EXTRA_LOADING_STRING = "loading_string";
 
     private final static String CUSTOM_URL_SCHEME = "oneall";
 
@@ -46,9 +53,16 @@ protected void onCreate(Bundle savedInstanceState) {
             supportActionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        mWebView = (WebView) findViewById(R.id.web_login_web_view);
-        mWebView.getSettings().setJavaScriptEnabled(true);
-        mWebView.setWebViewClient(new WebViewClient() {
+        final Intent intent = getIntent();
+        if(intent.hasExtra(INTENT_EXTRA_LOADING_STRING)) {
+            loading = intent.getStringExtra(INTENT_EXTRA_LOADING_STRING);
+        } else {
+            loading = getString(R.string.web_login_progress_title);
+        }
+
+        webView = (WebView) findViewById(R.id.web_login_web_view);
+        webView.getSettings().setJavaScriptEnabled(true);
+        webView.setWebViewClient(new WebViewClient() {
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
@@ -63,7 +77,7 @@ public void onPageStarted(WebView view, String url, Bitmap favicon) {
                         progressDialog = ProgressDialog.show(
                                 WebLoginActivity.this,
                                 "",
-                                getResources().getString(R.string.web_login_progress_title),
+                                loading,
                                 true,
                                 true,
                                 new OnCancelListener() {
@@ -92,7 +106,7 @@ public void onReceivedError(WebView view, int errorCode, String description, Str
                 pageLoadFailed(failingUrl);
             }
         });
-        mWebView.loadUrl(getIntent().getExtras().getString(INTENT_EXTRA_URL));
+        webView.loadUrl(intent.getExtras().getString(INTENT_EXTRA_URL));
     }
 
     @Override
@@ -102,9 +116,9 @@ protected void onDestroy() {
             progressDialog.dismiss();
         }
 
-        if (mWebView != null) {
-            mWebView.stopLoading();
-            mWebView.destroy();
+        if (webView != null) {
+            webView.stopLoading();
+            webView.destroy();
         }
 
         super.onDestroy();

oneallsdk/src/main/res/values/strings.xml

@@ -11,10 +11,9 @@
     <string name="button_title_ok">OK</string>
     <string name="button_title_cancel">Cancel</string>
     <string name="title_activity_web_login">Login</string>
-    <string name="web_login_progress_title">Loading</string>
+    <string name="web_login_progress_title">Loading…</string>
     <string name="connection_failure">Connection failure</string>
 
-<!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="provider_fragment_provider_icon">Provider icon</string>
     <string name="providers_not_ready_try_again">Providers are not ready. Try again in a few seconds.</string>