diff --git a/Palace/AppInfrastructure/TPPAppDelegate.swift b/Palace/AppInfrastructure/TPPAppDelegate.swift index 8c17bb8b..9f561f27 100644 --- a/Palace/AppInfrastructure/TPPAppDelegate.swift +++ b/Palace/AppInfrastructure/TPPAppDelegate.swift @@ -51,49 +51,114 @@ class TPPAppDelegate: UIResponder, UIApplicationDelegate { window?.makeKeyAndVisible() window?.rootViewController = TPPRootTabBarController.shared() - let insets = window?.safeAreaInsets - let bottom = insets?.bottom - - let itemAppearance = UITabBarItemAppearance() - itemAppearance.normal.badgePositionAdjustment.horizontal = 3 - itemAppearance.normal.badgePositionAdjustment.vertical = 1 - itemAppearance.normal.badgeBackgroundColor = UIColor(named: "ColorEkirjastoRedCircle") - itemAppearance.normal.badgeTextAttributes = [.foregroundColor: UIColor(named: "ColorEkirjastoAlwaysBlack")!, .font: UIFont.boldPalaceFont(ofSize: 11)] - if let bottom = bottom { - itemAppearance.normal.titlePositionAdjustment = UIOffset(horizontal: 5.0, vertical: CGFloat.minimum(bottom, 6.0)) - }else { - itemAppearance.normal.titlePositionAdjustment = UIOffset(horizontal: 5.0, vertical: 6.0) - } + let safeAreaInsets = window?.safeAreaInsets + + + // UITabBarItemAppearance + // Customize the appearance of one tab bar item in different states. + // The tab bar item contains icon image, title text and possible badge + // States used: + // normal = inactive tab bar item + // selected = active tab bar item + // The appearance we define for the normal state is used as default appearance for tab bar items + let tabBarItemAppearance = UITabBarItemAppearance() - let paragraphStyle = NSMutableParagraphStyle() - paragraphStyle.lineBreakMode = .byTruncatingTail - paragraphStyle.allowsDefaultTighteningForTruncation = false + // Set badge position + // The badge (if appears) is shown in the top right corner of tab bar item + tabBarItemAppearance.normal.badgePositionAdjustment = UIOffset( + horizontal: 3.0, + vertical: 1.0 + ) - // iPads have more space so set the font to be larger than in iPhones - let fontSize = UIDevice.current.userInterfaceIdiom == .pad ? 18.0 : 12.0 - let font = UIFontMetrics.default.scaledFont(for: UIFont(name: TPPConfiguration.ekirjastoFontName(), size: fontSize) ?? UIFont.systemFont(ofSize: fontSize)) - let foregroundColor = TPPConfiguration.compatiblePrimaryColor() + // Set badge style + let badgeBackgroundColor = UIColor(named: "ColorEkirjastoRedCircle") + let badgeForegroundColor = UIColor(named: "ColorEkirjastoAlwaysBlack")! + let badgeFont = UIFont.boldPalaceFont(ofSize: 11) - itemAppearance.normal.titleTextAttributes = [ - .foregroundColor: foregroundColor, - .font: font, - .paragraphStyle: paragraphStyle + tabBarItemAppearance.normal.badgeBackgroundColor = badgeBackgroundColor + tabBarItemAppearance.normal.badgeTextAttributes = [ + .foregroundColor: badgeForegroundColor, + .font: badgeFont ] - let appearance = UITabBarAppearance() - appearance.stackedLayoutAppearance = itemAppearance - appearance.inlineLayoutAppearance = itemAppearance - appearance.compactInlineLayoutAppearance = itemAppearance + // Set title position + // Title is shown below the icon in iPhones and on the right side of icon in iPads. + // Title is positioned with 2 values: + // horizontal = positive value moves title to the right, we have set this always to be 5.0 + // vertical = positive value moves title downwards, we base this on how much not-used space in bottom we have. + // For example in smaller iPhones there is no extra space at bottom (bottomInset is 0.0) + let horizontalOffset: CGFloat = 5.0 + + let verticalOffset: CGFloat + if let bottomInset = safeAreaInsets?.bottom { + verticalOffset = CGFloat.minimum(bottomInset, 6.0) + } else { + verticalOffset = 6.0 + } - UITabBar.appearance().standardAppearance = appearance - UITabBar.appearance().tintColor = TPPConfiguration.compatiblePrimaryColor() //Edited by Ebblis + tabBarItemAppearance.normal.titlePositionAdjustment = UIOffset( + horizontal: horizontalOffset, + vertical: verticalOffset + ) + + // Set title text style + // iPads have more space so we can set the title font to be even larger than in iPhones. + // We also set different title text color for the selected (active) tab bar item (to match the icon color). + let titleFontSize = UIDevice.current.userInterfaceIdiom == .pad ? 18.0 : 12.0 + let ekirjastoFont = UIFont(name: TPPConfiguration.ekirjastoFontName(), size: titleFontSize) + let systemFont = UIFont.systemFont(ofSize: titleFontSize) + + let titleFont = UIFontMetrics.default.scaledFont(for: ekirjastoFont ?? systemFont) + + let titleParagraphStyle = NSMutableParagraphStyle() + titleParagraphStyle.lineBreakMode = .byTruncatingTail + titleParagraphStyle.allowsDefaultTighteningForTruncation = false + + tabBarItemAppearance.normal.titleTextAttributes = [ + .font: titleFont, + .foregroundColor: TPPConfiguration.normalTabBarItemTitleColor(), + .paragraphStyle: titleParagraphStyle + ] + + tabBarItemAppearance.selected.titleTextAttributes = [ + .foregroundColor: TPPConfiguration.selectedTabBarItemTitleColor() + ] + + + // UITabBarAppearance + // Set the appearance of the tab bar items in tab bar. + // Use the tabBarItemAppearance we already defined for the one tab bar item + + let tabBarAppearance = UITabBarAppearance() + tabBarAppearance.stackedLayoutAppearance = tabBarItemAppearance + tabBarAppearance.inlineLayoutAppearance = tabBarItemAppearance + tabBarAppearance.compactInlineLayoutAppearance = tabBarItemAppearance + + + // UITabBar + // Set the appearance of the tab bar (the bottom bar in app) + // Use the tabBarAppearance already defined for the tab bar + + UITabBar.appearance().standardAppearance = tabBarAppearance + UITabBar.appearance().tintColor = TPPConfiguration.compatiblePrimaryColor() UITabBar.appearance().backgroundColor = TPPConfiguration.backgroundColor() + + // UINavigationBar + // Set the appearance of the navigation bar (the top bar in app) + // Two size variations exist: + // standardAppearance = used if navigation bar is currently of normal (standard) height + // compactAppearance = used if small navigation bar is shown (iPhone in landscape) + // Standard and compact apperances are used when user is scrolling down the content in view, + // otherwise the scroll edge apperances are used (for example if there is no scrollable content in view) + // scrollEdgeAppearance = used when view is scrolled to top (content top is "touching" the navigation bar) + UINavigationBar.appearance().tintColor = TPPConfiguration.iconColor() UINavigationBar.appearance().standardAppearance = TPPConfiguration.defaultAppearance() UINavigationBar.appearance().compactAppearance = TPPConfiguration.defaultAppearance() UINavigationBar.appearance().scrollEdgeAppearance = TPPConfiguration.defaultAppearance() + if #available(iOS 15.0, *) { UINavigationBar.appearance().compactScrollEdgeAppearance = TPPConfiguration.defaultAppearance() } diff --git a/Palace/AppInfrastructure/TPPConfiguration+Ekirjasto.swift b/Palace/AppInfrastructure/TPPConfiguration+Ekirjasto.swift index ee4b7025..fefeb746 100644 --- a/Palace/AppInfrastructure/TPPConfiguration+Ekirjasto.swift +++ b/Palace/AppInfrastructure/TPPConfiguration+Ekirjasto.swift @@ -175,12 +175,20 @@ extension TPPConfiguration { } } - @objc static func catalogSegmentedControlBackgroundColorNormal() -> UIColor { + @objc static func normalTabBarItemTitleColor() -> UIColor { if #available(iOS 13, *) { - return UIColor(named: "ColorEkirjastoFilterButtonBackgroundNormal")! + return UIColor(named: "ColorEkirjastoGrey")! } else { return .lightGray } } - + + @objc static func selectedTabBarItemTitleColor() -> UIColor { + if #available(iOS 13, *) { + return UIColor(named: "ColorEkirjastoLabel")! + } else { + return .lightGray + } + } + } diff --git a/Palace/EkirjastoConfig/Colors.xcassets/ColorEkirjastoGrey.colorset/Contents.json b/Palace/EkirjastoConfig/Colors.xcassets/ColorEkirjastoGrey.colorset/Contents.json index 4a8fe991..23270071 100644 --- a/Palace/EkirjastoConfig/Colors.xcassets/ColorEkirjastoGrey.colorset/Contents.json +++ b/Palace/EkirjastoConfig/Colors.xcassets/ColorEkirjastoGrey.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x9A", - "green" : "0x9A", - "red" : "0x9A" + "blue" : "0x75", + "green" : "0x75", + "red" : "0x75" } }, "idiom" : "universal" @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x9A", - "green" : "0x9A", - "red" : "0x9A" + "blue" : "0x94", + "green" : "0x94", + "red" : "0x94" } }, "idiom" : "universal" diff --git a/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/Contents.json b/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/Contents.json index 5a13fdfd..d5787084 100644 --- a/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/Contents.json +++ b/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/Contents.json @@ -15,6 +15,7 @@ "scale" : "1x" }, { + "filename" : "ekirjasto-icon-browseBooks-grey-042-@2x.png", "idiom" : "universal", "scale" : "2x" }, @@ -25,11 +26,12 @@ "value" : "dark" } ], + "filename" : "ekirjasto-icon-browseBooks-grey-054-@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "catalog-inactive.png", + "filename" : "ekirjasto-icon-browseBooks-grey-042-@3x.png", "idiom" : "universal", "scale" : "3x" }, @@ -40,7 +42,7 @@ "value" : "dark" } ], - "filename" : "catalog-active-72.png", + "filename" : "ekirjasto-icon-browseBooks-grey-054-@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/catalog-active-72.png b/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/catalog-active-72.png deleted file mode 100644 index 17a65324..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/catalog-active-72.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/catalog-inactive.png b/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/catalog-inactive.png deleted file mode 100644 index 58fc6522..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/catalog-inactive.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/ekirjasto-icon-browseBooks-grey-042-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/ekirjasto-icon-browseBooks-grey-042-@2x.png new file mode 100644 index 00000000..1dd4a2d6 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/ekirjasto-icon-browseBooks-grey-042-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/ekirjasto-icon-browseBooks-grey-042-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/ekirjasto-icon-browseBooks-grey-042-@3x.png new file mode 100644 index 00000000..f128cedc Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/ekirjasto-icon-browseBooks-grey-042-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/ekirjasto-icon-browseBooks-grey-054-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/ekirjasto-icon-browseBooks-grey-054-@2x.png new file mode 100644 index 00000000..4776d835 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/ekirjasto-icon-browseBooks-grey-054-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/ekirjasto-icon-browseBooks-grey-054-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/ekirjasto-icon-browseBooks-grey-054-@3x.png new file mode 100644 index 00000000..94f990f4 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Catalog.imageset/ekirjasto-icon-browseBooks-grey-054-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/Contents.json b/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/Contents.json index 04e2bb84..a4a09f98 100644 --- a/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/Contents.json +++ b/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/Contents.json @@ -15,6 +15,7 @@ "scale" : "1x" }, { + "filename" : "ekirjasto-icon-browseBooks-black-088-@2x.png", "idiom" : "universal", "scale" : "2x" }, @@ -25,11 +26,12 @@ "value" : "dark" } ], + "filename" : "ekirjasto-icon-browseBooks-white-100-@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "catalog-active-72.png", + "filename" : "ekirjasto-icon-browseBooks-black-088-@3x.png", "idiom" : "universal", "scale" : "3x" }, @@ -40,7 +42,7 @@ "value" : "dark" } ], - "filename" : "ekirjastoCatalogActiveDark.png", + "filename" : "ekirjasto-icon-browseBooks-white-100-@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/catalog-active-72.png b/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/catalog-active-72.png deleted file mode 100644 index 17a65324..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/catalog-active-72.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/ekirjasto-icon-browseBooks-black-088-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/ekirjasto-icon-browseBooks-black-088-@2x.png new file mode 100644 index 00000000..7454ebf4 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/ekirjasto-icon-browseBooks-black-088-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/ekirjasto-icon-browseBooks-black-088-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/ekirjasto-icon-browseBooks-black-088-@3x.png new file mode 100644 index 00000000..987f1fa2 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/ekirjasto-icon-browseBooks-black-088-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/ekirjasto-icon-browseBooks-white-100-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/ekirjasto-icon-browseBooks-white-100-@2x.png new file mode 100644 index 00000000..d53811c3 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/ekirjasto-icon-browseBooks-white-100-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/ekirjasto-icon-browseBooks-white-100-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/ekirjasto-icon-browseBooks-white-100-@3x.png new file mode 100644 index 00000000..13a20b5e Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/ekirjasto-icon-browseBooks-white-100-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/ekirjastoCatalogActiveDark.png b/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/ekirjastoCatalogActiveDark.png deleted file mode 100644 index c7add10b..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/CatalogSelected.imageset/ekirjastoCatalogActiveDark.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/Contents.json b/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/Contents.json index 92ba9899..dca222c6 100644 --- a/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/Contents.json +++ b/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/Contents.json @@ -15,6 +15,7 @@ "scale" : "1x" }, { + "filename" : "ekirjasto-icon-holds-grey-042-@2x.png", "idiom" : "universal", "scale" : "2x" }, @@ -25,11 +26,12 @@ "value" : "dark" } ], + "filename" : "ekirjasto-icon-holds-grey-054-@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "reservation-inactiove.png", + "filename" : "ekirjasto-icon-holds-grey-042-@3x.png", "idiom" : "universal", "scale" : "3x" }, @@ -40,7 +42,7 @@ "value" : "dark" } ], - "filename" : "reservation-active-72.png", + "filename" : "ekirjasto-icon-holds-grey-054-@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/ekirjasto-icon-holds-grey-042-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/ekirjasto-icon-holds-grey-042-@2x.png new file mode 100644 index 00000000..d44da4a0 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/ekirjasto-icon-holds-grey-042-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/ekirjasto-icon-holds-grey-042-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/ekirjasto-icon-holds-grey-042-@3x.png new file mode 100644 index 00000000..95131e5f Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/ekirjasto-icon-holds-grey-042-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/ekirjasto-icon-holds-grey-054-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/ekirjasto-icon-holds-grey-054-@2x.png new file mode 100644 index 00000000..9b35a444 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/ekirjasto-icon-holds-grey-054-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/ekirjasto-icon-holds-grey-054-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/ekirjasto-icon-holds-grey-054-@3x.png new file mode 100644 index 00000000..2720973d Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/ekirjasto-icon-holds-grey-054-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/reservation-active-72.png b/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/reservation-active-72.png deleted file mode 100644 index 8ee47b5d..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/reservation-active-72.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/reservation-inactiove.png b/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/reservation-inactiove.png deleted file mode 100644 index 2bc7d828..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/Holds.imageset/reservation-inactiove.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/Contents.json b/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/Contents.json index d6dbb23a..5fff6686 100644 --- a/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/Contents.json +++ b/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/Contents.json @@ -15,6 +15,7 @@ "scale" : "1x" }, { + "filename" : "ekirjasto-icon-holds-black-088-@2x.png", "idiom" : "universal", "scale" : "2x" }, @@ -25,11 +26,12 @@ "value" : "dark" } ], + "filename" : "ekirjasto-icon-holds-white-100-@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "reservation-active-72.png", + "filename" : "ekirjasto-icon-holds-black-088-@3x.png", "idiom" : "universal", "scale" : "3x" }, @@ -40,7 +42,7 @@ "value" : "dark" } ], - "filename" : "ekirjastoReservationActiveDark.png", + "filename" : "ekirjasto-icon-holds-white-100-@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/ekirjasto-icon-holds-black-088-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/ekirjasto-icon-holds-black-088-@2x.png new file mode 100644 index 00000000..84437bd0 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/ekirjasto-icon-holds-black-088-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/ekirjasto-icon-holds-black-088-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/ekirjasto-icon-holds-black-088-@3x.png new file mode 100644 index 00000000..816f84d0 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/ekirjasto-icon-holds-black-088-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/ekirjasto-icon-holds-white-100-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/ekirjasto-icon-holds-white-100-@2x.png new file mode 100644 index 00000000..903b2f22 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/ekirjasto-icon-holds-white-100-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/ekirjasto-icon-holds-white-100-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/ekirjasto-icon-holds-white-100-@3x.png new file mode 100644 index 00000000..0020c048 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/ekirjasto-icon-holds-white-100-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/ekirjastoReservationActiveDark.png b/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/ekirjastoReservationActiveDark.png deleted file mode 100644 index 7f4d1e53..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/ekirjastoReservationActiveDark.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/reservation-active-72.png b/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/reservation-active-72.png deleted file mode 100644 index 8ee47b5d..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/HoldsSelected.imageset/reservation-active-72.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/Contents.json b/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/Contents.json index 7b968a16..1ad7db9e 100644 --- a/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/Contents.json +++ b/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/Contents.json @@ -15,6 +15,7 @@ "scale" : "1x" }, { + "filename" : "ekirjasto-icon-magazines-grey-042-@2x.png", "idiom" : "universal", "scale" : "2x" }, @@ -25,11 +26,12 @@ "value" : "dark" } ], + "filename" : "ekirjasto-icon-magazines-grey-054-@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "newspaper-any.png", + "filename" : "ekirjasto-icon-magazines-grey-042-@3x.png", "idiom" : "universal", "scale" : "3x" }, @@ -40,7 +42,7 @@ "value" : "dark" } ], - "filename" : "newspaper-dark.png", + "filename" : "ekirjasto-icon-magazines-grey-054-@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/ekirjasto-icon-magazines-grey-042-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/ekirjasto-icon-magazines-grey-042-@2x.png new file mode 100644 index 00000000..4c43f287 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/ekirjasto-icon-magazines-grey-042-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/ekirjasto-icon-magazines-grey-042-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/ekirjasto-icon-magazines-grey-042-@3x.png new file mode 100644 index 00000000..c3ded298 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/ekirjasto-icon-magazines-grey-042-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/ekirjasto-icon-magazines-grey-054-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/ekirjasto-icon-magazines-grey-054-@2x.png new file mode 100644 index 00000000..ed860e7c Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/ekirjasto-icon-magazines-grey-054-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/ekirjasto-icon-magazines-grey-054-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/ekirjasto-icon-magazines-grey-054-@3x.png new file mode 100644 index 00000000..6b156c70 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/ekirjasto-icon-magazines-grey-054-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/newspaper-any.png b/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/newspaper-any.png deleted file mode 100644 index 56c48858..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/newspaper-any.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/newspaper-dark.png b/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/newspaper-dark.png deleted file mode 100644 index faadf1fc..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/Magazines.imageset/newspaper-dark.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/Contents.json b/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/Contents.json index 42df8dd5..4455f469 100644 --- a/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/Contents.json +++ b/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/Contents.json @@ -15,6 +15,7 @@ "scale" : "1x" }, { + "filename" : "ekirjasto-icon-magazines-black-088-@2x.png", "idiom" : "universal", "scale" : "2x" }, @@ -25,11 +26,12 @@ "value" : "dark" } ], + "filename" : "ekirjasto-icon-magazines-white-100-@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "newspaper-selected-any.png", + "filename" : "ekirjasto-icon-magazines-black-088-@3x.png", "idiom" : "universal", "scale" : "3x" }, @@ -40,7 +42,7 @@ "value" : "dark" } ], - "filename" : "newspaper-selected-dark.png", + "filename" : "ekirjasto-icon-magazines-white-100-@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/ekirjasto-icon-magazines-black-088-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/ekirjasto-icon-magazines-black-088-@2x.png new file mode 100644 index 00000000..1ae07acc Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/ekirjasto-icon-magazines-black-088-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/ekirjasto-icon-magazines-black-088-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/ekirjasto-icon-magazines-black-088-@3x.png new file mode 100644 index 00000000..237c6996 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/ekirjasto-icon-magazines-black-088-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/ekirjasto-icon-magazines-white-100-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/ekirjasto-icon-magazines-white-100-@2x.png new file mode 100644 index 00000000..83d07409 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/ekirjasto-icon-magazines-white-100-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/ekirjasto-icon-magazines-white-100-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/ekirjasto-icon-magazines-white-100-@3x.png new file mode 100644 index 00000000..089601ac Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/ekirjasto-icon-magazines-white-100-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/newspaper-selected-any.png b/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/newspaper-selected-any.png deleted file mode 100644 index bb011546..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/newspaper-selected-any.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/newspaper-selected-dark.png b/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/newspaper-selected-dark.png deleted file mode 100644 index b2c6e83a..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/MagazinesSelected.imageset/newspaper-selected-dark.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/Contents.json b/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/Contents.json index 0d4ab5ad..957b004c 100644 --- a/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/Contents.json +++ b/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/Contents.json @@ -15,6 +15,7 @@ "scale" : "1x" }, { + "filename" : "ekirjasto-icon-myBooks-grey-042-@2x.png", "idiom" : "universal", "scale" : "2x" }, @@ -25,11 +26,12 @@ "value" : "dark" } ], + "filename" : "ekirjasto-icon-myBooks-grey-054-@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "mybooks-inactive.png", + "filename" : "ekirjasto-icon-myBooks-grey-042-@3x.png", "idiom" : "universal", "scale" : "3x" }, @@ -40,7 +42,7 @@ "value" : "dark" } ], - "filename" : "mybooks-active-72.png", + "filename" : "ekirjasto-icon-myBooks-grey-054-@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/ekirjasto-icon-myBooks-grey-042-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/ekirjasto-icon-myBooks-grey-042-@2x.png new file mode 100644 index 00000000..b2f1a8b5 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/ekirjasto-icon-myBooks-grey-042-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/ekirjasto-icon-myBooks-grey-042-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/ekirjasto-icon-myBooks-grey-042-@3x.png new file mode 100644 index 00000000..327e547f Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/ekirjasto-icon-myBooks-grey-042-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/ekirjasto-icon-myBooks-grey-054-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/ekirjasto-icon-myBooks-grey-054-@2x.png new file mode 100644 index 00000000..24bcb76c Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/ekirjasto-icon-myBooks-grey-054-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/ekirjasto-icon-myBooks-grey-054-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/ekirjasto-icon-myBooks-grey-054-@3x.png new file mode 100644 index 00000000..7b50666e Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/ekirjasto-icon-myBooks-grey-054-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/mybooks-active-72.png b/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/mybooks-active-72.png deleted file mode 100644 index b305a311..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/mybooks-active-72.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/mybooks-inactive.png b/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/mybooks-inactive.png deleted file mode 100644 index ac831a32..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/MyBooks.imageset/mybooks-inactive.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/Contents.json b/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/Contents.json index 2ef7b8e3..c46a4240 100644 --- a/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/Contents.json +++ b/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/Contents.json @@ -15,6 +15,7 @@ "scale" : "1x" }, { + "filename" : "ekirjasto-icon-myBooks-black-088-@2x.png", "idiom" : "universal", "scale" : "2x" }, @@ -25,11 +26,12 @@ "value" : "dark" } ], + "filename" : "ekirjasto-icon-myBooks-white-100-@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "mybooks-active-72.png", + "filename" : "ekirjasto-icon-myBooks-black-088-@3x.png", "idiom" : "universal", "scale" : "3x" }, @@ -40,7 +42,7 @@ "value" : "dark" } ], - "filename" : "ekirjastoMybooksActiveDark.png", + "filename" : "ekirjasto-icon-myBooks-white-100-@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/ekirjasto-icon-myBooks-black-088-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/ekirjasto-icon-myBooks-black-088-@2x.png new file mode 100644 index 00000000..e1516580 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/ekirjasto-icon-myBooks-black-088-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/ekirjasto-icon-myBooks-black-088-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/ekirjasto-icon-myBooks-black-088-@3x.png new file mode 100644 index 00000000..aba0a371 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/ekirjasto-icon-myBooks-black-088-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/ekirjasto-icon-myBooks-white-100-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/ekirjasto-icon-myBooks-white-100-@2x.png new file mode 100644 index 00000000..f5940996 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/ekirjasto-icon-myBooks-white-100-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/ekirjasto-icon-myBooks-white-100-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/ekirjasto-icon-myBooks-white-100-@3x.png new file mode 100644 index 00000000..062c0c08 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/ekirjasto-icon-myBooks-white-100-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/ekirjastoMybooksActiveDark.png b/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/ekirjastoMybooksActiveDark.png deleted file mode 100644 index a8d88058..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/ekirjastoMybooksActiveDark.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/mybooks-active-72.png b/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/mybooks-active-72.png deleted file mode 100644 index b305a311..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/MyBooksSelected.imageset/mybooks-active-72.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/Contents.json b/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/Contents.json index 7a9c47eb..e042b4e1 100644 --- a/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/Contents.json +++ b/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/Contents.json @@ -15,6 +15,7 @@ "scale" : "1x" }, { + "filename" : "ekirjasto-icon-settings-grey-042-@2x.png", "idiom" : "universal", "scale" : "2x" }, @@ -25,11 +26,12 @@ "value" : "dark" } ], + "filename" : "ekirjasto-icon-settings-grey-054-@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "settings.png", + "filename" : "ekirjasto-icon-settings-grey-042-@3x.png", "idiom" : "universal", "scale" : "3x" }, @@ -40,7 +42,7 @@ "value" : "dark" } ], - "filename" : "settings-active-72.png", + "filename" : "ekirjasto-icon-settings-grey-054-@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/ekirjasto-icon-settings-grey-042-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/ekirjasto-icon-settings-grey-042-@2x.png new file mode 100644 index 00000000..57382cbb Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/ekirjasto-icon-settings-grey-042-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/ekirjasto-icon-settings-grey-042-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/ekirjasto-icon-settings-grey-042-@3x.png new file mode 100644 index 00000000..e4722760 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/ekirjasto-icon-settings-grey-042-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/ekirjasto-icon-settings-grey-054-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/ekirjasto-icon-settings-grey-054-@2x.png new file mode 100644 index 00000000..10a6333c Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/ekirjasto-icon-settings-grey-054-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/ekirjasto-icon-settings-grey-054-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/ekirjasto-icon-settings-grey-054-@3x.png new file mode 100644 index 00000000..25514aaf Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/ekirjasto-icon-settings-grey-054-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/settings-active-72.png b/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/settings-active-72.png deleted file mode 100644 index 823c0dc0..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/settings-active-72.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/settings.png b/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/settings.png deleted file mode 100644 index cd7c08f3..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/Settings.imageset/settings.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/Contents.json b/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/Contents.json index 86f9a31d..2e157eb6 100644 --- a/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/Contents.json +++ b/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/Contents.json @@ -15,6 +15,7 @@ "scale" : "1x" }, { + "filename" : "ekirjasto-icon-settings-black-088-@2x.png", "idiom" : "universal", "scale" : "2x" }, @@ -25,11 +26,12 @@ "value" : "dark" } ], + "filename" : "ekirjasto-icon-settings-white-100-@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "settings-active-72.png", + "filename" : "ekirjasto-icon-settings-black-088-@3x.png", "idiom" : "universal", "scale" : "3x" }, @@ -40,7 +42,7 @@ "value" : "dark" } ], - "filename" : "ekirjastosettingsactivedark.png", + "filename" : "ekirjasto-icon-settings-white-100-@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/ekirjasto-icon-settings-black-088-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/ekirjasto-icon-settings-black-088-@2x.png new file mode 100644 index 00000000..4e02a563 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/ekirjasto-icon-settings-black-088-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/ekirjasto-icon-settings-black-088-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/ekirjasto-icon-settings-black-088-@3x.png new file mode 100644 index 00000000..4769fea5 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/ekirjasto-icon-settings-black-088-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/ekirjasto-icon-settings-white-100-@2x.png b/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/ekirjasto-icon-settings-white-100-@2x.png new file mode 100644 index 00000000..46561f36 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/ekirjasto-icon-settings-white-100-@2x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/ekirjasto-icon-settings-white-100-@3x.png b/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/ekirjasto-icon-settings-white-100-@3x.png new file mode 100644 index 00000000..b9250a72 Binary files /dev/null and b/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/ekirjasto-icon-settings-white-100-@3x.png differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/ekirjastosettingsactivedark.png b/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/ekirjastosettingsactivedark.png deleted file mode 100644 index 2df43c70..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/ekirjastosettingsactivedark.png and /dev/null differ diff --git a/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/settings-active-72.png b/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/settings-active-72.png deleted file mode 100644 index 823c0dc0..00000000 Binary files a/Palace/EkirjastoConfig/Images.xcassets/SettingsSelected.imageset/settings-active-72.png and /dev/null differ