Extract Base URL from authentication
This commit is contained in:
Kirill Kamakin
@@ -25,44 +25,28 @@
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/password_input_layout"
|
||||
style="@style/SmallMarginTextInputLayoutStyle"
|
||||
android:hint="@string/fragment_authentication_input_hint_password"
|
||||
app:layout_constraintBottom_toTopOf="@+id/url_input_layout"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:endIconMode="password_toggle"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/email_input_layout">
|
||||
android:id="@+id/password_input_layout"
|
||||
style="@style/SmallMarginTextInputLayoutStyle"
|
||||
android:hint="@string/fragment_authentication_input_hint_password"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:endIconMode="password_toggle"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/email_input_layout">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/password_input"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textPassword" />
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/password_input"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textPassword" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/url_input_layout"
|
||||
style="@style/SmallMarginTextInputLayoutStyle"
|
||||
android:hint="@string/fragment_authentication_input_hint_url"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/password_input_layout">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/url_input"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textUri" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<Button
|
||||
android:id="@+id/button"
|
||||
android:text="@string/fragment_authentication_button_login"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
style="@style/SmallMarginButton"
|
||||
app:layout_constraintTop_toBottomOf="@+id/url_input_layout" />
|
||||
<Button
|
||||
android:id="@+id/button"
|
||||
android:text="@string/fragment_authentication_button_login"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
style="@style/SmallMarginButton"
|
||||
app:layout_constraintTop_toBottomOf="@+id/password_input_layout" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
34
app/src/main/res/layout/fragment_base_url.xml
Normal file
34
app/src/main/res/layout/fragment_base_url.xml
Normal file
@@ -0,0 +1,34 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout 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"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".ui.baseurl.BaseURLFragment">
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/url_input_layout"
|
||||
style="@style/SmallMarginTextInputLayoutStyle"
|
||||
android:hint="@string/fragment_authentication_input_hint_url"
|
||||
app:layout_constraintBottom_toTopOf="@+id/button"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_chainStyle="packed">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/url_input"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textUri" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<Button
|
||||
android:id="@+id/button"
|
||||
style="@style/SmallMarginButton"
|
||||
android:text="@string/fragment_base_url_save"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/url_input_layout" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -48,8 +48,8 @@
|
||||
android:label="DisclaimerFragment"
|
||||
tools:layout="@layout/fragment_disclaimer">
|
||||
<action
|
||||
android:id="@+id/action_disclaimerFragment_to_authenticationFragment"
|
||||
app:destination="@id/authenticationFragment"
|
||||
android:id="@+id/action_disclaimerFragment_to_baseURLFragment"
|
||||
app:destination="@id/baseURLFragment"
|
||||
app:popUpTo="@id/nav_graph"
|
||||
app:popUpToInclusive="true" />
|
||||
</fragment>
|
||||
@@ -73,5 +73,19 @@
|
||||
app:destination="@id/recipesFragment"
|
||||
app:popUpTo="@id/nav_graph"
|
||||
app:popUpToInclusive="true" />
|
||||
<action
|
||||
android:id="@+id/action_splashFragment_to_baseURLFragment"
|
||||
app:destination="@id/baseURLFragment"
|
||||
app:popUpTo="@id/nav_graph"
|
||||
app:popUpToInclusive="true" />
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/baseURLFragment"
|
||||
android:name="gq.kirmanak.mealient.ui.baseurl.BaseURLFragment"
|
||||
android:label="fragment_base_url"
|
||||
tools:layout="@layout/fragment_base_url">
|
||||
<action
|
||||
android:id="@+id/action_baseURLFragment_to_recipesFragment"
|
||||
app:destination="@id/recipesFragment" />
|
||||
</fragment>
|
||||
</navigation>
|
||||
@@ -16,8 +16,9 @@
|
||||
<string name="fragment_authentication_password_input_empty">Пароль не может быть пустым</string>
|
||||
<string name="fragment_authentication_url_input_empty">URL не может быть пустым</string>
|
||||
<string name="fragment_authentication_credentials_incorrect">E-mail или пароль не подходит.</string>
|
||||
<string name="fragment_authentication_no_connection">Ошибка подключения, проверьте адрес.</string>
|
||||
<string name="fragment_authentication_unexpected_response">Неожиданный ответ. Это Mealie?</string>
|
||||
<string name="fragment_base_url_no_connection">Ошибка подключения, проверьте адрес.</string>
|
||||
<string name="fragment_base_url_unexpected_response">Неожиданный ответ. Это Mealie?</string>
|
||||
<string name="fragment_authentication_unknown_error">Что-то пошло не так, попробуйте еще раз.</string>
|
||||
<string name="fragment_authentication_url_invalid">Проверьте формат URL: %s</string>
|
||||
<string name="fragment_base_url_malformed_url">Проверьте формат URL: %s</string>
|
||||
<string name="fragment_base_url_save">Продолжить</string>
|
||||
</resources>
|
||||
@@ -18,8 +18,10 @@
|
||||
<string name="fragment_authentication_password_input_empty">Password can\'t be empty</string>
|
||||
<string name="fragment_authentication_url_input_empty">URL can\'t be empty</string>
|
||||
<string name="fragment_authentication_credentials_incorrect">E-mail or password is incorrect.</string>
|
||||
<string name="fragment_authentication_no_connection">Can\'t connect, check address.</string>
|
||||
<string name="fragment_authentication_unexpected_response">Unexpected response. Is it Mealie?</string>
|
||||
<string name="fragment_base_url_no_connection">Can\'t connect, check address.</string>
|
||||
<string name="fragment_base_url_unexpected_response">Unexpected response. Is it Mealie?</string>
|
||||
<string name="fragment_authentication_unknown_error">Something went wrong, please try again.</string>
|
||||
<string name="fragment_authentication_url_invalid">Check URL format: %s</string>
|
||||
<string name="fragment_base_url_malformed_url">Check URL format: %s</string>
|
||||
<string name="fragment_base_url_save">Proceed</string>
|
||||
<string name="fragment_base_url_unknown_error" translatable="false">@string/fragment_authentication_unknown_error</string>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user