drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 13:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Update styles of edit button

Browse Source 
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-09-11 19:23:34 +02:00
committed by jeanbaptisteC
parent b88839c3d8
commit 314982b65a
4 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
View File

@@ -6,6 +6,7 @@ import static app.organicmaps.sdk.util.Utils.getLocalizedFeatureType;
import static app.organicmaps.sdk.util.Utils.getTagValueLocalized;
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.drawable.Drawable;
import android.location.Location;
import android.net.Uri;
@@ -310,11 +311,8 @@ public class PlacePageView extends Fragment
mTvEntrance = mEntrance.findViewById(R.id.tv__place_entrance);
mTvLastChecked = mFrame.findViewById(R.id.place_page_last_checked);
mEditPlace = mFrame.findViewById(R.id.ll__place_editor);
mEditPlace.setOnClickListener(this);
mAddOrganisation = mFrame.findViewById(R.id.ll__add_organisation);
mAddOrganisation.setOnClickListener(this);
mAddPlace = mFrame.findViewById(R.id.ll__place_add);
mAddPlace.setOnClickListener(this);
mEditTopSpace = mFrame.findViewById(R.id.edit_top_space);
latlon.setOnLongClickListener(this);
address.setOnLongClickListener(this);
@@ -681,12 +679,15 @@ public class PlacePageView extends Fragment
UiUtils.showIf(Editor.nativeShouldShowEditPlace(), mEditPlace);
UiUtils.showIf(Editor.nativeShouldShowAddBusiness(), mAddOrganisation);
UiUtils.showIf(Editor.nativeShouldShowAddPlace(), mAddPlace);
mEditPlace.setEnabled(Editor.nativeShouldEnableEditPlace());
mAddOrganisation.setEnabled(Editor.nativeShouldEnableAddPlace());
mAddPlace.setEnabled(Editor.nativeShouldEnableAddPlace());
MaterialTextView mTvEditPlace = mEditPlace.findViewById(R.id.tv__editor);
MaterialTextView mTvAddBusiness = mAddPlace.findViewById(R.id.tv__editor);
MaterialTextView mTvAddPlace = mAddPlace.findViewById(R.id.tv__editor);
MaterialButton mTvEditPlace = mEditPlace.findViewById(R.id.mb__place_editor);
MaterialButton mTvAddBusiness = mAddOrganisation.findViewById(R.id.mb__add_organisation);
MaterialButton mTvAddPlace = mAddPlace.findViewById(R.id.mb__place_add);
mTvEditPlace.setOnClickListener(this);
mTvAddBusiness.setOnClickListener(this);
mTvAddPlace.setOnClickListener(this);
mTvEditPlace.setEnabled(Editor.nativeShouldEnableEditPlace());
mTvAddBusiness.setEnabled(Editor.nativeShouldEnableAddPlace());
mTvAddPlace.setEnabled(Editor.nativeShouldEnableAddPlace());
final int editPlaceButtonColor =
Editor.nativeShouldEnableEditPlace()
? ContextCompat.getColor(
@@ -696,6 +697,9 @@ public class PlacePageView extends Fragment
mTvEditPlace.setTextColor(editPlaceButtonColor);
mTvAddBusiness.setTextColor(editPlaceButtonColor);
mTvAddPlace.setTextColor(editPlaceButtonColor);
mTvEditPlace.setStrokeColor(ColorStateList.valueOf(editPlaceButtonColor));
mTvAddBusiness.setStrokeColor(ColorStateList.valueOf(editPlaceButtonColor));
mTvAddPlace.setStrokeColor(ColorStateList.valueOf(editPlaceButtonColor));
UiUtils.showIf(
UiUtils.isVisible(mEditPlace) || UiUtils.isVisible(mAddOrganisation) || UiUtils.isVisible(mAddPlace),
mEditTopSpace);
@@ -853,11 +857,11 @@ public class PlacePageView extends Fragment
// A workaround to make single taps toggle the bottom sheet.
mPlacePageViewListener.onPlacePageRequestToggleState();
}
else if (id == R.id.ll__place_editor)
else if (id == R.id.mb__place_editor)
((MwmActivity) requireActivity()).showEditor();
else if (id == R.id.ll__add_organisation)
else if (id == R.id.mb__add_organisation)
addOrganisation();
else if (id == R.id.ll__place_add)
else if (id == R.id.mb__place_add)
addPlace();
else if (id == R.id.ll__place_latlon)
{

11
android/app/src/main/res/layout/place_page_add.xml
View File

@@ -6,9 +6,10 @@
style="@style/PlacePageItemFrame"
tools:visibility="visible">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__editor"
style="@style/PlacePageMetadataText.Button"
android:text="@string/placepage_add_place_button"
android:gravity="center"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/mb__place_add"
style="@style/MwmWidget.M3.Button.Secondary"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/placepage_add_place_button" />
</LinearLayout>

9
android/app/src/main/res/layout/place_page_add_business.xml
View File

@@ -7,10 +7,11 @@
android:visibility="visible"
tools:visibility="visible">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__editor"
style="@style/PlacePageMetadataText.Button"
android:gravity="center"
<com.google.android.material.button.MaterialButton
android:id="@+id/mb__add_organisation"
style="@style/MwmWidget.M3.Button.Secondary"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/placepage_add_business_button"/>
</LinearLayout>

9
android/app/src/main/res/layout/place_page_editor.xml
View File

@@ -5,9 +5,10 @@
android:id="@+id/ll__place_editor"
style="@style/PlacePageItemFrame"
tools:visibility="visible">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__editor"
style="@style/PlacePageMetadataText.Button"
android:gravity="center"
<com.google.android.material.button.MaterialButton
android:id="@+id/mb__place_editor"
style="@style/MwmWidget.M3.Button.Secondary"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/edit_place"/>
</LinearLayout>