mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-30 09:34:06 +00:00
Compare commits
1 Commits
an_dpd
...
jb_dlt_lis
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
59b2f813c7 |
@@ -351,7 +351,6 @@ dependencies {
|
|||||||
implementation libs.androidx.recyclerview
|
implementation libs.androidx.recyclerview
|
||||||
implementation libs.androidx.work.runtime
|
implementation libs.androidx.work.runtime
|
||||||
implementation libs.androidx.lifecycle.process
|
implementation libs.androidx.lifecycle.process
|
||||||
implementation libs.androidx.documentfile
|
|
||||||
implementation libs.android.material
|
implementation libs.android.material
|
||||||
// Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
|
// Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
|
||||||
// https://github.com/organicmaps/organicmaps/issues/6106
|
// https://github.com/organicmaps/organicmaps/issues/6106
|
||||||
|
|||||||
@@ -197,10 +197,8 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
|
|||||||
() -> onShareActionSelected(mSelectedCategory, KmlFileType.Text)));
|
() -> onShareActionSelected(mSelectedCategory, KmlFileType.Text)));
|
||||||
items.add(new MenuBottomSheetItem(R.string.export_file_gpx, R.drawable.ic_file_gpx,
|
items.add(new MenuBottomSheetItem(R.string.export_file_gpx, R.drawable.ic_file_gpx,
|
||||||
() -> onShareActionSelected(mSelectedCategory, KmlFileType.Gpx)));
|
() -> onShareActionSelected(mSelectedCategory, KmlFileType.Gpx)));
|
||||||
// Disallow deleting the last category
|
items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete,
|
||||||
if (getAdapter().getBookmarkCategories().size() > 1)
|
() -> onDeleteActionSelected(mSelectedCategory)));
|
||||||
items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete,
|
|
||||||
() -> onDeleteActionSelected(mSelectedCategory)));
|
|
||||||
}
|
}
|
||||||
return items;
|
return items;
|
||||||
}
|
}
|
||||||
@@ -297,8 +295,19 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
|
|||||||
|
|
||||||
private void onDeleteActionSelected(@NonNull BookmarkCategory category)
|
private void onDeleteActionSelected(@NonNull BookmarkCategory category)
|
||||||
{
|
{
|
||||||
BookmarkManager.INSTANCE.deleteCategory(category.getId());
|
// Disallow deleting the last category
|
||||||
getAdapter().notifyDataSetChanged();
|
if ((getAdapter().getBookmarkCategories().size() > 1))
|
||||||
|
{
|
||||||
|
BookmarkManager.INSTANCE.deleteCategory(category.getId());
|
||||||
|
getAdapter().notifyDataSetChanged();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
new MaterialAlertDialogBuilder(requireActivity())
|
||||||
|
.setMessage(R.string.unable_to_delete_list)
|
||||||
|
.setPositiveButton(android.R.string.ok, (dialog, which) -> dialog.dismiss())
|
||||||
|
.show();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onSettingsActionSelected(@NonNull BookmarkCategory category)
|
private void onSettingsActionSelected(@NonNull BookmarkCategory category)
|
||||||
|
|||||||
@@ -974,4 +974,5 @@
|
|||||||
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
|
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
|
||||||
<string name="download_resources_custom_url_summary_none">Not set</string>
|
<string name="download_resources_custom_url_summary_none">Not set</string>
|
||||||
<string name="download_resources_custom_url_error_scheme">Please enter a full URL starting with https:// and ending with /</string>
|
<string name="download_resources_custom_url_error_scheme">Please enter a full URL starting with https:// and ending with /</string>
|
||||||
|
<string name="unable_to_delete_list">The last list cannot be deleted. Create a new list to remove it</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
[versions]
|
[versions]
|
||||||
androidGradlePlugin = "8.13.2"
|
androidGradlePlugin = "8.11.2"
|
||||||
androidxCarApp = "1.7.0"
|
androidxCarApp = "1.7.0"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
android-tools = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
|
android-tools = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
|
||||||
triplet-play-publisher = { module = "com.github.triplet.gradle:play-publisher", version = "3.13.0" }
|
triplet-play-publisher = { module = "com.github.triplet.gradle:play-publisher", version = "3.12.1" }
|
||||||
huawei-publish = { module = "ru.cian:huawei-publish-gradle-plugin", version = "1.4.2" }
|
huawei-publish = { module = "ru.cian:huawei-publish-gradle-plugin", version = "1.4.2" }
|
||||||
android-tools-desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.5" }
|
android-tools-desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.1.5" }
|
||||||
microg-services-location = { module = "org.microg.gms:play-services-location", version = "0.3.6.244735" }
|
microg-services-location = { module = "org.microg.gms:play-services-location", version = "0.3.6.244735" }
|
||||||
androidx-core = { module = "androidx.core:core", version = "1.17.0" }
|
androidx-core = { module = "androidx.core:core", version = "1.17.0" }
|
||||||
jetbrains-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version = "2.2.21" }
|
jetbrains-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version = "2.2.20" }
|
||||||
androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" }
|
androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" }
|
||||||
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
|
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
|
||||||
androidx-car-app = { module = "androidx.car.app:app", version.ref = "androidxCarApp" }
|
androidx-car-app = { module = "androidx.car.app:app", version.ref = "androidxCarApp" }
|
||||||
@@ -21,13 +21,12 @@ androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version
|
|||||||
androidx-work-runtime = { module = "androidx.work:work-runtime", version = "2.10.5" }
|
androidx-work-runtime = { module = "androidx.work:work-runtime", version = "2.10.5" }
|
||||||
androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version = "2.9.4" }
|
androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version = "2.9.4" }
|
||||||
androidx-media = { module = "androidx.media:media", version = "1.7.1" }
|
androidx-media = { module = "androidx.media:media", version = "1.7.1" }
|
||||||
androidx-documentfile= { module = "androidx.documentfile:documentfile", version ="1.1.0" }
|
|
||||||
android-material = { module = "com.google.android.material:material", version = "1.12.0" }
|
android-material = { module = "com.google.android.material:material", version = "1.12.0" }
|
||||||
google-guava = { module = "com.google.guava:guava", version = "33.5.0-android" }
|
google-guava = { module = "com.google.guava:guava", version = "33.4.8-android" }
|
||||||
appdevnext-androidchart = { module = "com.github.AppDevNext:AndroidChart", version = "3.1.0.31" }
|
appdevnext-androidchart = { module = "com.github.AppDevNext:AndroidChart", version = "3.1.0.31" }
|
||||||
androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.3.0" }
|
androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.3.0" }
|
||||||
junit = { module = "junit:junit", version = "4.13.2" }
|
junit = { module = "junit:junit", version = "4.13.2" }
|
||||||
mockito-core = { module = "org.mockito:mockito-core", version = "5.21.0" }
|
mockito-core = { module = "org.mockito:mockito-core", version = "5.20.0" }
|
||||||
|
|
||||||
[plugins]
|
[plugins]
|
||||||
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
|
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
|
||||||
|
|||||||
@@ -126,7 +126,6 @@ dependencies {
|
|||||||
implementation libs.androidx.recyclerview
|
implementation libs.androidx.recyclerview
|
||||||
implementation libs.androidx.preference
|
implementation libs.androidx.preference
|
||||||
implementation libs.android.material
|
implementation libs.android.material
|
||||||
implementation libs.androidx.documentfile
|
|
||||||
|
|
||||||
testImplementation libs.junit
|
testImplementation libs.junit
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,4 @@
|
|||||||
{
|
{
|
||||||
"World": {
|
|
||||||
"languages": ["int_name", "en", "default"]
|
|
||||||
},
|
|
||||||
"WorldCoasts": {
|
|
||||||
"languages": ["int_name", "en", "default"]
|
|
||||||
},
|
|
||||||
"Abkhazia": {
|
"Abkhazia": {
|
||||||
"languages": ["ab", "ru"]
|
"languages": ["ab", "ru"]
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user