From 4c218d66cb23a13481a33e1400ba90f6e17c1a2b Mon Sep 17 00:00:00 2001 From: Jean-BaptisteC Date: Sun, 12 Nov 2023 10:32:03 +0100 Subject: [PATCH] Refactor bookmark category fragment Signed-off-by: Jean-BaptisteC --- android/app/src/main/AndroidManifest.xml | 3 +- .../BookmarkCategorySettingsFragment.java | 14 ++++++- .../res/drawable-hdpi/ic_clear_rounded.webp | Bin 242 -> 0 bytes .../drawable-hdpi/ic_clear_rounded_night.webp | Bin 270 -> 0 bytes .../res/drawable-mdpi/ic_clear_rounded.webp | Bin 170 -> 0 bytes .../drawable-mdpi/ic_clear_rounded_night.webp | Bin 188 -> 0 bytes .../res/drawable-xhdpi/ic_clear_rounded.webp | Bin 304 -> 0 bytes .../ic_clear_rounded_night.webp | Bin 322 -> 0 bytes .../res/drawable-xxhdpi/ic_clear_rounded.webp | Bin 456 -> 0 bytes .../ic_clear_rounded_night.webp | Bin 506 -> 0 bytes .../drawable-xxxhdpi/ic_clear_rounded.webp | Bin 598 -> 0 bytes .../ic_clear_rounded_night.webp | Bin 658 -> 0 bytes .../main/res/drawable/ic_clear_rounded.xml | 11 +++++ .../res/layout-land/fragment_osm_login.xml | 4 +- .../fragment_bookmark_category_settings.xml | 39 +++++++++--------- .../app/src/main/res/values/themes-base.xml | 2 - 16 files changed, 48 insertions(+), 25 deletions(-) delete mode 100644 android/app/src/main/res/drawable-hdpi/ic_clear_rounded.webp delete mode 100644 android/app/src/main/res/drawable-hdpi/ic_clear_rounded_night.webp delete mode 100644 android/app/src/main/res/drawable-mdpi/ic_clear_rounded.webp delete mode 100644 android/app/src/main/res/drawable-mdpi/ic_clear_rounded_night.webp delete mode 100644 android/app/src/main/res/drawable-xhdpi/ic_clear_rounded.webp delete mode 100644 android/app/src/main/res/drawable-xhdpi/ic_clear_rounded_night.webp delete mode 100644 android/app/src/main/res/drawable-xxhdpi/ic_clear_rounded.webp delete mode 100644 android/app/src/main/res/drawable-xxhdpi/ic_clear_rounded_night.webp delete mode 100644 android/app/src/main/res/drawable-xxxhdpi/ic_clear_rounded.webp delete mode 100644 android/app/src/main/res/drawable-xxxhdpi/ic_clear_rounded_night.webp create mode 100644 android/app/src/main/res/drawable/ic_clear_rounded.xml diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e922e56ba8..614c1dd0a5 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -848,7 +848,8 @@ + android:label="@string/edit" + android:windowSoftInputMode="stateVisible"/> diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java index bfaf7f0dd9..596b7d343e 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java @@ -9,6 +9,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -19,8 +20,10 @@ import app.organicmaps.bookmarks.data.BookmarkCategory; import app.organicmaps.bookmarks.data.BookmarkManager; import app.organicmaps.util.Utils; +import app.organicmaps.util.InputUtils; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; import java.util.Objects; @@ -63,14 +66,14 @@ public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment private void initViews(@NonNull View root) { mEditCategoryNameView = root.findViewById(R.id.edit_list_name_view); + TextInputLayout clearNameBtn = root.findViewById(R.id.edit_list_name_input); + clearNameBtn.setEndIconOnClickListener(v -> clearAndFocus(mEditCategoryNameView)); mEditCategoryNameView.setText(mCategory.getName()); InputFilter[] f = { new InputFilter.LengthFilter(TEXT_LENGTH_LIMIT) }; mEditCategoryNameView.setFilters(f); mEditCategoryNameView.requestFocus(); mEditDescView = root.findViewById(R.id.edit_description); mEditDescView.setText(mCategory.getDescription()); - View clearNameBtn = root.findViewById(R.id.edit_text_clear_btn); - clearNameBtn.setOnClickListener(v -> mEditCategoryNameView.getEditableText().clear()); } @Override @@ -152,4 +155,11 @@ public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment String categoryDesc = getEditableCategoryDesc(); return !TextUtils.equals(mCategory.getDescription(), categoryDesc); } + + private void clearAndFocus(TextView textView) + { + textView.getEditableText().clear(); + textView.requestFocus(); + InputUtils.showKeyboard(textView); + } } diff --git a/android/app/src/main/res/drawable-hdpi/ic_clear_rounded.webp b/android/app/src/main/res/drawable-hdpi/ic_clear_rounded.webp deleted file mode 100644 index c7a06b2a76d59a59114c48200dc86b2c5102714b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmV6ir6BKC&DJK7wr}`d;GZ$FdP^Dc(%XZ=fscmc`vTB z+$BHXUuU}n?q+NN!#Rk*fRT`}psA4vbIlDZm}_p7in-=Sl_{Bt%qB7il6iMB-+;)s s#D9}Fdtc{`KVIb9mib3S{xz9@R`TChG8v*|vPdbBOlyc_V`C#@0dDJU82|tP diff --git a/android/app/src/main/res/drawable-hdpi/ic_clear_rounded_night.webp b/android/app/src/main/res/drawable-hdpi/ic_clear_rounded_night.webp deleted file mode 100644 index 0bc9336abbc7f75916d9dcced040acc0deb14bc2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmV+p0rCD)Nk&En0RRA3MM6+kP&iEb0000lBftm{$1wl%KmQ6ENos@N`-1`05P%~D zh=GHFxKIQT1O*~MKoAIt#m9qyVI;X}WQO2}`!AIwM-@c$pMl#(iYD#CG4>I};$rE> zX&So{9W@fV84Pn5T1LKyNbjYQ$!H=Q*0!RNYB>*RX86if{Ggh5W&9$)PlTWNr~1Fu z-wyb)EnrwSdUtdE2Xc#{emBpRiIEZOKr z$dZk5f-KpXbV_HUvx&}uRNh_G`37{pCH9-#+51{|d0}7$ UWD$`{rroGytu0_bOd?*IS* diff --git a/android/app/src/main/res/drawable-mdpi/ic_clear_rounded.webp b/android/app/src/main/res/drawable-mdpi/ic_clear_rounded.webp deleted file mode 100644 index 1cc403cd138683d5c8d78548fcf4e15ce2b1adf2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmV;b09F4|Nk&GZ00012MM6+kP&iDL0000l7r+G&Ul0+B+O~mHJ%?le26Aa)?guy3 zwk^y1OMri*0gNsqBfB?%*;$<%5?BE${PjM0s1VVA1#TNPx7iSWVP?f>x9B8h-Y+;E z2DT#5s`EOLW@e{YYF6B1IV1yw=12HF;Pr&c*&XnO(hc>m_#WTE{Dx0HvkX?2K6B8b Y8+wY~NWW3PT{DraG(*ky4|Dw&0GZHAz5oCK diff --git a/android/app/src/main/res/drawable-mdpi/ic_clear_rounded_night.webp b/android/app/src/main/res/drawable-mdpi/ic_clear_rounded_night.webp deleted file mode 100644 index 9f171666ae7bebf89fa948915273cffdb60597cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmV;t07L&$Nk&Gr00012MM6+kP&iDd0000l7r+G&Z!rJ!KmUp%NotdqGoXP#1mFS0 zK?1Q5XapD!7awkGZF`cBSTh1O8^8joVgzezD>u+KYnk=c3DN?tz&8I2uPa3KUt!y} zjg{{0eqm6P|Sd;7<8{TBeojZv-u diff --git a/android/app/src/main/res/drawable-xhdpi/ic_clear_rounded.webp b/android/app/src/main/res/drawable-xhdpi/ic_clear_rounded.webp deleted file mode 100644 index c33094b0823c009adb2319fa419072d736ccd934..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmV-00nh$YNk&E}0RRA3MM6+kP&iB*0RR9mFTe{B#}E;S+O~0aZcl@7zXNhH&_;74 zu-AVJhLLPF`Is~EjQy7yc|044=)VKEkrb)ZS;m9zd4t8ts&1HOV4jAq$}E+n(*(7xe+2p_lyQI znunR!h0pG2A*8*`zkjRCz9Pc9FZd$l(XV_zk2T_P?)aoO>!Z(gtO<_+^p*t>nIJ+| z0Zj4&RR=D4(G4Jz7Q+NKSuxFE*sgu7;KaSi3g}~IO<2(%qQ8*-ccT9t>VN0*|55V) zbR+(!Khyzzo%x}T>FeYVby#2LP2WdM-=|F92Tk8+P2a~&KTa@{k3%lx1B`p>{^BSn+;m|sA_AyUaS3w2nqxo0wcoj9@AZE*+zAWzhA; zNVYm;3h=Ak6tVeM7LF3!|G|=pBBtawTFPjDoH<>%?2V2>Ism!(*YxOMP?Yh#YGfXh&zDrRLGxUBN(+P%{QV$j@ zOtBVfmM}-DWQ_o*IhFya77GNz{}a*`fw2C&Pc$JIrs%iz2#EeCa|A{HYuk*Vn4@oN z5E#uDV~4~<6t$xHHkMqwv(T!c$)hPrWZZ{RiRchltShXGD1VMIto)s|Pgwv==P>y$@LT8vy|PO5Q^N diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_clear_rounded_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_clear_rounded_night.webp deleted file mode 100644 index c54cb57328c54f445293dc923e08c65ace9f552b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 506 zcmV09Q-A4arx8 zYzGk0e+O+{#!;wBWs9NC4QmIw1aAvKQ+9Cj3 z-FXB-bGBL$g!TUe@&$od{=H7zBN%=Bdz}%G^G}rsO8M)$0YMq!?{z?64qr-V1ZGY@ z*Ac-vekf5z-OKH&wR*i>G-jscy&8?7%l-LK?(5@uSMBD#RH@|ld@A=#&*x3!rxTG3 zYM+m*n;ig|$Q}TEoSKB4Nc&~M?$su=5-9_W#;s9UqC#g!T7!lqd8W6Y!6|!r@8CHM_73l&jp^l@H`RE@1N)Y z$P*uU;uTN)q>1M|`GqIn(d1vAdVr@sp{bYH>NlQxlBmArskeov{wL~3c={vZ>DPp( we-xg6R(Ser;pz8rc`0LLhcOqA=+Ky>RY2j#XmAbsEu z7M+3V0((>+ECYuCYBgFGVud;?_m+*oWZ9f8BhdiVj+T{Z-CABOGqH4PZ3L{@C6|Sf zkbbkh7zvS@Su+|9k@lwL*@%cTCGCxhNYKj2h`*{wBO~g6>0opm{%B!@#H7m32 z+!`e@weO9RzWhyVBV~=af4g7J$u(~2F8$tiRoA!Y>*2I(yq+FgekVug^DQ~;ExGLY zrOMK|zvQ$pNq0-9^5%SfxD4Qy^qsM%nG*jA|0Dbvoj~s8{9p6eOZ@dJ zf4jinuJO0a^!*C{ei47aj=x_@->;s*xL^k3ni-7CW-zXt!MK=zTt9<(3I2JN8O#gu z&ufW)UTy~Siv07U;-A-@!Mrs8yt??~0^*Nrh(9hP{xn-uDgL;sL?0KH k_~Y6VeOzARUsoW}uZxgGzpg`)*w>{(ax;quZ8l_HarUXU44Hu|I4V!b<@>AUq}HtILZ42G&RUP%xucB(8s z)o?B<=EJx*oBhFB=FX{B^!{NSJ?H z-$CK`xhB85-Y%l#!mA>tP5x;eMP%2<^RDy@pAU_9K5Z5r*GsPSmt5tu4^@iX_V#q8 zf5`n79@nXQ+fc%}+*NK6mb(w%rb+yjk(N{QuKt3!BFmH!yvSPQJBgbCUffFaoEcHBa`6%jKo+zn%PA6b1c^K z*+Pu?F&b<6Vr>=Q54V=DcV+>8yS030na{mEg8X1vYP>vx{ETn-SMVQ#|3dixYy5c$ ze_q8uF5n;6@Q=&*c|`(w5q@5WpO=E?)d|!E3Dh+S)MW|Ol?l|v_;q~(eF^-&N& + + diff --git a/android/app/src/main/res/layout-land/fragment_osm_login.xml b/android/app/src/main/res/layout-land/fragment_osm_login.xml index 19444d9602..7b61beab80 100644 --- a/android/app/src/main/res/layout-land/fragment_osm_login.xml +++ b/android/app/src/main/res/layout-land/fragment_osm_login.xml @@ -86,7 +86,9 @@ android:textColorHint="?android:textColorSecondary" app:layout_constraintLeft_toRightOf="@id/osm_username_container" app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toTopOf="parent"> + app:layout_constraintTop_toTopOf="parent" + app:endIconMode="password_toggle" + app:endIconTint="?android:textColorSecondary"> @@ -33,36 +34,36 @@ android:id="@+id/edit_name_container" android:layout_width="match_parent" android:layout_height="wrap_content"> + - + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + + android:layout_height="wrap_content" + android:inputType="textMultiLine"/> + @drawable/ic_layers_subway_inactive @drawable/ic_layers_isoline_inactive @color/accent_color_selector - @drawable/ic_clear_rounded @style/TextAppearance @style/TextAppearance.Small @style/TextAppearance.Medium @@ -228,7 +227,6 @@ @drawable/ic_layers_subway_active_night @drawable/ic_layers_isoline_active_night @color/accent_color_selector_night - @drawable/ic_clear_rounded_night @style/TextAppearance @style/TextAppearance.Small @style/TextAppearance.Medium