diff --git a/Diffusion-macOS/Assets.xcassets/AccentColor.colorset/Contents.json b/Diffusion-macOS/Assets.xcassets/AccentColor.colorset/Contents.json deleted file mode 100644 index eb87897..0000000 --- a/Diffusion-macOS/Assets.xcassets/AccentColor.colorset/Contents.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "colors" : [ - { - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Diffusion-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/Diffusion-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 3f00db4..0000000 --- a/Diffusion-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "16x16" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "32x32" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "32x32" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "256x256" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "256x256" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "512x512" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "512x512" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Diffusion-macOS/Assets.xcassets/Contents.json b/Diffusion-macOS/Assets.xcassets/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/Diffusion-macOS/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Diffusion.xcodeproj/project.pbxproj b/Diffusion.xcodeproj/project.pbxproj index f035c93..dc9d76f 100644 --- a/Diffusion.xcodeproj/project.pbxproj +++ b/Diffusion.xcodeproj/project.pbxproj @@ -24,6 +24,7 @@ EBDD7DB82976AAFE00C1C4B2 /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBDD7DB72976AAFE00C1C4B2 /* State.swift */; }; EBDD7DB92976AAFE00C1C4B2 /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBDD7DB72976AAFE00C1C4B2 /* State.swift */; }; EBDD7DBD2977FFB300C1C4B2 /* GeneratedImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBDD7DBB2977FFB300C1C4B2 /* GeneratedImageView.swift */; }; + EBDD7DC02978642200C1C4B2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EBE755CC293E37DD00806B32 /* Assets.xcassets */; }; EBE3FF4C295E1EFE00E921AA /* ModelInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE3FF4B295E1EFE00E921AA /* ModelInfo.swift */; }; EBE755C9293E37DD00806B32 /* DiffusionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE755C8293E37DD00806B32 /* DiffusionApp.swift */; }; EBE755CB293E37DD00806B32 /* TextToImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE755CA293E37DD00806B32 /* TextToImage.swift */; }; @@ -36,10 +37,8 @@ EBE756092941178600806B32 /* Loading.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE756082941178600806B32 /* Loading.swift */; }; F15520242971093300DC009B /* Diffusion_macOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = F15520232971093300DC009B /* Diffusion_macOSApp.swift */; }; F15520262971093300DC009B /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F15520252971093300DC009B /* ContentView.swift */; }; - F15520282971093400DC009B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F15520272971093400DC009B /* Assets.xcassets */; }; F155202B2971093400DC009B /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F155202A2971093400DC009B /* Preview Assets.xcassets */; }; F1552031297109C300DC009B /* ControlsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1552030297109C300DC009B /* ControlsView.swift */; }; - F155203229710A1300DC009B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EBE755CC293E37DD00806B32 /* Assets.xcassets */; }; F155203429710B3600DC009B /* StatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F155203329710B3600DC009B /* StatusView.swift */; }; F155203C297118E700DC009B /* CompactSlider in Frameworks */ = {isa = PBXBuildFile; productRef = F155203B297118E700DC009B /* CompactSlider */; }; /* End PBXBuildFile section */ @@ -86,10 +85,9 @@ EBE755E6293E37DE00806B32 /* DiffusionUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffusionUITestsLaunchTests.swift; sourceTree = ""; }; EBE75601293E91E200806B32 /* Pipeline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pipeline.swift; sourceTree = ""; }; EBE756082941178600806B32 /* Loading.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Loading.swift; sourceTree = ""; }; - F15520212971093300DC009B /* Diffusion.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Diffusion.app; sourceTree = BUILT_PRODUCTS_DIR; }; + F15520212971093300DC009B /* Diffusers.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Diffusers.app; sourceTree = BUILT_PRODUCTS_DIR; }; F15520232971093300DC009B /* Diffusion_macOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Diffusion_macOSApp.swift; sourceTree = ""; }; F15520252971093300DC009B /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; - F15520272971093400DC009B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; F155202A2971093400DC009B /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; F155202C2971093400DC009B /* Diffusion_macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Diffusion_macOS.entitlements; sourceTree = ""; }; F1552030297109C300DC009B /* ControlsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlsView.swift; sourceTree = ""; }; @@ -167,7 +165,7 @@ EBE755C5293E37DD00806B32 /* Diffusion.app */, EBE755D6293E37DE00806B32 /* DiffusionTests.xctest */, EBE755E0293E37DE00806B32 /* DiffusionUITests.xctest */, - F15520212971093300DC009B /* Diffusion.app */, + F15520212971093300DC009B /* Diffusers.app */, ); name = Products; sourceTree = ""; @@ -246,7 +244,6 @@ EBDD7DBB2977FFB300C1C4B2 /* GeneratedImageView.swift */, F1552030297109C300DC009B /* ControlsView.swift */, F155203329710B3600DC009B /* StatusView.swift */, - F15520272971093400DC009B /* Assets.xcassets */, F155202C2971093400DC009B /* Diffusion_macOS.entitlements */, F15520292971093400DC009B /* Preview Content */, ); @@ -342,7 +339,7 @@ EBDD7DB029731FB300C1C4B2 /* StableDiffusion */, ); productName = "Diffusion-macOS"; - productReference = F15520212971093300DC009B /* Diffusion.app */; + productReference = F15520212971093300DC009B /* Diffusers.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -426,9 +423,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + EBDD7DC02978642200C1C4B2 /* Assets.xcassets in Resources */, F155202B2971093400DC009B /* Preview Assets.xcassets in Resources */, - F155203229710A1300DC009B /* Assets.xcassets in Resources */, - F15520282971093400DC009B /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -787,13 +783,16 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_ENTITLEMENTS = "Diffusion-macOS/Diffusion_macOS.entitlements"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"Diffusion-macOS/Preview Content\""; + DEVELOPMENT_TEAM = 2EADP68M95; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.entertainment"; INFOPLIST_KEY_NSHumanReadableCopyright = ""; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -801,7 +800,6 @@ ); MACOSX_DEPLOYMENT_TARGET = 13.1; MARKETING_VERSION = 1.0; - PRODUCT_NAME = Diffusion; SDKROOT = macosx; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -814,13 +812,16 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_ENTITLEMENTS = "Diffusion-macOS/Diffusion_macOS.entitlements"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"Diffusion-macOS/Preview Content\""; + DEVELOPMENT_TEAM = 2EADP68M95; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.entertainment"; INFOPLIST_KEY_NSHumanReadableCopyright = ""; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -828,7 +829,7 @@ ); MACOSX_DEPLOYMENT_TARGET = 13.1; MARKETING_VERSION = 1.0; - PRODUCT_NAME = Diffusion; + PRODUCT_BUNDLE_IDENTIFIER = com.huggingface.Diffusers; SDKROOT = macosx; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; diff --git a/Diffusion/Assets.xcassets/AppIcon.appiconset/256x256@2x.png b/Diffusion/Assets.xcassets/AppIcon.appiconset/256x256@2x.png new file mode 100644 index 0000000..c3bd11b Binary files /dev/null and b/Diffusion/Assets.xcassets/AppIcon.appiconset/256x256@2x.png differ diff --git a/Diffusion/Assets.xcassets/AppIcon.appiconset/512x512@2x.png b/Diffusion/Assets.xcassets/AppIcon.appiconset/512x512@2x.png new file mode 100644 index 0000000..fea6e64 Binary files /dev/null and b/Diffusion/Assets.xcassets/AppIcon.appiconset/512x512@2x.png differ diff --git a/Diffusion/Assets.xcassets/AppIcon.appiconset/Contents.json b/Diffusion/Assets.xcassets/AppIcon.appiconset/Contents.json index be97d4c..f2216a9 100644 --- a/Diffusion/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Diffusion/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "labrador-x2.png", + "filename" : "diffusers_on_white_1024.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" @@ -42,17 +42,19 @@ "size" : "256x256" }, { + "filename" : "256x256@2x.png", "idiom" : "mac", "scale" : "2x", "size" : "256x256" }, { + "filename" : "256x256@2x.png", "idiom" : "mac", "scale" : "1x", "size" : "512x512" }, { - "filename" : "labrador-x2 1.png", + "filename" : "512x512@2x.png", "idiom" : "mac", "scale" : "2x", "size" : "512x512" diff --git a/Diffusion/Assets.xcassets/AppIcon.appiconset/diffusers_on_white_1024.png b/Diffusion/Assets.xcassets/AppIcon.appiconset/diffusers_on_white_1024.png new file mode 100644 index 0000000..3a83840 Binary files /dev/null and b/Diffusion/Assets.xcassets/AppIcon.appiconset/diffusers_on_white_1024.png differ diff --git a/Diffusion/Assets.xcassets/AppIcon.appiconset/labrador-x2 1.png b/Diffusion/Assets.xcassets/AppIcon.appiconset/labrador-x2 1.png deleted file mode 100644 index 1034ce2..0000000 Binary files a/Diffusion/Assets.xcassets/AppIcon.appiconset/labrador-x2 1.png and /dev/null differ diff --git a/Diffusion/Assets.xcassets/AppIcon.appiconset/labrador-x2.png b/Diffusion/Assets.xcassets/AppIcon.appiconset/labrador-x2.png deleted file mode 100644 index 1034ce2..0000000 Binary files a/Diffusion/Assets.xcassets/AppIcon.appiconset/labrador-x2.png and /dev/null differ diff --git a/Diffusion/Info.plist b/Diffusion/Info.plist index 0b50ca2..2ee5146 100644 --- a/Diffusion/Info.plist +++ b/Diffusion/Info.plist @@ -4,5 +4,7 @@ NSPhotoLibraryAddUsageDescription To be able to save generated images to your Photo Library, you’ll need to allow this. + CFBundleDisplayName + Diffusers diff --git a/config/common.xcconfig b/config/common.xcconfig index 4097385..e519fb7 100644 --- a/config/common.xcconfig +++ b/config/common.xcconfig @@ -8,7 +8,8 @@ // Configuration settings file format documentation can be found at: // https://help.apple.com/xcode/#/dev745c5c974 -// Update if you fork this repo -DEVELOPMENT_TEAM = ZWDJQ796RU +PRODUCT_NAME = Diffusers -PRODUCT_BUNDLE_IDENTIFIER = com.huggingface.DiffusionApp +// Update if you fork this repo +DEVELOPMENT_TEAM = 2EADP68M95 +PRODUCT_BUNDLE_IDENTIFIER = com.huggingface.Diffusers