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

[ios] ui and sorting fixes

Browse source
This commit is contained in:
mamadnazar 2025-03-13 21:33:34 +05:00
parent a7d7d80a8a
commit 77f098acb6
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
iphone/Maps/Common/Common.swift
View file

@ -24,8 +24,9 @@ func toString(_ cls: AnyClass) -> String {
}
func statusBarHeight() -> CGFloat {
let statusBarSize = UIApplication.shared.statusBarFrame.size
return min(statusBarSize.height, statusBarSize.width)
return UIApplication.shared.connectedScenes
.compactMap { $0 as? UIWindowScene }
.first?.statusBarManager?.statusBarFrame.height ?? 0
}
private let enableLoggingInRelease = true

10
iphone/Maps/Tourism/Data/Db/PersistenceControllers/PlacesPersistenceController.swift
View file

@ -167,7 +167,10 @@ class PlacesPersistenceController: NSObject, NSFetchedResultsControllerDelegate
func observeTopSights() {
let fetchRequest: NSFetchRequest<PlaceEntity> = PlaceEntity.fetchRequest()
fetchRequest.predicate = NSPredicate(format: "categoryId == %lld", PlaceCategory.sights.id)
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "rating", ascending: false)]
fetchRequest.sortDescriptors = [
NSSortDescriptor(key: "rating", ascending: false),
NSSortDescriptor(key: "name", ascending: true)
]
fetchRequest.fetchLimit = 15
topSightsFetchedResultsController = NSFetchedResultsController(
@ -189,7 +192,10 @@ class PlacesPersistenceController: NSObject, NSFetchedResultsControllerDelegate
func observeTopRestaurants() {
let fetchRequest: NSFetchRequest<PlaceEntity> = PlaceEntity.fetchRequest()
fetchRequest.predicate = NSPredicate(format: "categoryId == %lld", PlaceCategory.restaurants.id)
fetchRequest.sortDescriptors = [NSSortDescriptor(key: "rating", ascending: false)]
fetchRequest.sortDescriptors = [
NSSortDescriptor(key: "rating", ascending: false),
NSSortDescriptor(key: "name", ascending: true)
]
fetchRequest.fetchLimit = 15
topRestaurantsFetchedResultsController = NSFetchedResultsController(

2
iphone/Maps/Tourism/Presentation/Components/LoadImg.swift
View file

@ -24,6 +24,8 @@ struct LoadImageView: View {
.resizable()
.indicator(.activity)
.scaledToFill()
.frame(maxWidth: UIScreen.main.bounds.width, maxHeight: 150) // Constrain the width and height
.clipped()
.transition(.fade(duration: 0.2))
if(isError) {
Image(systemName: "exclamationmark.circle")

2
iphone/Maps/Tourism/Presentation/Home/Screens/Profile/PlaceDetails/Components/PlaceTopBar.swift
View file

@ -65,7 +65,7 @@ struct PlaceTopBar: View {
}
}
}
.frame(maxWidth: .infinity, maxHeight: height)
.frame(width: UIScreen.main.bounds.width, height: height)
}
}