diff --git a/README.md b/README.md index 82c02df..6af40f3 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ A native client to access Discourse server for Apple Platforms. -![Forumate](Forumate/Other/Assets.xcassets/AppIcon.appiconset/AppIcon-macOS-512.png) +![Forumate](Shared/Other/Shared.xcassets/AppIcon.appiconset/AppIcon-macOS-512.png) ### Platform Compatibility diff --git a/Resources/Forumate-Icon.md b/Resources/Forumate-Icon.md index 6a117f2..76b3234 100644 --- a/Resources/Forumate-Icon.md +++ b/Resources/Forumate-Icon.md @@ -2,7 +2,7 @@ ### Icon 1: -![Forumate Icon 1](../Forumate/Other/Assets.xcassets/AppIconAlternate1.appiconset/icon_512x512.png) +![Forumate Icon 1](../Shared/Other/Shared.xcassets/AppIconAlternate1.appiconset/icon_512x512.png) version: 0.1.0 - 0.4.0 @@ -10,7 +10,7 @@ version: 0.1.0 - 0.4.0 ### Icon 2: Latest -![Forumate Latest Icon](../Forumate/Other/Assets.xcassets/AppIcon.appiconset/AppIcon-macOS-512.png) +![Forumate Latest Icon](../Shared/Other/Shared.xcassets/AppIcon.appiconset/AppIcon-macOS-512.png) version: 0.5.0+ diff --git a/Shared/Other/Shared.xcassets/icon0.imageset/AppIcon-macOS-1024.png b/Shared/Other/Shared.xcassets/icon0.imageset/AppIcon-macOS-1024.png deleted file mode 100644 index 7d0a985..0000000 Binary files a/Shared/Other/Shared.xcassets/icon0.imageset/AppIcon-macOS-1024.png and /dev/null differ diff --git a/Shared/Other/Shared.xcassets/icon0.imageset/Contents.json b/Shared/Other/Shared.xcassets/icon0.imageset/Contents.json index 33b0505..b8ba0d6 100644 --- a/Shared/Other/Shared.xcassets/icon0.imageset/Contents.json +++ b/Shared/Other/Shared.xcassets/icon0.imageset/Contents.json @@ -5,16 +5,7 @@ "idiom" : "universal" }, { - "filename" : "iOS 1.png", - "idiom" : "ipad" - }, - { - "filename" : "AppIcon-macOS-1024 1.png", - "idiom" : "ipad", - "subtype" : "mac-catalyst" - }, - { - "filename" : "AppIcon-macOS-1024.png", + "filename" : "macOS.png", "idiom" : "mac" }, { diff --git a/Shared/Other/Shared.xcassets/icon0.imageset/iOS 1.png b/Shared/Other/Shared.xcassets/icon0.imageset/iOS 1.png deleted file mode 100644 index e16c347..0000000 Binary files a/Shared/Other/Shared.xcassets/icon0.imageset/iOS 1.png and /dev/null differ diff --git a/Shared/Other/Shared.xcassets/icon0.imageset/AppIcon-macOS-1024 1.png b/Shared/Other/Shared.xcassets/icon0.imageset/macOS.png similarity index 100% rename from Shared/Other/Shared.xcassets/icon0.imageset/AppIcon-macOS-1024 1.png rename to Shared/Other/Shared.xcassets/icon0.imageset/macOS.png diff --git a/Shared/Other/Shared.xcassets/icon1.imageset/Contents.json b/Shared/Other/Shared.xcassets/icon1.imageset/Contents.json index 3f976d0..b8ba0d6 100644 --- a/Shared/Other/Shared.xcassets/icon1.imageset/Contents.json +++ b/Shared/Other/Shared.xcassets/icon1.imageset/Contents.json @@ -5,16 +5,7 @@ "idiom" : "universal" }, { - "filename" : "iOS 1.png", - "idiom" : "ipad" - }, - { - "filename" : "icon_256x256@2x 1.png", - "idiom" : "ipad", - "subtype" : "mac-catalyst" - }, - { - "filename" : "icon_256x256@2x.png", + "filename" : "macOS.png", "idiom" : "mac" }, { diff --git a/Shared/Other/Shared.xcassets/icon1.imageset/iOS 1.png b/Shared/Other/Shared.xcassets/icon1.imageset/iOS 1.png deleted file mode 100644 index 88e1f0a..0000000 Binary files a/Shared/Other/Shared.xcassets/icon1.imageset/iOS 1.png and /dev/null differ diff --git a/Shared/Other/Shared.xcassets/icon1.imageset/icon_256x256@2x.png b/Shared/Other/Shared.xcassets/icon1.imageset/icon_256x256@2x.png deleted file mode 100644 index 5214929..0000000 Binary files a/Shared/Other/Shared.xcassets/icon1.imageset/icon_256x256@2x.png and /dev/null differ diff --git a/Shared/Other/Shared.xcassets/icon1.imageset/icon_256x256@2x 1.png b/Shared/Other/Shared.xcassets/icon1.imageset/macOS.png similarity index 100% rename from Shared/Other/Shared.xcassets/icon1.imageset/icon_256x256@2x 1.png rename to Shared/Other/Shared.xcassets/icon1.imageset/macOS.png diff --git a/Shared/View/Tab/Settings/SettingsTabRoot.swift b/Shared/View/Tab/Settings/SettingsTabRoot.swift index da7b33c..8457023 100644 --- a/Shared/View/Tab/Settings/SettingsTabRoot.swift +++ b/Shared/View/Tab/Settings/SettingsTabRoot.swift @@ -74,7 +74,7 @@ struct SettingsTabRoot: View { } } footer: { Text(verbatim: """ - \(AppInfo.name) v\(AppInfo.version)-beta Build \(AppInfo.buildNumber) + \(AppInfo.name) v\(AppInfo.version) Build \(AppInfo.buildNumber) \(AppInfo.OSVersion) """) .multilineTextAlignment(.leading) diff --git a/Shared/View/Tab/Topics/Community/View/CommunityDetail/CommunityDetail.swift b/Shared/View/Tab/Topics/Community/View/CommunityDetail/CommunityDetail.swift index 2a9bf27..4411401 100644 --- a/Shared/View/Tab/Topics/Community/View/CommunityDetail/CommunityDetail.swift +++ b/Shared/View/Tab/Topics/Community/View/CommunityDetail/CommunityDetail.swift @@ -35,9 +35,9 @@ struct CommunityDetail: View { } .listStyle(.plain) .toolbar { - #if !os(macOS) - AccountMenuButton() - #endif +// #if !os(macOS) +// AccountMenuButton() +// #endif ViewByMenuButton() } .navigationTitle(state.community.title) diff --git a/TestFlight/WhatToTest.en-US.txt b/TestFlight/WhatToTest.en-US.txt index d8ddc94..20637b7 100644 --- a/TestFlight/WhatToTest.en-US.txt +++ b/TestFlight/WhatToTest.en-US.txt @@ -1,4 +1,4 @@ -What's new in v0.7.0-beta +What's new in v0.7.0 - Updated layout for topic detail view - New toolbar item for topic detail view