Pixelfed
/
Vernissage
mirror of https://github.com/VernissageApp/Vernissage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix image size and color of active buttons

This commit is contained in:
Marcin Czachurski 2023-09-27 16:27:01 +02:00
parent a83ae0ee24
commit 15bf208496
4 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Vernissage.xcodeproj/project.pbxproj
View File

@ -1321,7 +1321,7 @@
CODE_SIGN_ENTITLEMENTS = VernissageWidget/VernissageWidgetExtension.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 214;
CURRENT_PROJECT_VERSION = 215;
DEVELOPMENT_TEAM = B2U9FEKYP8;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = VernissageWidget/Info.plist;
@ -1352,7 +1352,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_ENTITLEMENTS = VernissageWidget/VernissageWidgetExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 214;
CURRENT_PROJECT_VERSION = 215;
DEVELOPMENT_TEAM = B2U9FEKYP8;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = VernissageWidget/Info.plist;
@ -1382,7 +1382,7 @@
CODE_SIGN_ENTITLEMENTS = VernissageShare/VernissageShareExtension.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 214;
CURRENT_PROJECT_VERSION = 215;
DEVELOPMENT_TEAM = B2U9FEKYP8;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = VernissageShare/Info.plist;
@ -1411,7 +1411,7 @@
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = NO;
CODE_SIGN_ENTITLEMENTS = VernissageShare/VernissageShareExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 214;
CURRENT_PROJECT_VERSION = 215;
DEVELOPMENT_TEAM = B2U9FEKYP8;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = VernissageShare/Info.plist;
@ -1565,7 +1565,7 @@
CODE_SIGN_ENTITLEMENTS = Vernissage/Vernissage.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 214;
CURRENT_PROJECT_VERSION = 215;
DEVELOPMENT_ASSET_PATHS = "\"Vernissage/Preview Content\"";
DEVELOPMENT_TEAM = B2U9FEKYP8;
ENABLE_PREVIEWS = YES;
@ -1608,7 +1608,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Vernissage/Vernissage.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 214;
CURRENT_PROJECT_VERSION = 215;
DEVELOPMENT_ASSET_PATHS = "\"Vernissage/Preview Content\"";
DEVELOPMENT_TEAM = B2U9FEKYP8;
ENABLE_PREVIEWS = YES;

21
Vernissage/ViewModifiers/NavigationMenuButtons.swift
View File

@ -20,7 +20,7 @@ private struct NavigationMenuButtons: ViewModifier {
@EnvironmentObject var routerPath: RouterPath
private let onViewModeIconTap: (MainView.ViewMode) -> Void
private let imageFontSize = UIDevice.isIPad ? 30.0 : 20.0
private let imageFontSize = 20.0
private let customMenuItems = [
NavigationMenuItemDetails(viewMode: .home),
@ -88,22 +88,22 @@ private struct NavigationMenuButtons: ViewModifier {
self.contextMenuView()
self.customMenuItemsView()
}
.frame(height: UIDevice.isIPad ? 64 : 50)
.padding(.horizontal, UIDevice.isIPad ? 16 : 8)
.frame(height: 50)
.padding(.horizontal, 8)
.background(.ultraThinMaterial)
.clipShape(Capsule())
self.composeImageView()
.frame(height: UIDevice.isIPad ? 64 : 50)
.padding(.horizontal, UIDevice.isIPad ? 16 : 8)
.frame(height: 50)
.padding(.horizontal, 8)
.background(.ultraThinMaterial)
.clipShape(Circle())
}
} else {
HStack(alignment: .center) {
self.composeImageView()
.frame(height: UIDevice.isIPad ? 64 : 50)
.padding(.horizontal, UIDevice.isIPad ? 16 : 8)
.frame(height: 50)
.padding(.horizontal, 8)
.background(.ultraThinMaterial)
.clipShape(Circle())
@ -111,8 +111,8 @@ private struct NavigationMenuButtons: ViewModifier {
self.customMenuItemsView()
self.contextMenuView()
}
.frame(height: UIDevice.isIPad ? 64 : 50)
.padding(.horizontal, UIDevice.isIPad ? 16 : 8)
.frame(height: 50)
.padding(.horizontal, 8)
.background(.ultraThinMaterial)
.clipShape(Capsule())
}
@ -128,7 +128,6 @@ private struct NavigationMenuButtons: ViewModifier {
} label: {
Image(systemName: "ellipsis")
.font(.system(size: self.imageFontSize))
.fontWeight(UIDevice.isIPad ? .light : .regular)
.foregroundColor(.mainTextColor.opacity(0.75))
.padding(.vertical, 10)
.padding(.horizontal, 8)
@ -150,7 +149,6 @@ private struct NavigationMenuButtons: ViewModifier {
} label: {
Image(systemName: "plus")
.font(.system(size: self.imageFontSize))
.fontWeight(UIDevice.isIPad ? .light : .regular)
.foregroundColor(.mainTextColor.opacity(0.75))
.padding(.vertical, 10)
.padding(.horizontal, 8)
@ -164,7 +162,6 @@ private struct NavigationMenuButtons: ViewModifier {
} label: {
Image(systemName: displayedCustomMenuItem.image)
.font(.system(size: self.imageFontSize))
.fontWeight(UIDevice.isIPad ? .light : .regular)
.foregroundColor(.mainTextColor.opacity(0.75))
.padding(.vertical, 10)
.padding(.horizontal, 8)

4
Vernissage/Views/UserProfileView/Subviews/UserProfileStatusesView.swift
View File

@ -61,7 +61,7 @@ struct UserProfileStatusesView: View {
}
} label: {
Image(systemName: "rectangle.grid.1x2.fill")
.foregroundColor(self.applicationState.showGridOnUserProfile ? .customGrayColor : .accentColor)
.foregroundColor(self.applicationState.showGridOnUserProfile ? .customGrayColor : applicationState.tintColor.color())
.padding(.trailing, 8)
.padding(.bottom, 8)
}
@ -72,7 +72,7 @@ struct UserProfileStatusesView: View {
}
} label: {
Image(systemName: "rectangle.grid.2x2.fill")
.foregroundColor(self.applicationState.showGridOnUserProfile ? .accentColor : .customGrayColor)
.foregroundColor(self.applicationState.showGridOnUserProfile ? applicationState.tintColor.color() : .customGrayColor)
.padding(.trailing, 16)
.padding(.bottom, 8)
}

2
WidgetsKit/Sources/WidgetsKit/ViewModifiers/DeviceRotation.swift
View File

@ -74,7 +74,7 @@ struct DeviceImageGallery: ViewModifier {
return GalleryProperties(imageColumns: imageColumns,
containerWidth: (geometry.size.width - Double(marginSpacing)) / Double(imageColumns),
containerHeight: geometry.size.height / Double(imageColumns))
containerHeight: (geometry.size.height - Double(marginSpacing)) / Double(imageColumns))
}
}
}