diff options
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java | 6 | ||||
| -rw-r--r-- | app/src/main/res/layout/a_add_provider.xml | 55 |
2 files changed, 40 insertions, 21 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java index c2345ec1..168fb02e 100644 --- a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java @@ -33,7 +33,6 @@ import android.widget.ListView; import com.pedrogomez.renderers.Renderer; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.json.JSONException; import org.json.JSONObject; @@ -94,6 +93,7 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity final private static String SHOW_FAILED_DIALOG = "SHOW FAILED DIALOG"; final private static String REASON_TO_FAIL = "REASON TO FAIL"; final protected static String SERVICES_RETRIEVED = "SERVICES RETRIEVED"; + final protected static String EXTRAS_KEY_INVALID_URL = "INVALID_URL"; public ProviderAPIResultReceiver providerAPIResultReceiver; private ProviderAPIBroadcastReceiver providerAPIBroadcastReceiver; @@ -196,7 +196,7 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity } else if (requestCode == REQUEST_CODE_ADD_PROVIDER) { if (resultCode == RESULT_OK) { testNewURL = true; - String newUrl = data.getStringExtra("new_url"); + String newUrl = data.getStringExtra(AddProviderActivity.EXTRAS_KEY_NEW_URL); this.provider.setMainUrl(newUrl); showAndSelectProvider(newUrl); } @@ -327,7 +327,7 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity testNewURL = false; FragmentTransaction fragmentTransaction = fragmentManager.removePreviousFragment(NewProviderDialog.TAG); Intent intent = new Intent(this, AddProviderActivity.class); - intent.putExtra("invalid_url", url); + intent.putExtra(EXTRAS_KEY_INVALID_URL, url); startActivityForResult(intent, REQUEST_CODE_ADD_PROVIDER); } diff --git a/app/src/main/res/layout/a_add_provider.xml b/app/src/main/res/layout/a_add_provider.xml index 14bf8482..f7ee3254 100644 --- a/app/src/main/res/layout/a_add_provider.xml +++ b/app/src/main/res/layout/a_add_provider.xml @@ -2,11 +2,11 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" + style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".AddProviderActivity" android:padding="@dimen/stdpadding" - style="@style/BitmaskActivity"> + tools:context=".AddProviderActivity"> <!--Contains header information!??? --> <include layout="@layout/v_add_provider" /> @@ -15,33 +15,52 @@ android:id="@+id/content" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" android:orientation="vertical"> <!-- the header contains the mask--> <include layout="@layout/v_provider_header" /> - <EditText - android:id="@+id/textUri" - android:layout_width="fill_parent" + <android.support.design.widget.TextInputLayout + android:id="@+id/text_uri_error" + android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/activity_vertical_margin" android:hint="@string/new_provider_uri" - android:inputType="text" - android:padding="@dimen/stdpadding"/> - <!-- android:imeOptions="actionSend" => was passieren soll, wenn ok geklickt wird --> + app:errorEnabled="true"> + <android.support.design.widget.TextInputEditText + android:id="@+id/text_uri" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ems="10" + android:inputType="text" /> - <Button - android:id="@+id/button_save" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:text="@string/save" /> + </android.support.design.widget.TextInputLayout> - <Button - android:id="@+id/button_cancel" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:text="@string/cancel" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="right" + android:orientation="horizontal"> + + <Button + android:id="@+id/button_cancel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/cancel" /> + + <Button + android:id="@+id/button_save" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:text="@string/save" /> + </LinearLayout> </LinearLayout> </RelativeLayout> |