summaryrefslogtreecommitdiff
path: root/app/src/production/java/se/leap
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2018-07-04 23:42:45 +0200
committercyBerta <cyberta@riseup.net>2018-07-04 23:42:45 +0200
commitba94657badcc5a05214a057fa938124bdf1ad47a (patch)
treed2562627ba32973f0ffb5e29ff5578042c26acd0 /app/src/production/java/se/leap
parentd63dd4b36701f2f993e671f8cc3c5424b787e43a (diff)
#8886 add layout for tablets and improve tablet and phone layouts in general by implementing dynamic layout changes when keyboard appears
Diffstat (limited to 'app/src/production/java/se/leap')
-rw-r--r--app/src/production/java/se/leap/bitmaskclient/AddProviderActivity.java92
1 files changed, 9 insertions, 83 deletions
diff --git a/app/src/production/java/se/leap/bitmaskclient/AddProviderActivity.java b/app/src/production/java/se/leap/bitmaskclient/AddProviderActivity.java
index 13e4e06d..32c78c38 100644
--- a/app/src/production/java/se/leap/bitmaskclient/AddProviderActivity.java
+++ b/app/src/production/java/se/leap/bitmaskclient/AddProviderActivity.java
@@ -11,103 +11,29 @@ import android.widget.Button;
import butterknife.InjectView;
-public class AddProviderActivity extends ConfigWizardBaseActivity {
+public class AddProviderActivity extends AddProviderBaseActivity {
final public static String TAG = "AddProviderActivity";
- final public static String EXTRAS_KEY_NEW_URL = "NEW_URL";
- @InjectView(R.id.text_uri_error)
- TextInputLayout urlError;
-
- @InjectView(R.id.text_uri)
- TextInputEditText editUrl;
+ @InjectView(R.id.button_save)
+ Button saveButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
setContentView(R.layout.a_add_provider);
- if (this.getIntent().getExtras() != null) {
- editUrl.setText(this.getIntent().getExtras().getString(ProviderListBaseActivity.EXTRAS_KEY_INVALID_URL));
- }
- final Button saveButton = findViewById(R.id.button_save);
- saveButton.setOnClickListener(new View.OnClickListener() {
- public void onClick(View v) {
- saveProvider();
- }
- });
-
- final Button cancelButton = findViewById(R.id.button_cancel);
- cancelButton.setOnClickListener(new View.OnClickListener() {
- public void onClick(View v) {
- finish();
- }
- });
- setUpListeners();
- setUpInitialUI();
- }
-
- private void setUpInitialUI() {
- setProviderHeaderText(R.string.add_provider);
- hideProgressBar();
- }
+ init();
- private void saveProvider() {
- String entered_url = getURL();
- if (validURL(entered_url)) {
- Intent intent = this.getIntent();
- intent.putExtra(EXTRAS_KEY_NEW_URL, entered_url);
- setResult(RESULT_OK, intent);
- finish();
- } else {
- editUrl.setText("");
- urlError.setError(getString(R.string.not_valid_url_entered));
- }
}
- private void setUpListeners() {
- editUrl.addTextChangedListener(new TextWatcher() {
- @Override
- public void beforeTextChanged(CharSequence s, int start, int count, int after) {
- }
-
- @Override
- public void onTextChanged(CharSequence s, int start, int before, int count) {
- }
- @Override
- public void afterTextChanged(Editable s) {
- if (!validURL(getURL())) {
- urlError.setError(getString(R.string.not_valid_url_entered));
- } else {
- urlError.setError(null);
- }
+ @Override
+ public void setupSaveButton() {
+ saveButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ saveProvider();
}
});
}
-
- private String getURL() {
- String entered_url = editUrl.getText().toString().trim();
- if (entered_url.contains("www.")) entered_url = entered_url.replaceFirst("www.", "");
- if (!entered_url.startsWith("https://")) {
- if (entered_url.startsWith("http://")) {
- entered_url = entered_url.substring("http://".length());
- }
- entered_url = "https://".concat(entered_url);
- }
- return entered_url;
- }
-
- /**
- * Checks if the entered url is valid or not.
- *
- * @param enteredUrl
- * @return true if it's not empty nor contains only the protocol.
- */
- boolean validURL(String enteredUrl) {
- return android.util.Patterns.WEB_URL.matcher(enteredUrl).matches();
- }
-
-
}