From ba0f2bb0414ba292146b334284c867dfd0f8eea6 Mon Sep 17 00:00:00 2001 From: Emin Date: Thu, 6 Jun 2024 16:16:47 +0500 Subject: [PATCH] remove unnecessary ui elements from the map, other small stuff --- android/app/src/main/AndroidManifest.xml | 2 +- .../java/app/organicmaps/SplashActivity.java | 2 +- .../maplayer/MapButtonsController.java | 3 -- .../widget/placepage/PlacePageController.java | 8 ----- .../widget/placepage/PlacePageView.java | 13 -------- .../src/main/java/app/tourism/MainActivity.kt | 8 ++--- .../main/java/app/tourism/ui/theme/Color.kt | 2 +- .../main/java/app/tourism/ui/theme/Theme.kt | 3 +- .../main/java/app/tourism/ui/theme/Type.kt | 2 +- .../map_buttons_layout_navigation.xml | 21 +++--------- .../map_buttons_layout_planning.xml | 12 ++----- .../src/main/res/layout/layout_nav_bottom.xml | 1 + .../layout/map_buttons_layout_navigation.xml | 8 ----- .../layout/map_buttons_layout_planning.xml | 14 ++------ .../main/res/layout/place_page_details.xml | 2 ++ android/gradle.properties | 33 ++++++++++++------- 16 files changed, 42 insertions(+), 92 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 96a303ed1a..a8578da807 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -333,7 +333,7 @@ diff --git a/android/app/src/main/java/app/organicmaps/SplashActivity.java b/android/app/src/main/java/app/organicmaps/SplashActivity.java index 688d5d9fe1..50a51ad2d7 100644 --- a/android/app/src/main/java/app/organicmaps/SplashActivity.java +++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java @@ -16,7 +16,7 @@ import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.app.AppCompatActivity; -import app.MainActivity; +import app.tourism.MainActivity; import app.organicmaps.display.DisplayManager; import app.organicmaps.location.LocationHelper; import app.organicmaps.util.Config; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java index 94cbbc6f9c..63682a49d3 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java @@ -99,8 +99,6 @@ public class MapButtonsController extends Fragment .setOnClickListener((v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.zoomIn)); mFrame.findViewById(R.id.nav_zoom_out) .setOnClickListener((v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.zoomOut)); - final View bookmarksButton = mFrame.findViewById(R.id.btn_bookmarks); - bookmarksButton.setOnClickListener((v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.bookmarks)); final View myPosition = mFrame.findViewById(R.id.my_position); mNavMyPosition = new MyPositionButton(myPosition, (v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.myPosition)); @@ -140,7 +138,6 @@ public class MapButtonsController extends Fragment mButtonsMap = new HashMap<>(); mButtonsMap.put(MapButtons.zoom, zoomFrame); mButtonsMap.put(MapButtons.myPosition, myPosition); - mButtonsMap.put(MapButtons.bookmarks, bookmarksButton); mButtonsMap.put(MapButtons.search, searchButton); if (mToggleMapLayerButton != null) diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java index 5e0110084b..43e1f864a3 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java @@ -527,18 +527,10 @@ public class PlacePageController extends Fragment implements // And move the bookmark button at the end if (needToShowRoutingButtons && RoutingController.get().isStopPointAllowed()) buttons.add(PlacePageButtons.ButtonType.ROUTE_ADD); - else - buttons.add(mapObject.isBookmark() - ? PlacePageButtons.ButtonType.BOOKMARK_DELETE - : PlacePageButtons.ButtonType.BOOKMARK_SAVE); if (needToShowRoutingButtons) { buttons.add(PlacePageButtons.ButtonType.ROUTE_TO); - if (RoutingController.get().isStopPointAllowed()) - buttons.add(mapObject.isBookmark() - ? PlacePageButtons.ButtonType.BOOKMARK_DELETE - : PlacePageButtons.ButtonType.BOOKMARK_SAVE); } } mViewModel.setCurrentButtons(buttons); diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java index f452f99e79..3a0ac466bf 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java @@ -423,19 +423,6 @@ public class PlacePageView extends Fragment implements View.OnClickListener, // showTaxiOffer(mapObject); - if (RoutingController.get().isNavigating() || RoutingController.get().isPlanning()) - { - UiUtils.hide(mEditPlace, mAddOrganisation, mAddPlace, mEditTopSpace); - } - else - { - UiUtils.showIf(Editor.nativeShouldShowEditPlace(), mEditPlace); - UiUtils.showIf(Editor.nativeShouldShowAddBusiness(), mAddOrganisation); - UiUtils.showIf(Editor.nativeShouldShowAddPlace(), mAddPlace); - UiUtils.showIf(UiUtils.isVisible(mEditPlace) - || UiUtils.isVisible(mAddOrganisation) - || UiUtils.isVisible(mAddPlace), mEditTopSpace); - } updateLinksView(); updateOpeningHoursView(); updateWikipediaView(); diff --git a/android/app/src/main/java/app/tourism/MainActivity.kt b/android/app/src/main/java/app/tourism/MainActivity.kt index 7b1847c7b9..bf92fa197d 100644 --- a/android/app/src/main/java/app/tourism/MainActivity.kt +++ b/android/app/src/main/java/app/tourism/MainActivity.kt @@ -1,4 +1,4 @@ -package app +package app.tourism import android.content.Intent import android.os.Bundle @@ -16,8 +16,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.tooling.preview.Preview import androidx.core.content.ContextCompat.startActivity -import app.organicmaps.MwmActivity -import app.ui.theme.OrganicMapsTheme +import app.organicmaps.DownloadResourcesLegacyActivity +import app.tourism.ui.theme.OrganicMapsTheme class MainActivity : ComponentActivity() { @@ -47,7 +47,7 @@ fun Greeting(name: String, modifier: Modifier = Modifier) { ) Button( onClick = { - val intent = Intent(context, MwmActivity::class.java) + val intent = Intent(context, DownloadResourcesLegacyActivity::class.java) startActivity(context, intent, null) }, ) { diff --git a/android/app/src/main/java/app/tourism/ui/theme/Color.kt b/android/app/src/main/java/app/tourism/ui/theme/Color.kt index 6a5660e800..0a56d1a3a6 100644 --- a/android/app/src/main/java/app/tourism/ui/theme/Color.kt +++ b/android/app/src/main/java/app/tourism/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package app.ui.theme +package app.tourism.ui.theme import androidx.compose.ui.graphics.Color diff --git a/android/app/src/main/java/app/tourism/ui/theme/Theme.kt b/android/app/src/main/java/app/tourism/ui/theme/Theme.kt index f2c57e76a7..8a312a556f 100644 --- a/android/app/src/main/java/app/tourism/ui/theme/Theme.kt +++ b/android/app/src/main/java/app/tourism/ui/theme/Theme.kt @@ -1,6 +1,5 @@ -package app.ui.theme +package app.tourism.ui.theme -import android.app.Activity import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme diff --git a/android/app/src/main/java/app/tourism/ui/theme/Type.kt b/android/app/src/main/java/app/tourism/ui/theme/Type.kt index 0b50d1309e..7923899405 100644 --- a/android/app/src/main/java/app/tourism/ui/theme/Type.kt +++ b/android/app/src/main/java/app/tourism/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package app.ui.theme +package app.tourism.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/android/app/src/main/res/layout-h400dp/map_buttons_layout_navigation.xml b/android/app/src/main/res/layout-h400dp/map_buttons_layout_navigation.xml index f20833f98b..88abf3ce83 100644 --- a/android/app/src/main/res/layout-h400dp/map_buttons_layout_navigation.xml +++ b/android/app/src/main/res/layout-h400dp/map_buttons_layout_navigation.xml @@ -14,7 +14,7 @@ android:layout_height="match_parent" android:visibility="gone" tools:visibility="visible" /> - - + android:layout_centerInParent="true"/> - + android:layout_centerVertical="true"/> + - diff --git a/android/app/src/main/res/layout/map_buttons_layout_navigation.xml b/android/app/src/main/res/layout/map_buttons_layout_navigation.xml index ad3fac1b19..97743a754e 100644 --- a/android/app/src/main/res/layout/map_buttons_layout_navigation.xml +++ b/android/app/src/main/res/layout/map_buttons_layout_navigation.xml @@ -25,14 +25,6 @@ android:padding="@dimen/nav_frame_padding" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent"> - - + android:layout_alignParentBottom="true" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent"/> diff --git a/android/gradle.properties b/android/gradle.properties index 91d7895ad5..434fae6668 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,15 +1,24 @@ +## For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx1024m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. For more details, visit +# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects +# org.gradle.parallel=true +#Thu Jun 06 15:38:47 TJT 2024 +android.native.buildOutput=verbose +android.nonFinalResIds=false +android.nonTransitiveRClass=true +android.useAndroidX=true +enableVulkanDiagnostics=OFF +org.gradle.caching=true +org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1024M" -Xms256m +propCompileSdkVersion=34 propMinSdkVersion=21 propTargetSdkVersion=34 -propCompileSdkVersion=34 - -org.gradle.caching=true -org.gradle.jvmargs=-Xmx1024m -Xms256m -android.useAndroidX=true -android.native.buildOutput=verbose -android.nonTransitiveRClass=true -android.nonFinalResIds=false - -enableVulkanDiagnostics=OFF - -# Autogenerated by tools/unix/generate_localizations.sh supportedLocalizations=af,ar,az,be,bg,ca,cs,da,de,el,en,en_GB,es,es_MX,et,eu,fa,fi,fr,fr_CA,iw,hi,hu,in,it,ja,ko,lt,mr,nb,nl,pl,pt,pt_BR,ro,ru,sk,sv,sw,th,tr,uk,vi,zh,zh_HK,zh_MO,zh_TW