Skip to content

Commit

Permalink
prevent warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
ramack committed Dec 19, 2018
1 parent df46131 commit 0245b76
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
9 changes: 8 additions & 1 deletion app/src/main/res/layout/activity_login.xml
Expand Up @@ -56,12 +56,14 @@
android:id="@+id/url"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autofillHints="url"
android:contentDescription="@string/login_url_description"
android:hint="@string/login_url_hint"
android:imeOptions="actionNext"
android:inputType="textUri"
android:maxLines="1"
android:minHeight="48dp"
android:nextFocusDown="@+id/username"
android:autofillHints="url"
android:text="@={viewModel.url}" />
</android.support.design.widget.TextInputLayout>

Expand All @@ -75,9 +77,11 @@
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:contentDescription="@string/login_username_description"
android:hint="@string/login_username_hint"
android:imeOptions="actionNext"
android:inputType="text"
android:minHeight="48dp"
android:maxLines="1"
android:nextFocusDown="@+id/password"
android:nextFocusUp="@+id/url"
Expand All @@ -96,9 +100,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:contentDescription="@string/login_password_description"
android:hint="@string/login_password_hint"
android:imeOptions="actionDone"
android:inputType="textPassword"
android:minHeight="48dp"
android:maxLines="1"
android:nextFocusDown="@+id/login_button"
android:nextFocusUp="@+id/username"
Expand All @@ -107,6 +113,7 @@
</android.support.design.widget.TextInputLayout>

<android.support.design.widget.FloatingActionButton
android:contentDescription="@string/login_button_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/res/values/strings.xml
Expand Up @@ -42,12 +42,16 @@

<!-- Login -->
<string name="login_url_hint">Site address</string>
<string name="login_username_hint">Username (optional)</string>
<string name="login_password_hint">Password (optional)</string>
<string name="login_url_description">URL of the Piwigo gallery to login</string>
<string name="login_url_empty">Enter your site address</string>
<string name="login_url_invalid">Not a valid site address</string>
<string name="login_username_description">Username to login to the Piwigo gallery</string>
<string name="login_username_empty">Enter your username</string>
<string name="login_username_hint">Username (empty for guest)</string>
<string name="login_password_description">Password to login to the Piwigo gallery</string>
<string name="login_button_description">Login</string>
<string name="login_password_empty">Enter your password</string>
<string name="login_password_hint">Password (empty for guest)</string>
<string name="login_error">Login failed, please try again</string>
<string name="login_account_error">An account for this site already exists</string>
<string name="login_host_error">Host could not be reached, please check site address</string>
Expand Down

0 comments on commit 0245b76

Please sign in to comment.