diff --git a/app/src/main/java/com/ds/avare/RegisterActivity.java b/app/src/main/java/com/ds/avare/RegisterActivity.java index 991a8de6..70c23df1 100644 --- a/app/src/main/java/com/ds/avare/RegisterActivity.java +++ b/app/src/main/java/com/ds/avare/RegisterActivity.java @@ -19,6 +19,7 @@ import android.text.TextUtils; import android.view.View; import android.view.WindowManager; +import android.webkit.WebView; import android.widget.Button; import android.widget.EditText; import android.widget.Toast; @@ -47,6 +48,7 @@ public class RegisterActivity extends BaseActivity { // Register button private Button mButtonRegister; private EditText mEmailEditText; + private WebView mPrivacy; private void setButtonStates() { if(mPref.isRegistered()) { @@ -95,6 +97,11 @@ public void onCreate(Bundle savedInstanceState) { mEmailEditText = (EditText) findViewById(R.id.edittext_register); mButtonRegister = (Button) findViewById(R.id.btn_register); + /* + * privacy policy load + */ + mPrivacy = (WebView)findViewById(R.id.privacy_webview); + mPrivacy.loadUrl(com.ds.avare.utils.Helper.getWebViewFile(getApplicationContext(), "privacy")); // Check if Internet present if (!Helper.isNetworkAvailable(this)) { @@ -263,7 +270,7 @@ protected void onPostExecute(Boolean result) { DecoratedAlertDialogBuilder alertDialogBuilder = new DecoratedAlertDialogBuilder(RegisterActivity.this); alertDialogBuilder .setTitle(getString(R.string.register)) - .setMessage(getString(R.string.registered_1800wxbrief)) + .setMessage(getString(R.string.registered)) .setPositiveButton(getString(R.string.OK), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml index b5f39e52..63555228 100644 --- a/app/src/main/res/layout/activity_register.xml +++ b/app/src/main/res/layout/activity_register.xml @@ -11,16 +11,25 @@ All rights reserved. android:layout_width="match_parent" android:layout_height="match_parent"> + + + android:layout_weight="1" + android:layout_height="0dp">