diff --git a/flo.xcodeproj/project.pbxproj b/flo.xcodeproj/project.pbxproj index dec34de..752e4a7 100644 --- a/flo.xcodeproj/project.pbxproj +++ b/flo.xcodeproj/project.pbxproj @@ -119,6 +119,7 @@ C4B232EF2F44809F006A5044 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C4E8D95F2B763BAB00C2353E /* Assets.xcassets */; }; C4B7E6A42F3C1001001D9A01 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = C4B7E6A32F3C0FFF001D9A01 /* PrivacyInfo.xcprivacy */; }; C4CACHE012D7B0000003B9C4F /* StreamCacheManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CACHE002D7B0000003B9C4F /* StreamCacheManager.swift */; }; + C4CBBA742FBA223C00F0DE75 /* floIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = C4CBBA732FBA223C00F0DE75 /* floIcon.icon */; }; C4D7F84D2C7F2AE900165EFD /* flo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = C4D7F84B2C7F2AE900165EFD /* flo.xcdatamodeld */; }; C4D7F84F2C7F2C5D00165EFD /* PlaybackService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D7F84E2C7F2C5D00165EFD /* PlaybackService.swift */; }; C4DE89182C2FFBC900E078CC /* CoreDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DE89172C2FFBC900E078CC /* CoreDataManager.swift */; }; @@ -252,6 +253,7 @@ C4A4BF3C2C1455A100363290 /* FloatingPlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FloatingPlayerView.swift; sourceTree = ""; }; C4B7E6A32F3C0FFF001D9A01 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; C4CACHE002D7B0000003B9C4F /* StreamCacheManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StreamCacheManager.swift; sourceTree = ""; }; + C4CBBA732FBA223C00F0DE75 /* floIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = floIcon.icon; sourceTree = ""; }; C4D7F84C2C7F2AE900165EFD /* flo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = flo.xcdatamodel; sourceTree = ""; }; C4D7F84E2C7F2C5D00165EFD /* PlaybackService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaybackService.swift; sourceTree = ""; }; C4DE89172C2FFBC900E078CC /* CoreDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataManager.swift; sourceTree = ""; }; @@ -390,6 +392,7 @@ C4289F4E2C12553800C3A4FD /* Resources */ = { isa = PBXGroup; children = ( + C4CBBA732FBA223C00F0DE75 /* floIcon.icon */, C4B7E6A32F3C0FFF001D9A01 /* PrivacyInfo.xcprivacy */, C4E958972CA033BC00BBF394 /* Localizable.xcstrings */, C4E8D95F2B763BAB00C2353E /* Assets.xcassets */, @@ -643,6 +646,7 @@ C4B7E6A42F3C1001001D9A01 /* PrivacyInfo.xcprivacy in Resources */, C4E8D9632B763BAB00C2353E /* Preview Assets.xcassets in Resources */, C4E8D9602B763BAB00C2353E /* Assets.xcassets in Resources */, + C4CBBA742FBA223C00F0DE75 /* floIcon.icon in Resources */, C4E958982CA033BC00BBF394 /* Localizable.xcstrings in Resources */, C415F55F2C11A34C00E3E1D2 /* PlusJakartaSans-VariableFont_wght.ttf in Resources */, ); @@ -995,14 +999,14 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = AppIconAlt1; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = floIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; "CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = flo/flo.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 212; + CURRENT_PROJECT_VERSION = 300; DEVELOPMENT_ASSET_PATHS = "\"flo/Resources/Preview Content\""; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8BJ4LW5J8P; @@ -1040,7 +1044,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.penerbangwalet.flo"; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match Development com.penerbangwalet.flo catalyst"; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = YES; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -1054,14 +1058,14 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = AppIconAlt1; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = floIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; "CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = flo/flo.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 212; + CURRENT_PROJECT_VERSION = 300; DEVELOPMENT_ASSET_PATHS = "\"flo/Resources/Preview Content\""; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8BJ4LW5J8P; @@ -1100,7 +1104,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.penerbangwalet.flo 1773593177"; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match AppStore com.penerbangwalet.flo catalyst"; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = YES; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; diff --git a/flo/Info.plist b/flo/Info.plist index a25feb1..78c2295 100644 --- a/flo/Info.plist +++ b/flo/Info.plist @@ -2,6 +2,8 @@ + CFBundleIconFile + floIcon UIAppFonts PlusJakartaSans-VariableFont_wght.ttf diff --git a/flo/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/flo/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json index aec58f9..e98d500 100644 --- a/flo/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/flo/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "flo.png", + "filename" : "flo 1.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" @@ -18,18 +18,6 @@ "platform" : "ios", "size" : "1024x1024" }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "clear" - } - ], - "filename" : "flo-clear-light.png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - }, { "appearances" : [ { diff --git a/flo/Resources/Assets.xcassets/AppIcon.appiconset/flo.png b/flo/Resources/Assets.xcassets/AppIcon.appiconset/flo 1.png similarity index 100% rename from flo/Resources/Assets.xcassets/AppIcon.appiconset/flo.png rename to flo/Resources/Assets.xcassets/AppIcon.appiconset/flo 1.png diff --git a/flo/Resources/Assets.xcassets/AppIcon.appiconset/flo-clear-light.png b/flo/Resources/Assets.xcassets/AppIcon.appiconset/flo-clear-light.png deleted file mode 100644 index 6a60b53..0000000 Binary files a/flo/Resources/Assets.xcassets/AppIcon.appiconset/flo-clear-light.png and /dev/null differ diff --git a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/Contents.json b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/Contents.json index ae745ec..8e2d030 100644 --- a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/Contents.json +++ b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/Contents.json @@ -1,104 +1,10 @@ { "images" : [ { - "filename" : "watch-marketing-1024.png", - "idiom" : "watch-marketing", - "scale" : "1x", + "filename" : "flo.png", + "idiom" : "universal", + "platform" : "watchos", "size" : "1024x1024" - }, - { - "filename" : "watch-notification-38mm@2x.png", - "idiom" : "watch", - "role" : "notificationCenter", - "scale" : "2x", - "size" : "24x24", - "subtype" : "38mm" - }, - { - "filename" : "watch-notification-42mm@2x.png", - "idiom" : "watch", - "role" : "notificationCenter", - "scale" : "2x", - "size" : "27.5x27.5", - "subtype" : "42mm" - }, - { - "filename" : "watch-companion@2x.png", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "2x", - "size" : "29x29" - }, - { - "filename" : "watch-companion@3x.png", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "3x", - "size" : "29x29" - }, - { - "filename" : "watch-home-38mm@2x.png", - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "40x40", - "subtype" : "38mm" - }, - { - "filename" : "watch-home-40mm@2x.png", - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "44x44", - "subtype" : "40mm" - }, - { - "filename" : "watch-home-44mm@2x.png", - "idiom" : "watch", - "role" : "appLauncher", - "scale" : "2x", - "size" : "50x50", - "subtype" : "44mm" - }, - { - "filename" : "watch-longlook-42mm@2x.png", - "idiom" : "watch", - "role" : "longLook", - "scale" : "2x", - "size" : "44x44", - "subtype" : "42mm" - }, - { - "filename" : "watch-longlook-44mm@2x.png", - "idiom" : "watch", - "role" : "longLook", - "scale" : "2x", - "size" : "50x50", - "subtype" : "44mm" - }, - { - "filename" : "watch-shortlook-38mm@2x.png", - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "86x86", - "subtype" : "38mm" - }, - { - "filename" : "watch-shortlook-42mm@2x.png", - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "98x98", - "subtype" : "42mm" - }, - { - "filename" : "watch-shortlook-44mm@2x.png", - "idiom" : "watch", - "role" : "quickLook", - "scale" : "2x", - "size" : "108x108", - "subtype" : "44mm" } ], "info" : { diff --git a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/flo.png b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/flo.png new file mode 100644 index 0000000..d055849 Binary files /dev/null and b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/flo.png differ diff --git a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-companion@2x.png b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-companion@2x.png deleted file mode 100644 index 2822c73..0000000 Binary files a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-companion@2x.png and /dev/null differ diff --git a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-companion@3x.png b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-companion@3x.png deleted file mode 100644 index 7f328d6..0000000 Binary files a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-companion@3x.png and /dev/null differ diff --git a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-home-38mm@2x.png b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-home-38mm@2x.png deleted file mode 100644 index 144c3ab..0000000 Binary files a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-home-38mm@2x.png and /dev/null differ diff --git a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-home-40mm@2x.png b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-home-40mm@2x.png deleted file mode 100644 index 7a8e7dd..0000000 Binary files a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-home-40mm@2x.png and /dev/null differ diff --git a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-home-44mm@2x.png b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-home-44mm@2x.png deleted file mode 100644 index b9a904d..0000000 Binary files a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-home-44mm@2x.png and /dev/null differ diff --git a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-longlook-42mm@2x.png b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-longlook-42mm@2x.png deleted file mode 100644 index 7a8e7dd..0000000 Binary files a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-longlook-42mm@2x.png and /dev/null differ diff --git a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-longlook-44mm@2x.png b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-longlook-44mm@2x.png deleted file mode 100644 index b9a904d..0000000 Binary files a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-longlook-44mm@2x.png and /dev/null differ diff --git a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-marketing-1024.png b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-marketing-1024.png deleted file mode 100644 index bcb4fbb..0000000 Binary files a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-marketing-1024.png and /dev/null differ diff --git a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-notification-38mm@2x.png b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-notification-38mm@2x.png deleted file mode 100644 index 13c528c..0000000 Binary files a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-notification-38mm@2x.png and /dev/null differ diff --git a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-notification-42mm@2x.png b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-notification-42mm@2x.png deleted file mode 100644 index 7dbadea..0000000 Binary files a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-notification-42mm@2x.png and /dev/null differ diff --git a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-shortlook-38mm@2x.png b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-shortlook-38mm@2x.png deleted file mode 100644 index 2a8d717..0000000 Binary files a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-shortlook-38mm@2x.png and /dev/null differ diff --git a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-shortlook-42mm@2x.png b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-shortlook-42mm@2x.png deleted file mode 100644 index 30e08de..0000000 Binary files a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-shortlook-42mm@2x.png and /dev/null differ diff --git a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-shortlook-44mm@2x.png b/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-shortlook-44mm@2x.png deleted file mode 100644 index 505d846..0000000 Binary files a/flo/Resources/Assets.xcassets/AppIconWatch.appiconset/watch-shortlook-44mm@2x.png and /dev/null differ diff --git a/flo/Resources/floIcon.icon/Assets/a.svg b/flo/Resources/floIcon.icon/Assets/a.svg new file mode 100644 index 0000000..65686c9 --- /dev/null +++ b/flo/Resources/floIcon.icon/Assets/a.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + diff --git a/flo/Resources/floIcon.icon/Assets/b.svg b/flo/Resources/floIcon.icon/Assets/b.svg new file mode 100644 index 0000000..a52b922 --- /dev/null +++ b/flo/Resources/floIcon.icon/Assets/b.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + diff --git a/flo/Resources/floIcon.icon/icon.json b/flo/Resources/floIcon.icon/icon.json new file mode 100644 index 0000000..8cefeab --- /dev/null +++ b/flo/Resources/floIcon.icon/icon.json @@ -0,0 +1,105 @@ +{ + "fill-specializations" : [ + { + "value" : { + "automatic-gradient" : "srgb:0.99029,1.00000,1.00000,1.00000" + } + }, + { + "appearance" : "dark", + "value" : "automatic" + } + ], + "groups" : [ + { + "blur-material-specializations" : [ + { + "appearance" : "tinted", + "value" : null + } + ], + "layers" : [ + { + "blend-mode-specializations" : [ + { + "appearance" : "tinted", + "value" : "normal" + } + ], + "fill-specializations" : [ + { + "appearance" : "tinted", + "value" : "automatic" + } + ], + "glass-specializations" : [ + { + "value" : true + }, + { + "appearance" : "tinted", + "value" : true + } + ], + "hidden" : false, + "image-name" : "a.svg", + "name" : "a", + "opacity-specializations" : [ + { + "appearance" : "tinted", + "value" : 0 + } + ] + }, + { + "glass-specializations" : [ + { + "appearance" : "tinted", + "value" : true + } + ], + "image-name" : "b.svg", + "name" : "b", + "opacity" : 1 + } + ], + "lighting-specializations" : [ + { + "appearance" : "tinted", + "value" : "individual" + } + ], + "opacity-specializations" : [ + { + "appearance" : "tinted", + "value" : 1 + } + ], + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "specular-specializations" : [ + { + "appearance" : "tinted", + "value" : true + } + ], + "translucency-specializations" : [ + { + "appearance" : "tinted", + "value" : { + "enabled" : false, + "value" : 0.5 + } + } + ] + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} \ No newline at end of file