gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Remove custom text input layout

Browse source 
Signed-off-by: Jean-BaptisteC <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste 2023-12-04 17:54:04 +01:00 • committed by Alexander Borsuk
parent dff11dfcf4
commit 653647cfa0
6 changed files with 22 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
android/app/src/main/java/app/organicmaps/widget/CustomTextInputLayout.java
View file

@ -1,51 +0,0 @@
package app.organicmaps.widget;
import android.content.Context;
import android.graphics.Canvas;
import android.text.TextUtils;
import android.util.AttributeSet;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
import com.google.android.material.textfield.TextInputLayout;
/**
* Fixes bug mentioned here https://code.google.com/p/android/issues/detail?id=175228
*/
public class CustomTextInputLayout extends TextInputLayout
{
private boolean mHintChanged = true;
public CustomTextInputLayout(Context context)
{
super(context);
}
public CustomTextInputLayout(Context context, AttributeSet attrs)
{
super(context, attrs);
}
@Override
protected void onDraw(Canvas canvas)
{
super.onDraw(canvas);
if (mHintChanged && ViewCompat.isLaidOut(this))
{
// In case that hint is changed programmatically
CharSequence currentEditTextHint = getEditText().getHint();
if (!TextUtils.isEmpty(currentEditTextHint))
setHint(currentEditTextHint);
mHintChanged = false;
}
}
@Override
public void setHint(@Nullable CharSequence hint)
{
super.setHint(hint);
mHintChanged = true;
}
}

11
android/app/src/main/res/layout-land/fragment_osm_login.xml
View file

@ -64,7 +64,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_half">
<app.organicmaps.widget.CustomTextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/osm_username_container"
style="@style/MwmWidget.Editor.CustomTextInput"
android:layout_width="0dp"
@ -72,14 +72,15 @@
android:textColorHint="?android:textColorSecondary"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/osm_password_container"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
app:endIconMode="custom">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/osm_username"
style="@style/MwmWidget.Editor.FieldLayout.EditText"
android:autofillHints="emailAddress"
android:hint="@string/email_or_username" />
</app.organicmaps.widget.CustomTextInputLayout>
<app.organicmaps.widget.CustomTextInputLayout
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/osm_password_container"
style="@style/MwmWidget.Editor.CustomTextInput"
android:layout_width="0dp"
@ -95,7 +96,7 @@
android:autofillHints="password"
android:hint="@string/password"
android:inputType="textPassword" />
</app.organicmaps.widget.CustomTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"

8
android/app/src/main/res/layout/edit_bookmark_common.xml
View file

@ -15,7 +15,7 @@
android:layout_marginStart="@dimen/margin_half"
android:layout_marginEnd="@dimen/margin_half"
android:orientation="vertical">
<app.organicmaps.widget.CustomTextInputLayout
<com.google.android.material.textfield.TextInputLayout
style="?fontBody1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -28,7 +28,7 @@
android:hint="@string/name"
android:inputType="textCapSentences"
android:singleLine="true" />
</app.organicmaps.widget.CustomTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<RelativeLayout
android:id="@+id/rl__bookmark_set"
@ -75,7 +75,7 @@
android:padding="@dimen/margin_half"
tools:src="@drawable/ic_bookmark_none" />
</RelativeLayout>
<app.organicmaps.widget.CustomTextInputLayout
<com.google.android.material.textfield.TextInputLayout
style="?fontBody1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -89,5 +89,5 @@
android:layout_height="wrap_content"
android:hint="@string/edit_description_hint"
android:inputType="textMultiLine" />
</app.organicmaps.widget.CustomTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</RelativeLayout>

8
android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
View file

@ -34,7 +34,7 @@
android:id="@+id/edit_name_container"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<app.organicmaps.widget.CustomTextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/edit_list_name_input"
style="@style/MwmWidget.Editor.CustomTextInput"
android:textColorHint="?android:textColorSecondary"
@ -47,10 +47,10 @@
android:hint="@string/list"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</app.organicmaps.widget.CustomTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</LinearLayout>
<app.organicmaps.widget.CustomTextInputLayout
<com.google.android.material.textfield.TextInputLayout
style="@style/MwmWidget.Editor.CustomTextInput"
android:textColorHint="?android:textColorSecondary">
<com.google.android.material.textfield.TextInputEditText
@ -63,7 +63,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textMultiLine"/>
</app.organicmaps.widget.CustomTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<View
android:background="?android:attr/windowBackground"
android:layout_width="match_parent"

4
android/app/src/main/res/layout/fragment_editor.xml
View file

@ -271,7 +271,7 @@
android:layout_height="32dp"
android:text="@string/editor_other_info"
android:textAppearance="@style/MwmTextAppearance.Body2"/>
<app.organicmaps.widget.CustomTextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/custom_input"
style="@style/MwmWidget.Editor.CustomTextInput"
android:gravity="center_vertical"
@ -282,7 +282,7 @@
style="@style/MwmWidget.Editor.FieldLayout.EditText"
android:inputType="textMultiLine"
android:hint="@string/editor_detailed_description_hint"/>
</app.organicmaps.widget.CustomTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"

11
android/app/src/main/res/layout/fragment_osm_login.xml
View file

@ -60,17 +60,18 @@
android:text="@string/login_to_make_edits_visible"
android:textAppearance="@style/MwmTextAppearance.Body2"
android:textColor="?android:textColorPrimary" />
<app.organicmaps.widget.CustomTextInputLayout
<com.google.android.material.textfield.TextInputLayout
style="@style/MwmWidget.Editor.CustomTextInput"
android:layout_marginTop="@dimen/margin_half"
android:textColorHint="?android:textColorSecondary">
android:textColorHint="?android:textColorSecondary"
app:endIconMode="custom">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/osm_username"
style="@style/MwmWidget.Editor.FieldLayout.EditText"
android:autofillHints="emailAddress"
android:hint="@string/email_or_username" />
</app.organicmaps.widget.CustomTextInputLayout>
<app.organicmaps.widget.CustomTextInputLayout
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
style="@style/MwmWidget.Editor.CustomTextInput"
android:layout_marginTop="@dimen/margin_base"
android:textColorHint="?android:textColorSecondary"
@ -82,7 +83,7 @@
android:autofillHints="password"
android:hint="@string/password"
android:inputType="textPassword" />
</app.organicmaps.widget.CustomTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"