diff --git a/Feels.xcodeproj/project.pbxproj b/Feels.xcodeproj/project.pbxproj index 11e69c9..00413ee 100644 --- a/Feels.xcodeproj/project.pbxproj +++ b/Feels.xcodeproj/project.pbxproj @@ -3,167 +3,23 @@ archiveVersion = 1; classes = { }; - objectVersion = 55; + objectVersion = 70; objects = { /* Begin PBXBuildFile section */ - 1C0007392EE9339E009C9ED5 /* FeelsSubscriptionStoreView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C0007382EE9339E009C9ED5 /* FeelsSubscriptionStoreView.swift */; }; - 1C00073A2EE933B3009C9ED5 /* FeelsSubscriptionStoreView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C0007382EE9339E009C9ED5 /* FeelsSubscriptionStoreView.swift */; }; - 1C00073C2EE9374A009C9ED5 /* FeelsVoteWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C00073B2EE9374A009C9ED5 /* FeelsVoteWidget.swift */; }; - 1C02589C27B9677A00EB91AC /* CreateWidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C02589B27B9677A00EB91AC /* CreateWidgetView.swift */; }; - 1C04488727C1C81D00D22444 /* PersonalityPackable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C04488627C1C81D00D22444 /* PersonalityPackable.swift */; }; - 1C04488827C1CD8C00D22444 /* PersonalityPackable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C04488627C1C81D00D22444 /* PersonalityPackable.swift */; }; - 1C04488A27C2ABD500D22444 /* IconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C04488927C2ABD500D22444 /* IconView.swift */; }; - 1C04488B27C2ABDE00D22444 /* IconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C04488927C2ABD500D22444 /* IconView.swift */; }; - 1C04488D27C2ADDB00D22444 /* IconViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C04488C27C2ADDB00D22444 /* IconViewModel.swift */; }; - 1C04488E27C2AE5200D22444 /* IconViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C04488C27C2ADDB00D22444 /* IconViewModel.swift */; }; - 1C04489627C2DB0100D22444 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FAC27ADD0C3002C83A6 /* Theme.swift */; }; - 1C04489727C2DB9B00D22444 /* BGView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD603127A5C1C800C520BD /* BGView.swift */; }; - 1C04489927C3F24000D22444 /* Color+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C04489827C3F24000D22444 /* Color+Codable.swift */; }; - 1C04489A27C3F24F00D22444 /* Color+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C04489827C3F24000D22444 /* Color+Codable.swift */; }; - 1C0A3C8F27FD445000FF37FF /* OnboardingCustomizeOne.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C0A3C8E27FD445000FF37FF /* OnboardingCustomizeOne.swift */; }; - 1C0A3C9127FD445900FF37FF /* OnboardingCustomizeTwo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C0A3C9027FD445900FF37FF /* OnboardingCustomizeTwo.swift */; }; 1C0DAB45279DB0FB003B1F21 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1C0DAB47279DB0FB003B1F21 /* Localizable.strings */; }; - 1C10E24E27A1AB110047948B /* UserDefaultsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C5F4977279C945E0092F1B4 /* UserDefaultsStore.swift */; }; - 1C10E25027A1AB220047948B /* OnboardingDay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA03774279A294800D26164 /* OnboardingDay.swift */; }; - 1C10E25127A1AB320047948B /* OnboardingTitle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA03776279A295600D26164 /* OnboardingTitle.swift */; }; - 1C1AFF3027F894970067F9DC /* ThemePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF2F27F894970067F9DC /* ThemePickerView.swift */; }; - 1C1AFF3227F894A40067F9DC /* IconPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF3127F894A40067F9DC /* IconPickerView.swift */; }; - 1C1AFF3427F894BA0067F9DC /* TintPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF3327F894BA0067F9DC /* TintPickerView.swift */; }; - 1C1AFF3827F8951F0067F9DC /* CustomWigetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF3727F8951F0067F9DC /* CustomWigetView.swift */; }; - 1C1AFF3A27F895490067F9DC /* ImagePackPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF3927F895490067F9DC /* ImagePackPickerView.swift */; }; - 1C1AFF3C27F895800067F9DC /* TextColorPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF3B27F895800067F9DC /* TextColorPickerView.swift */; }; - 1C1AFF3E27F895A40067F9DC /* PersonalityPackPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF3D27F895A40067F9DC /* PersonalityPackPickerView.swift */; }; - 1C1AFF4127F895C00067F9DC /* ShapePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF4027F895C00067F9DC /* ShapePickerView.swift */; }; - 1C1AFF4327F895D90067F9DC /* DayFilterPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF4227F895D90067F9DC /* DayFilterPickerView.swift */; }; - 1C1B6E6927FD4E8F00181E70 /* SampleEntryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1B6E6827FD4E8F00181E70 /* SampleEntryView.swift */; }; - 1C2162EB27C14EFA004353D1 /* Date+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2162EA27C14EFA004353D1 /* Date+Extensions.swift */; }; - 1C2162EC27C14FC5004353D1 /* Date+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2162EA27C14EFA004353D1 /* Date+Extensions.swift */; }; - 1C2162EE27C15191004353D1 /* MoodEntryFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2162ED27C15191004353D1 /* MoodEntryFunctions.swift */; }; - 1C2162F227C156E6004353D1 /* CustomizeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2162F127C156E6004353D1 /* CustomizeView.swift */; }; - 1C2162F427C1602D004353D1 /* MoodImagable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2162F327C1602D004353D1 /* MoodImagable.swift */; }; - 1C2162F527C16061004353D1 /* MoodImagable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2162F327C1602D004353D1 /* MoodImagable.swift */; }; - 1C2162F727C16D11004353D1 /* MoodTintable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2162F627C16D11004353D1 /* MoodTintable.swift */; }; - 1C2162F827C16E3C004353D1 /* MoodTintable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2162F627C16D11004353D1 /* MoodTintable.swift */; }; 1C2618FA2795E41D00FDC148 /* Charts in Frameworks */ = {isa = PBXBuildFile; productRef = 1C2618F92795E41D00FDC148 /* Charts */; }; - 1C2618FE27960A4F00FDC148 /* YearViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2618FD27960A4F00FDC148 /* YearViewModel.swift */; }; - 1C26190327960CE500FDC148 /* ChartDataBuildable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C26190227960CE500FDC148 /* ChartDataBuildable.swift */; }; - 1C26190727960DC900FDC148 /* ChartViewItemBuildable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C26190627960DC900FDC148 /* ChartViewItemBuildable.swift */; }; - 1C2C5B2B27DEBE260092A308 /* EventLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C414C2F27DB1C2400BC1720 /* EventLogger.swift */; }; - 1C358FAD27ADD0C3002C83A6 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FAC27ADD0C3002C83A6 /* Theme.swift */; }; - 1C358FB127B0AD87002C83A6 /* SharingListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FB027B0AD87002C83A6 /* SharingListView.swift */; }; - 1C358FB327B0ADA4002C83A6 /* SharingTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FB227B0ADA4002C83A6 /* SharingTemplate.swift */; }; - 1C358FB627B0AE15002C83A6 /* AllMoodsTotalTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FB527B0AE15002C83A6 /* AllMoodsTotalTemplate.swift */; }; - 1C358FB827B0AEE3002C83A6 /* LongestStreakTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FB727B0AEE3002C83A6 /* LongestStreakTemplate.swift */; }; - 1C358FBA27B35252002C83A6 /* ActivityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FB927B35252002C83A6 /* ActivityViewController.swift */; }; - 1C358FBE27B4D1F2002C83A6 /* CurrentStreakTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FBD27B4D1F2002C83A6 /* CurrentStreakTemplate.swift */; }; - 1C358FC027B4D20C002C83A6 /* MonthTotalTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FBF27B4D20C002C83A6 /* MonthTotalTemplate.swift */; }; - 1C358FC227B4D227002C83A6 /* WeekTotalTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FC127B4D227002C83A6 /* WeekTotalTemplate.swift */; }; - 1C361F0A27C0356000E832FC /* MonthView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C361F0927C0356000E832FC /* MonthView.swift */; }; - 1C361F0C27C0356B00E832FC /* MainTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C361F0B27C0356B00E832FC /* MainTabView.swift */; }; - 1C361F0D27C03BDF00E832FC /* OnboardingData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C5F4975279C84090092F1B4 /* OnboardingData.swift */; }; - 1C361F0F27C03C0E00E832FC /* LocalNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B75278C8119001C4FEA /* LocalNotification.swift */; }; - 1C361F1127C03C3D00E832FC /* OnboardingTime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA03772279A293D00D26164 /* OnboardingTime.swift */; }; - 1C361F1427C03C8600E832FC /* OnboardingDataDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C361F1327C03C8600E832FC /* OnboardingDataDataManager.swift */; }; - 1C361F1727C046D800E832FC /* MonthDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C361F1627C046D800E832FC /* MonthDetailView.swift */; }; - 1C414BF127D3CAB300BC1720 /* OnboardingData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C5F4975279C84090092F1B4 /* OnboardingData.swift */; }; - 1C414BF527D3CB2200BC1720 /* OnboardingDay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA03774279A294800D26164 /* OnboardingDay.swift */; }; - 1C414C0F27D51FB500BC1720 /* EntryListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C414C0E27D51FB500BC1720 /* EntryListView.swift */; }; - 1C414C2A27DB1AF900BC1720 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1C414C2927DB1AF900BC1720 /* GoogleService-Info.plist */; }; - 1C414C2B27DB1AF900BC1720 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1C414C2927DB1AF900BC1720 /* GoogleService-Info.plist */; }; - 1C414C3027DB1C2400BC1720 /* EventLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C414C2F27DB1C2400BC1720 /* EventLogger.swift */; }; - 1C4FF3BB27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3BA27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift */; }; - 1C4FF3BC27BEDF6600BE8F34 /* ShowBasedOnVoteLogics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3BA27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift */; }; - 1C4FF3BE27BEDF9100BE8F34 /* PersistenceHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3BD27BEDF9100BE8F34 /* PersistenceHelper.swift */; }; - 1C4FF3C027BEE06900BE8F34 /* PersistenceGET.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3BF27BEE06900BE8F34 /* PersistenceGET.swift */; }; - 1C4FF3C127BEE06900BE8F34 /* PersistenceGET.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3BF27BEE06900BE8F34 /* PersistenceGET.swift */; }; - 1C4FF3C327BEE07200BE8F34 /* PersistenceDELETE.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3C227BEE07200BE8F34 /* PersistenceDELETE.swift */; }; - 1C4FF3C427BEE07200BE8F34 /* PersistenceDELETE.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3C227BEE07200BE8F34 /* PersistenceDELETE.swift */; }; - 1C4FF3C727BEE09E00BE8F34 /* PersistenceADD.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3C627BEE09E00BE8F34 /* PersistenceADD.swift */; }; - 1C4FF3C827BEE09E00BE8F34 /* PersistenceADD.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3C627BEE09E00BE8F34 /* PersistenceADD.swift */; }; - 1C4FF3C927BEE0C300BE8F34 /* PersistenceHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C4FF3BD27BEDF9100BE8F34 /* PersistenceHelper.swift */; }; - 1C5F4976279C84090092F1B4 /* OnboardingData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C5F4975279C84090092F1B4 /* OnboardingData.swift */; }; - 1C5F4978279C945E0092F1B4 /* UserDefaultsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C5F4977279C945E0092F1B4 /* UserDefaultsStore.swift */; }; - 1C658D7727C0744D003231EE /* PersistenceUPDATE.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C658D7627C0744D003231EE /* PersistenceUPDATE.swift */; }; - 1C658D7827C0744D003231EE /* PersistenceUPDATE.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C658D7627C0744D003231EE /* PersistenceUPDATE.swift */; }; - 1C683FCA2792281400745862 /* Stats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C683FC92792281400745862 /* Stats.swift */; }; - 1C683FCB2792281400745862 /* Stats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C683FC92792281400745862 /* Stats.swift */; }; - 1C6EA85A2946F1A300C7D332 /* IAPWarningView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C6EA8592946F1A300C7D332 /* IAPWarningView.swift */; }; - 1C718C7027F611C900A8F9FE /* DaysFilterClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C718C6F27F611C900A8F9FE /* DaysFilterClass.swift */; }; - 1C718C7127F611C900A8F9FE /* DaysFilterClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C718C6F27F611C900A8F9FE /* DaysFilterClass.swift */; }; - 1C718C7327F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C718C7227F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift */; }; - 1C718C7427F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C718C7227F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift */; }; - 1C7352B927DD02760024B5D2 /* ImagePickerGridView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C7352B827DD02760024B5D2 /* ImagePickerGridView.swift */; }; - 1C744F2C278CE15600953A57 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C744F2B278CE15600953A57 /* AppDelegate.swift */; }; 1C747CC9279F06EB00762CBD /* CloudKitSyncMonitor in Frameworks */ = {isa = PBXBuildFile; productRef = 1C747CC8279F06EB00762CBD /* CloudKitSyncMonitor */; }; - 1C76E86E27C882A400ADEE1F /* SharingImageModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C76E86D27C882A400ADEE1F /* SharingImageModels.swift */; }; - 1C76E86F27C882A400ADEE1F /* SharingImageModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C76E86D27C882A400ADEE1F /* SharingImageModels.swift */; }; - 1C95ABC927E6F73A00509BD3 /* Shapes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C95ABC827E6F73A00509BD3 /* Shapes.swift */; }; - 1C95ABCA27E6F73A00509BD3 /* Shapes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C95ABC827E6F73A00509BD3 /* Shapes.swift */; }; - 1C95ABCC27E6FA7200509BD3 /* DiamondView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C95ABCB27E6FA7200509BD3 /* DiamondView.swift */; }; - 1C95ABCD27E6FA7200509BD3 /* DiamondView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C95ABCB27E6FA7200509BD3 /* DiamondView.swift */; }; - 1CA037702799FFA600D26164 /* DayViewViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA0376F2799FFA600D26164 /* DayViewViewModel.swift */; }; - 1CA03773279A293D00D26164 /* OnboardingTime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA03772279A293D00D26164 /* OnboardingTime.swift */; }; - 1CA03775279A294800D26164 /* OnboardingDay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA03774279A294800D26164 /* OnboardingDay.swift */; }; - 1CA03777279A295600D26164 /* OnboardingTitle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA03776279A295600D26164 /* OnboardingTitle.swift */; }; - 1CA0377A279A296E00D26164 /* OnboardingMain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA03779279A296E00D26164 /* OnboardingMain.swift */; }; - 1CA0377C279B605000D26164 /* OnboardingWrapup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA0377B279B605000D26164 /* OnboardingWrapup.swift */; }; - 1CA2662D2793908700C0E12C /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90AEF278C7DDF001C4FEA /* Persistence.swift */; }; - 1CAD603427A5C1C800C520BD /* SmallRollUpHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD602B27A5C1C800C520BD /* SmallRollUpHeaderView.swift */; }; - 1CAD603527A5C1C800C520BD /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD602C27A5C1C800C520BD /* SettingsView.swift */; }; - 1CAD603627A5C1C800C520BD /* GraphView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD602D27A5C1C800C520BD /* GraphView.swift */; }; - 1CAD603727A5C1C800C520BD /* YearView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD602E27A5C1C800C520BD /* YearView.swift */; }; - 1CAD603827A5C1C800C520BD /* AddMoodHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD602F27A5C1C800C520BD /* AddMoodHeaderView.swift */; }; - 1CAD603927A5C1C800C520BD /* HeaderPercView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD603027A5C1C800C520BD /* HeaderPercView.swift */; }; - 1CAD603A27A5C1C800C520BD /* BGView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD603127A5C1C800C520BD /* BGView.swift */; }; - 1CAD603B27A5C1C800C520BD /* DayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD603227A5C1C800C520BD /* DayView.swift */; }; - 1CAD603C27A5C1C800C520BD /* HeaderStatsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD603327A5C1C800C520BD /* HeaderStatsView.swift */; }; - 1CAD603E27A6ECCD00C520BD /* SwitchableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD603D27A6ECCD00C520BD /* SwitchableView.swift */; }; - 1CB101C527B62A2D00D1C033 /* EmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CB101C427B62A2D00D1C033 /* EmptyView.swift */; }; - 1CB101C727B81CAC00D1C033 /* MoodMetrics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CB101C627B81CAC00D1C033 /* MoodMetrics.swift */; }; - 1CB101C827B81CAC00D1C033 /* MoodMetrics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CB101C627B81CAC00D1C033 /* MoodMetrics.swift */; }; - 1CB4D09628779F9B00902A56 /* IAPManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CB4D09528779F9B00902A56 /* IAPManager.swift */; }; - 1CB4D09728779F9B00902A56 /* IAPManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CB4D09528779F9B00902A56 /* IAPManager.swift */; }; - 1CB4D0992877A14100902A56 /* View+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CB4D0982877A14100902A56 /* View+Extensions.swift */; }; - 1CB4D09A2877A14100902A56 /* View+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CB4D0982877A14100902A56 /* View+Extensions.swift */; }; - 1CB4D09C2877A36400902A56 /* PurchaseButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CB4D09B2877A36400902A56 /* PurchaseButtonView.swift */; }; - 1CB4D09D2877A36400902A56 /* PurchaseButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CB4D09B2877A36400902A56 /* PurchaseButtonView.swift */; }; 1CB4D0A028787D8A00902A56 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CB4D09F28787D8A00902A56 /* StoreKit.framework */; }; - 1CC469AA278F30A0003E0C6E /* BGTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CC469A9278F30A0003E0C6E /* BGTask.swift */; }; - 1CC469AC27907D48003E0C6E /* DayChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CC469AB27907D48003E0C6E /* DayChartView.swift */; }; 1CD90B07278C7DE0001C4FEA /* Tests_iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B06278C7DE0001C4FEA /* Tests_iOS.swift */; }; 1CD90B09278C7DE0001C4FEA /* Tests_iOSLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B08278C7DE0001C4FEA /* Tests_iOSLaunchTests.swift */; }; 1CD90B13278C7DE0001C4FEA /* Tests_macOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B12278C7DE0001C4FEA /* Tests_macOS.swift */; }; 1CD90B15278C7DE0001C4FEA /* Tests_macOSLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B14278C7DE0001C4FEA /* Tests_macOSLaunchTests.swift */; }; - 1CD90B16278C7DE0001C4FEA /* Feels.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90AEB278C7DDF001C4FEA /* Feels.xcdatamodeld */; }; - 1CD90B17278C7DE0001C4FEA /* Feels.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90AEB278C7DDF001C4FEA /* Feels.xcdatamodeld */; }; - 1CD90B18278C7DE0001C4FEA /* FeelsApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90AED278C7DDF001C4FEA /* FeelsApp.swift */; }; - 1CD90B1C278C7DE0001C4FEA /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90AEF278C7DDF001C4FEA /* Persistence.swift */; }; - 1CD90B1E278C7DE0001C4FEA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1CD90AF0278C7DE0001C4FEA /* Assets.xcassets */; }; - 1CD90B1F278C7DE0001C4FEA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1CD90AF0278C7DE0001C4FEA /* Assets.xcassets */; }; 1CD90B48278C7E7A001C4FEA /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CD90B47278C7E7A001C4FEA /* WidgetKit.framework */; platformFilter = maccatalyst; }; 1CD90B4A278C7E7A001C4FEA /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CD90B49278C7E7A001C4FEA /* SwiftUI.framework */; platformFilter = maccatalyst; }; - 1CD90B4D278C7E7A001C4FEA /* FeelsWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B4C278C7E7A001C4FEA /* FeelsWidget.swift */; }; - 1CD90B50278C7E7A001C4FEA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1CD90B4F278C7E7A001C4FEA /* Assets.xcassets */; }; - 1CD90B52278C7E7A001C4FEA /* FeelsWidget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B4E278C7E7A001C4FEA /* FeelsWidget.intentdefinition */; }; - 1CD90B53278C7E7A001C4FEA /* FeelsWidget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B4E278C7E7A001C4FEA /* FeelsWidget.intentdefinition */; }; 1CD90B56278C7E7A001C4FEA /* FeelsWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 1CD90B45278C7E7A001C4FEA /* FeelsWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - 1CD90B5D278C7EAD001C4FEA /* Random.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B5C278C7EAD001C4FEA /* Random.swift */; }; - 1CD90B5F278C7EAD001C4FEA /* Random.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B5C278C7EAD001C4FEA /* Random.swift */; }; - 1CD90B63278C7EBA001C4FEA /* Mood.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B61278C7EBA001C4FEA /* Mood.swift */; }; - 1CD90B64278C7EBA001C4FEA /* Mood.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B61278C7EBA001C4FEA /* Mood.swift */; }; - 1CD90B65278C7EBA001C4FEA /* Mood.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B61278C7EBA001C4FEA /* Mood.swift */; }; - 1CD90B66278C7EBA001C4FEA /* MoodEntryExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B62278C7EBA001C4FEA /* MoodEntryExtension.swift */; }; - 1CD90B67278C7EBA001C4FEA /* MoodEntryExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B62278C7EBA001C4FEA /* MoodEntryExtension.swift */; }; - 1CD90B68278C7EBA001C4FEA /* MoodEntryExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B62278C7EBA001C4FEA /* MoodEntryExtension.swift */; }; 1CD90B6C278C7F78001C4FEA /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CD90B6B278C7F78001C4FEA /* CloudKit.framework */; }; 1CD90B6E278C7F8B001C4FEA /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CD90B6B278C7F78001C4FEA /* CloudKit.framework */; }; - 1CD90B71278C80CA001C4FEA /* Feels.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90AEB278C7DDF001C4FEA /* Feels.xcdatamodeld */; }; - 1CD90B76278C8119001C4FEA /* LocalNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B75278C8119001C4FEA /* LocalNotification.swift */; }; - 1CEC966F27B9C29300CC8688 /* CustomWidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CEC966E27B9C29300CC8688 /* CustomWidgetView.swift */; }; - 1CEC967127B9C2BB00CC8688 /* CustomWidgetModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CEC967027B9C2BB00CC8688 /* CustomWidgetModel.swift */; }; - 1CEC967227B9C9FB00CC8688 /* CustomWidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CEC966E27B9C29300CC8688 /* CustomWidgetView.swift */; }; - 1CEC967327B9CA0C00CC8688 /* CustomWidgetModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CEC967027B9C2BB00CC8688 /* CustomWidgetModel.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -205,98 +61,10 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1C0007382EE9339E009C9ED5 /* FeelsSubscriptionStoreView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeelsSubscriptionStoreView.swift; sourceTree = ""; }; - 1C00073B2EE9374A009C9ED5 /* FeelsVoteWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeelsVoteWidget.swift; sourceTree = ""; }; - 1C02589B27B9677A00EB91AC /* CreateWidgetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CreateWidgetView.swift; path = ../CustomIcon/CreateWidgetView.swift; sourceTree = ""; }; - 1C04488627C1C81D00D22444 /* PersonalityPackable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonalityPackable.swift; sourceTree = ""; }; - 1C04488927C2ABD500D22444 /* IconView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconView.swift; sourceTree = ""; }; - 1C04488C27C2ADDB00D22444 /* IconViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconViewModel.swift; sourceTree = ""; }; - 1C04489827C3F24000D22444 /* Color+Codable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+Codable.swift"; sourceTree = ""; }; - 1C0A3C8E27FD445000FF37FF /* OnboardingCustomizeOne.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingCustomizeOne.swift; sourceTree = ""; }; - 1C0A3C9027FD445900FF37FF /* OnboardingCustomizeTwo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingCustomizeTwo.swift; sourceTree = ""; }; 1C0DAB46279DB0FB003B1F21 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; 1C0DAB48279DB116003B1F21 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; - 1C1AFF2F27F894970067F9DC /* ThemePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemePickerView.swift; sourceTree = ""; }; - 1C1AFF3127F894A40067F9DC /* IconPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconPickerView.swift; sourceTree = ""; }; - 1C1AFF3327F894BA0067F9DC /* TintPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TintPickerView.swift; sourceTree = ""; }; - 1C1AFF3727F8951F0067F9DC /* CustomWigetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomWigetView.swift; sourceTree = ""; }; - 1C1AFF3927F895490067F9DC /* ImagePackPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePackPickerView.swift; sourceTree = ""; }; - 1C1AFF3B27F895800067F9DC /* TextColorPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextColorPickerView.swift; sourceTree = ""; }; - 1C1AFF3D27F895A40067F9DC /* PersonalityPackPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonalityPackPickerView.swift; sourceTree = ""; }; - 1C1AFF4027F895C00067F9DC /* ShapePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShapePickerView.swift; sourceTree = ""; }; - 1C1AFF4227F895D90067F9DC /* DayFilterPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DayFilterPickerView.swift; sourceTree = ""; }; - 1C1B6E6827FD4E8F00181E70 /* SampleEntryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleEntryView.swift; sourceTree = ""; }; - 1C2162EA27C14EFA004353D1 /* Date+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Extensions.swift"; sourceTree = ""; }; - 1C2162ED27C15191004353D1 /* MoodEntryFunctions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoodEntryFunctions.swift; sourceTree = ""; }; - 1C2162F127C156E6004353D1 /* CustomizeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomizeView.swift; sourceTree = ""; }; - 1C2162F327C1602D004353D1 /* MoodImagable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoodImagable.swift; sourceTree = ""; }; - 1C2162F627C16D11004353D1 /* MoodTintable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoodTintable.swift; sourceTree = ""; }; - 1C2618FD27960A4F00FDC148 /* YearViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YearViewModel.swift; sourceTree = ""; }; - 1C26190227960CE500FDC148 /* ChartDataBuildable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartDataBuildable.swift; sourceTree = ""; }; - 1C26190627960DC900FDC148 /* ChartViewItemBuildable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartViewItemBuildable.swift; sourceTree = ""; }; - 1C358FAC27ADD0C3002C83A6 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = ""; }; - 1C358FB027B0AD87002C83A6 /* SharingListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharingListView.swift; sourceTree = ""; }; - 1C358FB227B0ADA4002C83A6 /* SharingTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharingTemplate.swift; sourceTree = ""; }; - 1C358FB527B0AE15002C83A6 /* AllMoodsTotalTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllMoodsTotalTemplate.swift; sourceTree = ""; }; - 1C358FB727B0AEE3002C83A6 /* LongestStreakTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LongestStreakTemplate.swift; sourceTree = ""; }; - 1C358FB927B35252002C83A6 /* ActivityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityViewController.swift; sourceTree = ""; }; - 1C358FBD27B4D1F2002C83A6 /* CurrentStreakTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrentStreakTemplate.swift; sourceTree = ""; }; - 1C358FBF27B4D20C002C83A6 /* MonthTotalTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonthTotalTemplate.swift; sourceTree = ""; }; - 1C358FC127B4D227002C83A6 /* WeekTotalTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeekTotalTemplate.swift; sourceTree = ""; }; - 1C361F0927C0356000E832FC /* MonthView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonthView.swift; sourceTree = ""; }; - 1C361F0B27C0356B00E832FC /* MainTabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabView.swift; sourceTree = ""; }; - 1C361F1327C03C8600E832FC /* OnboardingDataDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingDataDataManager.swift; sourceTree = ""; }; - 1C361F1627C046D800E832FC /* MonthDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonthDetailView.swift; sourceTree = ""; }; - 1C414C0E27D51FB500BC1720 /* EntryListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EntryListView.swift; sourceTree = ""; }; - 1C414C2927DB1AF900BC1720 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; - 1C414C2F27DB1C2400BC1720 /* EventLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventLogger.swift; sourceTree = ""; }; - 1C4FF3BA27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowBasedOnVoteLogics.swift; sourceTree = ""; }; - 1C4FF3BD27BEDF9100BE8F34 /* PersistenceHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistenceHelper.swift; sourceTree = ""; }; - 1C4FF3BF27BEE06900BE8F34 /* PersistenceGET.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistenceGET.swift; sourceTree = ""; }; - 1C4FF3C227BEE07200BE8F34 /* PersistenceDELETE.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistenceDELETE.swift; sourceTree = ""; }; - 1C4FF3C627BEE09E00BE8F34 /* PersistenceADD.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistenceADD.swift; sourceTree = ""; }; - 1C5F4975279C84090092F1B4 /* OnboardingData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingData.swift; sourceTree = ""; }; - 1C5F4977279C945E0092F1B4 /* UserDefaultsStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsStore.swift; sourceTree = ""; }; - 1C658D7627C0744D003231EE /* PersistenceUPDATE.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistenceUPDATE.swift; sourceTree = ""; }; - 1C683FC92792281400745862 /* Stats.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Stats.swift; sourceTree = ""; }; - 1C6EA8592946F1A300C7D332 /* IAPWarningView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IAPWarningView.swift; sourceTree = ""; }; - 1C718C6F27F611C900A8F9FE /* DaysFilterClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DaysFilterClass.swift; sourceTree = ""; }; - 1C718C7227F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StupidAssCustomWidgetObservableObject.swift; sourceTree = ""; }; - 1C7352B827DD02760024B5D2 /* ImagePickerGridView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePickerGridView.swift; sourceTree = ""; }; - 1C744F2B278CE15600953A57 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 1C76E86D27C882A400ADEE1F /* SharingImageModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharingImageModels.swift; sourceTree = ""; }; - 1C95ABC827E6F73A00509BD3 /* Shapes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shapes.swift; sourceTree = ""; }; - 1C95ABCB27E6FA7200509BD3 /* DiamondView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiamondView.swift; sourceTree = ""; }; - 1CA0376F2799FFA600D26164 /* DayViewViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DayViewViewModel.swift; sourceTree = ""; }; - 1CA03772279A293D00D26164 /* OnboardingTime.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingTime.swift; sourceTree = ""; }; - 1CA03774279A294800D26164 /* OnboardingDay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingDay.swift; sourceTree = ""; }; - 1CA03776279A295600D26164 /* OnboardingTitle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingTitle.swift; sourceTree = ""; }; - 1CA03779279A296E00D26164 /* OnboardingMain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingMain.swift; sourceTree = ""; }; - 1CA0377B279B605000D26164 /* OnboardingWrapup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingWrapup.swift; sourceTree = ""; }; - 1CAD602B27A5C1C800C520BD /* SmallRollUpHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SmallRollUpHeaderView.swift; sourceTree = ""; }; - 1CAD602C27A5C1C800C520BD /* SettingsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = ""; }; - 1CAD602D27A5C1C800C520BD /* GraphView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GraphView.swift; sourceTree = ""; }; - 1CAD602E27A5C1C800C520BD /* YearView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YearView.swift; sourceTree = ""; }; - 1CAD602F27A5C1C800C520BD /* AddMoodHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddMoodHeaderView.swift; sourceTree = ""; }; - 1CAD603027A5C1C800C520BD /* HeaderPercView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeaderPercView.swift; sourceTree = ""; }; - 1CAD603127A5C1C800C520BD /* BGView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BGView.swift; sourceTree = ""; }; - 1CAD603227A5C1C800C520BD /* DayView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DayView.swift; sourceTree = ""; }; - 1CAD603327A5C1C800C520BD /* HeaderStatsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeaderStatsView.swift; sourceTree = ""; }; - 1CAD603D27A6ECCD00C520BD /* SwitchableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitchableView.swift; sourceTree = ""; }; - 1CB101C427B62A2D00D1C033 /* EmptyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyView.swift; sourceTree = ""; }; - 1CB101C627B81CAC00D1C033 /* MoodMetrics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoodMetrics.swift; sourceTree = ""; }; - 1CB4D09528779F9B00902A56 /* IAPManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IAPManager.swift; sourceTree = ""; }; - 1CB4D0982877A14100902A56 /* View+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Extensions.swift"; sourceTree = ""; }; - 1CB4D09B2877A36400902A56 /* PurchaseButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchaseButtonView.swift; sourceTree = ""; }; 1CB4D09E28787B3C00902A56 /* Configuration.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = Configuration.storekit; sourceTree = ""; }; 1CB4D09F28787D8A00902A56 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS15.5.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; }; - 1CC03FA627B5865600B530AF /* Shared 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Shared 2.xcdatamodel"; sourceTree = ""; }; - 1CC469A9278F30A0003E0C6E /* BGTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BGTask.swift; sourceTree = ""; }; - 1CC469AB27907D48003E0C6E /* DayChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DayChartView.swift; sourceTree = ""; }; - 1CD90AEC278C7DDF001C4FEA /* Shared.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Shared.xcdatamodel; sourceTree = ""; }; - 1CD90AED278C7DDF001C4FEA /* FeelsApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeelsApp.swift; sourceTree = ""; }; - 1CD90AEF278C7DDF001C4FEA /* Persistence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Persistence.swift; sourceTree = ""; }; - 1CD90AF0278C7DE0001C4FEA /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 1CD90AF5278C7DE0001C4FEA /* iFeels.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iFeels.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1CD90AFB278C7DE0001C4FEA /* Feels.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Feels.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1CD90AFD278C7DE0001C4FEA /* macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = macOS.entitlements; sourceTree = ""; }; @@ -309,24 +77,56 @@ 1CD90B45278C7E7A001C4FEA /* FeelsWidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = FeelsWidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 1CD90B47278C7E7A001C4FEA /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; }; 1CD90B49278C7E7A001C4FEA /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; }; - 1CD90B4C278C7E7A001C4FEA /* FeelsWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeelsWidget.swift; sourceTree = ""; }; - 1CD90B4E278C7E7A001C4FEA /* FeelsWidget.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = FeelsWidget.intentdefinition; sourceTree = ""; }; - 1CD90B4F278C7E7A001C4FEA /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 1CD90B51278C7E7A001C4FEA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 1CD90B5C278C7EAD001C4FEA /* Random.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Random.swift; sourceTree = ""; }; - 1CD90B61278C7EBA001C4FEA /* Mood.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mood.swift; sourceTree = ""; }; - 1CD90B62278C7EBA001C4FEA /* MoodEntryExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoodEntryExtension.swift; sourceTree = ""; }; 1CD90B69278C7F65001C4FEA /* Feels--iOS--Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Feels--iOS--Info.plist"; sourceTree = ""; }; 1CD90B6A278C7F75001C4FEA /* Feels (iOS).entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Feels (iOS).entitlements"; sourceTree = ""; }; 1CD90B6B278C7F78001C4FEA /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS15.2.sdk/System/Library/Frameworks/CloudKit.framework; sourceTree = DEVELOPER_DIR; }; 1CD90B6D278C7F89001C4FEA /* FeelsWidgetExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = FeelsWidgetExtension.entitlements; sourceTree = ""; }; 1CD90B6F278C8000001C4FEA /* FeelsWidgetExtensionDev.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = FeelsWidgetExtensionDev.entitlements; sourceTree = ""; }; 1CD90B70278C8000001C4FEA /* Feels (iOS)Dev.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "Feels (iOS)Dev.entitlements"; sourceTree = ""; }; - 1CD90B75278C8119001C4FEA /* LocalNotification.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocalNotification.swift; sourceTree = ""; }; - 1CEC966E27B9C29300CC8688 /* CustomWidgetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomWidgetView.swift; sourceTree = ""; }; - 1CEC967027B9C2BB00CC8688 /* CustomWidgetModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomWidgetModel.swift; sourceTree = ""; }; /* End PBXFileReference section */ +/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ + 1C000C162EE93AE3009C9ED5 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + "Color+Codable.swift", + "Date+Extensions.swift", + EventLogger.swift, + Feels.xcdatamodeld, + Models/DiamondView.swift, + Models/Mood.swift, + Models/MoodEntryExtension.swift, + Models/MoodImagable.swift, + Models/MoodMetrics.swift, + Models/MoodTintable.swift, + Models/PersonalityPackable.swift, + Models/Shapes.swift, + Models/Theme.swift, + Models/UserDefaultsStore.swift, + Onboarding/OnboardingData.swift, + Onboarding/views/OnboardingDay.swift, + Persisence/Persistence.swift, + Persisence/PersistenceADD.swift, + Persisence/PersistenceDELETE.swift, + Persisence/PersistenceGET.swift, + Persisence/PersistenceHelper.swift, + Random.swift, + ShowBasedOnVoteLogics.swift, + Views/BGView.swift, + Views/CustomIcon/IconView.swift, + Views/CustomIcon/IconViewModel.swift, + Views/CustomWidget/CustomWidgetModel.swift, + Views/CustomWidget/CustomWidgetView.swift, + ); + target = 1CD90B44278C7E7A001C4FEA /* FeelsWidgetExtension */; + }; +/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ + +/* Begin PBXFileSystemSynchronizedRootGroup section */ + 1C00073D2EE9388A009C9ED5 /* Shared */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (1C000C162EE93AE3009C9ED5 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Shared; sourceTree = ""; }; + 1C0009922EE938FC009C9ED5 /* FeelsWidget2 */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = FeelsWidget2; sourceTree = ""; }; +/* End PBXFileSystemSynchronizedRootGroup section */ + /* Begin PBXFrameworksBuildPhase section */ 1CD90AF2278C7DE0001C4FEA /* Frameworks */ = { isa = PBXFrameworksBuildPhase; @@ -373,184 +173,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1C04488F27C2CA9C00D22444 /* DayView */ = { - isa = PBXGroup; - children = ( - 1CAD603227A5C1C800C520BD /* DayView.swift */, - 1CA0376F2799FFA600D26164 /* DayViewViewModel.swift */, - ); - path = DayView; - sourceTree = ""; - }; - 1C04489027C2CAAC00D22444 /* CustomIcon */ = { - isa = PBXGroup; - children = ( - 1C04488927C2ABD500D22444 /* IconView.swift */, - 1C04488C27C2ADDB00D22444 /* IconViewModel.swift */, - ); - path = CustomIcon; - sourceTree = ""; - }; - 1C04489127C2CAB100D22444 /* CustomWidget */ = { - isa = PBXGroup; - children = ( - 1CEC966E27B9C29300CC8688 /* CustomWidgetView.swift */, - 1C02589B27B9677A00EB91AC /* CreateWidgetView.swift */, - 1CEC967027B9C2BB00CC8688 /* CustomWidgetModel.swift */, - ); - path = CustomWidget; - sourceTree = ""; - }; - 1C04489227C2CAB700D22444 /* CustomizeView */ = { - isa = PBXGroup; - children = ( - 1C2162F127C156E6004353D1 /* CustomizeView.swift */, - 1C1AFF4427F898E40067F9DC /* SubViews */, - ); - path = CustomizeView; - sourceTree = ""; - }; - 1C04489327C2CABF00D22444 /* SettingsView */ = { - isa = PBXGroup; - children = ( - 1CAD602C27A5C1C800C520BD /* SettingsView.swift */, - ); - path = SettingsView; - sourceTree = ""; - }; - 1C04489427C2CAD100D22444 /* YearView */ = { - isa = PBXGroup; - children = ( - 1CAD602E27A5C1C800C520BD /* YearView.swift */, - 1C2618FD27960A4F00FDC148 /* YearViewModel.swift */, - ); - path = YearView; - sourceTree = ""; - }; - 1C04489527C2CB1A00D22444 /* Sharing */ = { - isa = PBXGroup; - children = ( - 1C358FB027B0AD87002C83A6 /* SharingListView.swift */, - ); - path = Sharing; - sourceTree = ""; - }; - 1C1AFF4427F898E40067F9DC /* SubViews */ = { - isa = PBXGroup; - children = ( - 1C1AFF3727F8951F0067F9DC /* CustomWigetView.swift */, - 1C1AFF4227F895D90067F9DC /* DayFilterPickerView.swift */, - 1C1AFF3127F894A40067F9DC /* IconPickerView.swift */, - 1C1AFF3927F895490067F9DC /* ImagePackPickerView.swift */, - 1C1AFF3D27F895A40067F9DC /* PersonalityPackPickerView.swift */, - 1C1AFF4027F895C00067F9DC /* ShapePickerView.swift */, - 1C1AFF3B27F895800067F9DC /* TextColorPickerView.swift */, - 1C1AFF2F27F894970067F9DC /* ThemePickerView.swift */, - 1C1AFF3327F894BA0067F9DC /* TintPickerView.swift */, - ); - path = SubViews; - sourceTree = ""; - }; - 1C26190127960CDA00FDC148 /* Protocols */ = { - isa = PBXGroup; - children = ( - 1C26190227960CE500FDC148 /* ChartDataBuildable.swift */, - 1C26190627960DC900FDC148 /* ChartViewItemBuildable.swift */, - 1C358FB227B0ADA4002C83A6 /* SharingTemplate.swift */, - ); - path = Protocols; - sourceTree = ""; - }; - 1C358FB427B0ADF3002C83A6 /* SharingTemplates */ = { - isa = PBXGroup; - children = ( - 1C358FB527B0AE15002C83A6 /* AllMoodsTotalTemplate.swift */, - 1C358FBD27B4D1F2002C83A6 /* CurrentStreakTemplate.swift */, - 1C358FB727B0AEE3002C83A6 /* LongestStreakTemplate.swift */, - 1C358FBF27B4D20C002C83A6 /* MonthTotalTemplate.swift */, - 1C358FC127B4D227002C83A6 /* WeekTotalTemplate.swift */, - ); - path = SharingTemplates; - sourceTree = ""; - }; - 1C4DAA7327CC263F00C25D2B /* MonthView */ = { - isa = PBXGroup; - children = ( - 1C361F0927C0356000E832FC /* MonthView.swift */, - 1C361F1627C046D800E832FC /* MonthDetailView.swift */, - ); - path = MonthView; - sourceTree = ""; - }; - 1C4FF3C527BEE07800BE8F34 /* Persisence */ = { - isa = PBXGroup; - children = ( - 1CD90AEF278C7DDF001C4FEA /* Persistence.swift */, - 1C4FF3C627BEE09E00BE8F34 /* PersistenceADD.swift */, - 1C4FF3C227BEE07200BE8F34 /* PersistenceDELETE.swift */, - 1C4FF3BF27BEE06900BE8F34 /* PersistenceGET.swift */, - 1C658D7627C0744D003231EE /* PersistenceUPDATE.swift */, - 1C4FF3BD27BEDF9100BE8F34 /* PersistenceHelper.swift */, - ); - path = Persisence; - sourceTree = ""; - }; - 1CA03771279A291F00D26164 /* Onboarding */ = { - isa = PBXGroup; - children = ( - 1C5F4975279C84090092F1B4 /* OnboardingData.swift */, - 1CA03778279A295F00D26164 /* views */, - ); - path = Onboarding; - sourceTree = ""; - }; - 1CA03778279A295F00D26164 /* views */ = { - isa = PBXGroup; - children = ( - 1CA03779279A296E00D26164 /* OnboardingMain.swift */, - 1CA03772279A293D00D26164 /* OnboardingTime.swift */, - 1CA03774279A294800D26164 /* OnboardingDay.swift */, - 1CA03776279A295600D26164 /* OnboardingTitle.swift */, - 1C0A3C8E27FD445000FF37FF /* OnboardingCustomizeOne.swift */, - 1C0A3C9027FD445900FF37FF /* OnboardingCustomizeTwo.swift */, - 1CA0377B279B605000D26164 /* OnboardingWrapup.swift */, - ); - path = views; - sourceTree = ""; - }; - 1CAD602A27A5C1C800C520BD /* Views */ = { - isa = PBXGroup; - children = ( - 1C0007382EE9339E009C9ED5 /* FeelsSubscriptionStoreView.swift */, - 1C358FB927B35252002C83A6 /* ActivityViewController.swift */, - 1CAD602F27A5C1C800C520BD /* AddMoodHeaderView.swift */, - 1CAD603127A5C1C800C520BD /* BGView.swift */, - 1C04489027C2CAAC00D22444 /* CustomIcon */, - 1C04489227C2CAB700D22444 /* CustomizeView */, - 1C04489127C2CAB100D22444 /* CustomWidget */, - 1CC469AB27907D48003E0C6E /* DayChartView.swift */, - 1C04488F27C2CA9C00D22444 /* DayView */, - 1CB101C427B62A2D00D1C033 /* EmptyView.swift */, - 1C414C0E27D51FB500BC1720 /* EntryListView.swift */, - 1CAD602D27A5C1C800C520BD /* GraphView.swift */, - 1CAD603027A5C1C800C520BD /* HeaderPercView.swift */, - 1CAD603327A5C1C800C520BD /* HeaderStatsView.swift */, - 1C7352B827DD02760024B5D2 /* ImagePickerGridView.swift */, - 1C361F0B27C0356B00E832FC /* MainTabView.swift */, - 1C4DAA7327CC263F00C25D2B /* MonthView */, - 1CB4D09B2877A36400902A56 /* PurchaseButtonView.swift */, - 1C6EA8592946F1A300C7D332 /* IAPWarningView.swift */, - 1C1B6E6827FD4E8F00181E70 /* SampleEntryView.swift */, - 1C04489327C2CABF00D22444 /* SettingsView */, - 1C04489527C2CB1A00D22444 /* Sharing */, - 1C358FB427B0ADF3002C83A6 /* SharingTemplates */, - 1CAD602B27A5C1C800C520BD /* SmallRollUpHeaderView.swift */, - 1CAD603D27A6ECCD00C520BD /* SwitchableView.swift */, - 1C04489427C2CAD100D22444 /* YearView */, - ); - path = Views; - sourceTree = ""; - }; 1CD90AE5278C7DDF001C4FEA = { isa = PBXGroup; children = ( @@ -561,8 +183,8 @@ 1CD90B6D278C7F89001C4FEA /* FeelsWidgetExtension.entitlements */, 1CD90B6F278C8000001C4FEA /* FeelsWidgetExtensionDev.entitlements */, 1CD90B69278C7F65001C4FEA /* Feels--iOS--Info.plist */, - 1CD90AEA278C7DDF001C4FEA /* Shared */, - 1CD90B4B278C7E7A001C4FEA /* FeelsWidget */, + 1C00073D2EE9388A009C9ED5 /* Shared */, + 1C0009922EE938FC009C9ED5 /* FeelsWidget2 */, 1CD90AFC278C7DE0001C4FEA /* macOS */, 1CD90B05278C7DE0001C4FEA /* Tests iOS */, 1CD90B11278C7DE0001C4FEA /* Tests macOS */, @@ -571,34 +193,6 @@ ); sourceTree = ""; }; - 1CD90AEA278C7DDF001C4FEA /* Shared */ = { - isa = PBXGroup; - children = ( - 1C414C2927DB1AF900BC1720 /* GoogleService-Info.plist */, - 1CD90AED278C7DDF001C4FEA /* FeelsApp.swift */, - 1C744F2B278CE15600953A57 /* AppDelegate.swift */, - 1CC469A9278F30A0003E0C6E /* BGTask.swift */, - 1C414C2F27DB1C2400BC1720 /* EventLogger.swift */, - 1CD90B75278C8119001C4FEA /* LocalNotification.swift */, - 1C4FF3C527BEE07800BE8F34 /* Persisence */, - 1CD90B5C278C7EAD001C4FEA /* Random.swift */, - 1C04489827C3F24000D22444 /* Color+Codable.swift */, - 1C2162EA27C14EFA004353D1 /* Date+Extensions.swift */, - 1C2162ED27C15191004353D1 /* MoodEntryFunctions.swift */, - 1C683FC92792281400745862 /* Stats.swift */, - 1C4FF3BA27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift */, - 1CB4D0982877A14100902A56 /* View+Extensions.swift */, - 1CB4D09528779F9B00902A56 /* IAPManager.swift */, - 1CA03771279A291F00D26164 /* Onboarding */, - 1C26190127960CDA00FDC148 /* Protocols */, - 1CAD602A27A5C1C800C520BD /* Views */, - 1CD90B60278C7EBA001C4FEA /* Models */, - 1CD90AF0278C7DE0001C4FEA /* Assets.xcassets */, - 1CD90AEB278C7DDF001C4FEA /* Feels.xcdatamodeld */, - ); - path = Shared; - sourceTree = ""; - }; 1CD90AF6278C7DE0001C4FEA /* Products */ = { isa = PBXGroup; children = ( @@ -648,39 +242,6 @@ name = Frameworks; sourceTree = ""; }; - 1CD90B4B278C7E7A001C4FEA /* FeelsWidget */ = { - isa = PBXGroup; - children = ( - 1CD90B4C278C7E7A001C4FEA /* FeelsWidget.swift */, - 1CD90B4E278C7E7A001C4FEA /* FeelsWidget.intentdefinition */, - 1CD90B4F278C7E7A001C4FEA /* Assets.xcassets */, - 1CD90B51278C7E7A001C4FEA /* Info.plist */, - 1C00073B2EE9374A009C9ED5 /* FeelsVoteWidget.swift */, - ); - path = FeelsWidget; - sourceTree = ""; - }; - 1CD90B60278C7EBA001C4FEA /* Models */ = { - isa = PBXGroup; - children = ( - 1C718C6F27F611C900A8F9FE /* DaysFilterClass.swift */, - 1C95ABCB27E6FA7200509BD3 /* DiamondView.swift */, - 1CD90B61278C7EBA001C4FEA /* Mood.swift */, - 1CD90B62278C7EBA001C4FEA /* MoodEntryExtension.swift */, - 1C2162F327C1602D004353D1 /* MoodImagable.swift */, - 1CB101C627B81CAC00D1C033 /* MoodMetrics.swift */, - 1C2162F627C16D11004353D1 /* MoodTintable.swift */, - 1C361F1327C03C8600E832FC /* OnboardingDataDataManager.swift */, - 1C04488627C1C81D00D22444 /* PersonalityPackable.swift */, - 1C95ABC827E6F73A00509BD3 /* Shapes.swift */, - 1C76E86D27C882A400ADEE1F /* SharingImageModels.swift */, - 1C718C7227F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift */, - 1C358FAC27ADD0C3002C83A6 /* Theme.swift */, - 1C5F4977279C945E0092F1B4 /* UserDefaultsStore.swift */, - ); - path = Models; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -698,6 +259,9 @@ dependencies = ( 1CD90B55278C7E7A001C4FEA /* PBXTargetDependency */, ); + fileSystemSynchronizedGroups = ( + 1C00073D2EE9388A009C9ED5 /* Shared */, + ); name = "Feels (iOS)"; packageProductDependencies = ( 1C2618F92795E41D00FDC148 /* Charts */, @@ -772,6 +336,9 @@ ); dependencies = ( ); + fileSystemSynchronizedGroups = ( + 1C0009922EE938FC009C9ED5 /* FeelsWidget2 */, + ); name = FeelsWidgetExtension; packageProductDependencies = ( ); @@ -840,9 +407,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1CD90B1E278C7DE0001C4FEA /* Assets.xcassets in Resources */, 1C0DAB45279DB0FB003B1F21 /* Localizable.strings in Resources */, - 1C414C2A27DB1AF900BC1720 /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -850,7 +415,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1CD90B1F278C7DE0001C4FEA /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -872,8 +436,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1CD90B50278C7E7A001C4FEA /* Assets.xcassets in Resources */, - 1C414C2B27DB1AF900BC1720 /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -884,97 +446,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1CA037702799FFA600D26164 /* DayViewViewModel.swift in Sources */, - 1CA03773279A293D00D26164 /* OnboardingTime.swift in Sources */, - 1CAD603927A5C1C800C520BD /* HeaderPercView.swift in Sources */, - 1C0A3C8F27FD445000FF37FF /* OnboardingCustomizeOne.swift in Sources */, - 1CAD603C27A5C1C800C520BD /* HeaderStatsView.swift in Sources */, - 1CAD603827A5C1C800C520BD /* AddMoodHeaderView.swift in Sources */, - 1CA0377C279B605000D26164 /* OnboardingWrapup.swift in Sources */, - 1C4FF3C327BEE07200BE8F34 /* PersistenceDELETE.swift in Sources */, - 1CA03775279A294800D26164 /* OnboardingDay.swift in Sources */, - 1C1AFF3C27F895800067F9DC /* TextColorPickerView.swift in Sources */, - 1CAD603727A5C1C800C520BD /* YearView.swift in Sources */, - 1C04488D27C2ADDB00D22444 /* IconViewModel.swift in Sources */, - 1C2162F227C156E6004353D1 /* CustomizeView.swift in Sources */, - 1C1AFF3E27F895A40067F9DC /* PersonalityPackPickerView.swift in Sources */, - 1C683FCA2792281400745862 /* Stats.swift in Sources */, - 1C76E86E27C882A400ADEE1F /* SharingImageModels.swift in Sources */, - 1C718C7327F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift in Sources */, - 1CAD603E27A6ECCD00C520BD /* SwitchableView.swift in Sources */, - 1CD90B76278C8119001C4FEA /* LocalNotification.swift in Sources */, - 1C358FB627B0AE15002C83A6 /* AllMoodsTotalTemplate.swift in Sources */, - 1CD90B16278C7DE0001C4FEA /* Feels.xcdatamodeld in Sources */, - 1C1AFF3027F894970067F9DC /* ThemePickerView.swift in Sources */, - 1C1AFF4327F895D90067F9DC /* DayFilterPickerView.swift in Sources */, - 1C04488727C1C81D00D22444 /* PersonalityPackable.swift in Sources */, - 1C0A3C9127FD445900FF37FF /* OnboardingCustomizeTwo.swift in Sources */, - 1C4FF3BE27BEDF9100BE8F34 /* PersistenceHelper.swift in Sources */, - 1CC469AA278F30A0003E0C6E /* BGTask.swift in Sources */, - 1C95ABC927E6F73A00509BD3 /* Shapes.swift in Sources */, - 1CAD603B27A5C1C800C520BD /* DayView.swift in Sources */, - 1C5F4976279C84090092F1B4 /* OnboardingData.swift in Sources */, - 1CAD603427A5C1C800C520BD /* SmallRollUpHeaderView.swift in Sources */, - 1CAD603A27A5C1C800C520BD /* BGView.swift in Sources */, - 1C6EA85A2946F1A300C7D332 /* IAPWarningView.swift in Sources */, - 1C26190727960DC900FDC148 /* ChartViewItemBuildable.swift in Sources */, - 1CD90B5D278C7EAD001C4FEA /* Random.swift in Sources */, - 1C2618FE27960A4F00FDC148 /* YearViewModel.swift in Sources */, - 1C744F2C278CE15600953A57 /* AppDelegate.swift in Sources */, - 1CD90B63278C7EBA001C4FEA /* Mood.swift in Sources */, - 1C1B6E6927FD4E8F00181E70 /* SampleEntryView.swift in Sources */, - 1C358FBE27B4D1F2002C83A6 /* CurrentStreakTemplate.swift in Sources */, - 1C4FF3C727BEE09E00BE8F34 /* PersistenceADD.swift in Sources */, - 1C414C0F27D51FB500BC1720 /* EntryListView.swift in Sources */, - 1C1AFF3827F8951F0067F9DC /* CustomWigetView.swift in Sources */, - 1C4FF3BB27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift in Sources */, - 1CAD603527A5C1C800C520BD /* SettingsView.swift in Sources */, - 1CD90B53278C7E7A001C4FEA /* FeelsWidget.intentdefinition in Sources */, - 1CC469AC27907D48003E0C6E /* DayChartView.swift in Sources */, - 1CB4D0992877A14100902A56 /* View+Extensions.swift in Sources */, - 1C26190327960CE500FDC148 /* ChartDataBuildable.swift in Sources */, - 1CB101C527B62A2D00D1C033 /* EmptyView.swift in Sources */, - 1CB101C727B81CAC00D1C033 /* MoodMetrics.swift in Sources */, - 1C2162F427C1602D004353D1 /* MoodImagable.swift in Sources */, - 1CAD603627A5C1C800C520BD /* GraphView.swift in Sources */, - 1C2162F727C16D11004353D1 /* MoodTintable.swift in Sources */, - 1C361F1727C046D800E832FC /* MonthDetailView.swift in Sources */, - 1CD90B66278C7EBA001C4FEA /* MoodEntryExtension.swift in Sources */, - 1C658D7727C0744D003231EE /* PersistenceUPDATE.swift in Sources */, - 1C7352B927DD02760024B5D2 /* ImagePickerGridView.swift in Sources */, - 1C358FB327B0ADA4002C83A6 /* SharingTemplate.swift in Sources */, - 1CB4D09C2877A36400902A56 /* PurchaseButtonView.swift in Sources */, - 1C358FB827B0AEE3002C83A6 /* LongestStreakTemplate.swift in Sources */, - 1C1AFF4127F895C00067F9DC /* ShapePickerView.swift in Sources */, - 1C358FB127B0AD87002C83A6 /* SharingListView.swift in Sources */, - 1CB4D09628779F9B00902A56 /* IAPManager.swift in Sources */, - 1CD90B1C278C7DE0001C4FEA /* Persistence.swift in Sources */, - 1CEC966F27B9C29300CC8688 /* CustomWidgetView.swift in Sources */, - 1CA0377A279A296E00D26164 /* OnboardingMain.swift in Sources */, - 1C358FBA27B35252002C83A6 /* ActivityViewController.swift in Sources */, - 1C5F4978279C945E0092F1B4 /* UserDefaultsStore.swift in Sources */, - 1C414C3027DB1C2400BC1720 /* EventLogger.swift in Sources */, - 1CD90B18278C7DE0001C4FEA /* FeelsApp.swift in Sources */, - 1C358FC027B4D20C002C83A6 /* MonthTotalTemplate.swift in Sources */, - 1CA03777279A295600D26164 /* OnboardingTitle.swift in Sources */, - 1C1AFF3A27F895490067F9DC /* ImagePackPickerView.swift in Sources */, - 1C4FF3C027BEE06900BE8F34 /* PersistenceGET.swift in Sources */, - 1C04488A27C2ABD500D22444 /* IconView.swift in Sources */, - 1C361F0C27C0356B00E832FC /* MainTabView.swift in Sources */, - 1CEC967127B9C2BB00CC8688 /* CustomWidgetModel.swift in Sources */, - 1C2162EE27C15191004353D1 /* MoodEntryFunctions.swift in Sources */, - 1C361F0A27C0356000E832FC /* MonthView.swift in Sources */, - 1C361F1427C03C8600E832FC /* OnboardingDataDataManager.swift in Sources */, - 1C0007392EE9339E009C9ED5 /* FeelsSubscriptionStoreView.swift in Sources */, - 1C358FAD27ADD0C3002C83A6 /* Theme.swift in Sources */, - 1C718C7027F611C900A8F9FE /* DaysFilterClass.swift in Sources */, - 1C95ABCC27E6FA7200509BD3 /* DiamondView.swift in Sources */, - 1C2162EB27C14EFA004353D1 /* Date+Extensions.swift in Sources */, - 1C02589C27B9677A00EB91AC /* CreateWidgetView.swift in Sources */, - 1C1AFF3227F894A40067F9DC /* IconPickerView.swift in Sources */, - 1C04489927C3F24000D22444 /* Color+Codable.swift in Sources */, - 1C1AFF3427F894BA0067F9DC /* TintPickerView.swift in Sources */, - 1C358FC227B4D227002C83A6 /* WeekTotalTemplate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -982,9 +453,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1CD90B64278C7EBA001C4FEA /* Mood.swift in Sources */, - 1CD90B17278C7DE0001C4FEA /* Feels.xcdatamodeld in Sources */, - 1CD90B67278C7EBA001C4FEA /* MoodEntryExtension.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -992,10 +460,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1C414BF127D3CAB300BC1720 /* OnboardingData.swift in Sources */, 1CD90B09278C7DE0001C4FEA /* Tests_iOSLaunchTests.swift in Sources */, 1CD90B07278C7DE0001C4FEA /* Tests_iOS.swift in Sources */, - 1C414BF527D3CB2200BC1720 /* OnboardingDay.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1012,49 +478,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1CD90B65278C7EBA001C4FEA /* Mood.swift in Sources */, - 1C04488B27C2ABDE00D22444 /* IconView.swift in Sources */, - 1C04489A27C3F24F00D22444 /* Color+Codable.swift in Sources */, - 1C361F1127C03C3D00E832FC /* OnboardingTime.swift in Sources */, - 1C00073A2EE933B3009C9ED5 /* FeelsSubscriptionStoreView.swift in Sources */, - 1C76E86F27C882A400ADEE1F /* SharingImageModels.swift in Sources */, - 1CEC967227B9C9FB00CC8688 /* CustomWidgetView.swift in Sources */, - 1C2162F827C16E3C004353D1 /* MoodTintable.swift in Sources */, - 1C95ABCA27E6F73A00509BD3 /* Shapes.swift in Sources */, - 1C4FF3BC27BEDF6600BE8F34 /* ShowBasedOnVoteLogics.swift in Sources */, - 1C4FF3C927BEE0C300BE8F34 /* PersistenceHelper.swift in Sources */, - 1CA2662D2793908700C0E12C /* Persistence.swift in Sources */, - 1CD90B5F278C7EAD001C4FEA /* Random.swift in Sources */, - 1CD90B68278C7EBA001C4FEA /* MoodEntryExtension.swift in Sources */, - 1CD90B71278C80CA001C4FEA /* Feels.xcdatamodeld in Sources */, - 1C658D7827C0744D003231EE /* PersistenceUPDATE.swift in Sources */, - 1C10E25127A1AB320047948B /* OnboardingTitle.swift in Sources */, - 1C04488E27C2AE5200D22444 /* IconViewModel.swift in Sources */, - 1C04489727C2DB9B00D22444 /* BGView.swift in Sources */, - 1CB101C827B81CAC00D1C033 /* MoodMetrics.swift in Sources */, - 1C683FCB2792281400745862 /* Stats.swift in Sources */, - 1C718C7127F611C900A8F9FE /* DaysFilterClass.swift in Sources */, - 1C00073C2EE9374A009C9ED5 /* FeelsVoteWidget.swift in Sources */, - 1CEC967327B9CA0C00CC8688 /* CustomWidgetModel.swift in Sources */, - 1C10E25027A1AB220047948B /* OnboardingDay.swift in Sources */, - 1C04488827C1CD8C00D22444 /* PersonalityPackable.swift in Sources */, - 1C4FF3C427BEE07200BE8F34 /* PersistenceDELETE.swift in Sources */, - 1C4FF3C827BEE09E00BE8F34 /* PersistenceADD.swift in Sources */, - 1C2162F527C16061004353D1 /* MoodImagable.swift in Sources */, - 1C2162EC27C14FC5004353D1 /* Date+Extensions.swift in Sources */, - 1C2C5B2B27DEBE260092A308 /* EventLogger.swift in Sources */, - 1C4FF3C127BEE06900BE8F34 /* PersistenceGET.swift in Sources */, - 1C361F0D27C03BDF00E832FC /* OnboardingData.swift in Sources */, - 1CD90B52278C7E7A001C4FEA /* FeelsWidget.intentdefinition in Sources */, - 1C95ABCD27E6FA7200509BD3 /* DiamondView.swift in Sources */, - 1CB4D09728779F9B00902A56 /* IAPManager.swift in Sources */, - 1CD90B4D278C7E7A001C4FEA /* FeelsWidget.swift in Sources */, - 1C04489627C2DB0100D22444 /* Theme.swift in Sources */, - 1C361F0F27C03C0E00E832FC /* LocalNotification.swift in Sources */, - 1C10E24E27A1AB110047948B /* UserDefaultsStore.swift in Sources */, - 1CB4D09D2877A36400902A56 /* PurchaseButtonView.swift in Sources */, - 1CB4D09A2877A14100902A56 /* View+Extensions.swift in Sources */, - 1C718C7427F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1437,7 +860,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = V3PF3M6B6U; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = FeelsWidget/Info.plist; + INFOPLIST_FILE = "FeelsWidgetExtension-Info.plist"; INFOPLIST_KEY_CFBundleDisplayName = iFeelsWidget; INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 18.6; @@ -1469,7 +892,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = V3PF3M6B6U; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = FeelsWidget/Info.plist; + INFOPLIST_FILE = "FeelsWidgetExtension-Info.plist"; INFOPLIST_KEY_CFBundleDisplayName = iFeelsWidget; INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 18.6; @@ -1581,20 +1004,6 @@ productName = CloudKitSyncMonitor; }; /* End XCSwiftPackageProductDependency section */ - -/* Begin XCVersionGroup section */ - 1CD90AEB278C7DDF001C4FEA /* Feels.xcdatamodeld */ = { - isa = XCVersionGroup; - children = ( - 1CC03FA627B5865600B530AF /* Shared 2.xcdatamodel */, - 1CD90AEC278C7DDF001C4FEA /* Shared.xcdatamodel */, - ); - currentVersion = 1CC03FA627B5865600B530AF /* Shared 2.xcdatamodel */; - path = Feels.xcdatamodeld; - sourceTree = ""; - versionGroupType = wrapper.xcdatamodel; - }; -/* End XCVersionGroup section */ }; rootObject = 1CD90AE6278C7DDF001C4FEA /* Project object */; } diff --git a/Shared2/Assets.xcassets/AccentColor.colorset/Contents.json b/FeelsWidget2/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AccentColor.colorset/Contents.json rename to FeelsWidget2/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/AppIcon.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/AppIcon.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/AppIcon.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/AppIcon.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@1x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@1x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Pro-83.5@2x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Pro-83.5@2x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@1x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@1x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@1x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@1x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@1x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@1x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@2x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@2x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-29@3x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-29@3x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@2x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@2x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@3x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@3x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@3x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@3x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@3x.png b/FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@3x.png rename to FeelsWidget2/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/AppIconAverage.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/AppIconAverage.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/AppIconAverage.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/AppIconAverage.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@1x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Pro-83.5@2x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Pro-83.5@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@1x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@1x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@1x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@2x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@3x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@2x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@3x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@3x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@3x.png b/FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconAverageImage.imageset/AppIconAverage.png b/FeelsWidget2/Assets.xcassets/AppIconAverageImage.imageset/AppIconAverage.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverageImage.imageset/AppIconAverage.png rename to FeelsWidget2/Assets.xcassets/AppIconAverageImage.imageset/AppIconAverage.png diff --git a/Shared2/Assets.xcassets/AppIconAverageImage.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconAverageImage.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconAverageImage.imageset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconAverageImage.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/AppIconBad.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/AppIconBad.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/AppIconBad.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/AppIconBad.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@1x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Pro-83.5@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Pro-83.5@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@1x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@1x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@1x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-29@3x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-29@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@3x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@3x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@3x.png b/FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconBadImage.imageset/AppIconBad.png b/FeelsWidget2/Assets.xcassets/AppIconBadImage.imageset/AppIconBad.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBadImage.imageset/AppIconBad.png rename to FeelsWidget2/Assets.xcassets/AppIconBadImage.imageset/AppIconBad.png diff --git a/Shared2/Assets.xcassets/AppIconBadImage.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconBadImage.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconBadImage.imageset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconBadImage.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/AppIconBlueGreen.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/AppIconBlueGreen.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/AppIconBlueGreen.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/AppIconBlueGreen.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@1x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Pro-83.5@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Pro-83.5@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@1x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@1x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@1x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@3x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@3x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@3x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@3x.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreenImage.imageset/AppIconBlueGreen.png b/FeelsWidget2/Assets.xcassets/AppIconBlueGreenImage.imageset/AppIconBlueGreen.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreenImage.imageset/AppIconBlueGreen.png rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreenImage.imageset/AppIconBlueGreen.png diff --git a/Shared2/Assets.xcassets/AppIconBlueGreenImage.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconBlueGreenImage.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconBlueGreenImage.imageset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconBlueGreenImage.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/AppIconGood.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/AppIconGood.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/AppIconGood.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/AppIconGood.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@1x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Pro-83.5@2x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Pro-83.5@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@1x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@1x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@1x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@2x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-29@3x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-29@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@2x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@3x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@3x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@3x.png b/FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconGoodImage.imageset/AppIconGood.png b/FeelsWidget2/Assets.xcassets/AppIconGoodImage.imageset/AppIconGood.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconGoodImage.imageset/AppIconGood.png rename to FeelsWidget2/Assets.xcassets/AppIconGoodImage.imageset/AppIconGood.png diff --git a/Shared2/Assets.xcassets/AppIconGoodImage.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconGoodImage.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconGoodImage.imageset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconGoodImage.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/AppIconHorrible.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/AppIconHorrible.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/AppIconHorrible.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/AppIconHorrible.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@1x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Pro-83.5@2x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Pro-83.5@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@1x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@1x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@1x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@2x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@3x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@2x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@3x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@3x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@3x.png b/FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconHorribleImage.imageset/AppIconHorrible.png b/FeelsWidget2/Assets.xcassets/AppIconHorribleImage.imageset/AppIconHorrible.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorribleImage.imageset/AppIconHorrible.png rename to FeelsWidget2/Assets.xcassets/AppIconHorribleImage.imageset/AppIconHorrible.png diff --git a/Shared2/Assets.xcassets/AppIconHorribleImage.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconHorribleImage.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconHorribleImage.imageset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconHorribleImage.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconImage.imageset/AppIcon.png b/FeelsWidget2/Assets.xcassets/AppIconImage.imageset/AppIcon.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconImage.imageset/AppIcon.png rename to FeelsWidget2/Assets.xcassets/AppIconImage.imageset/AppIcon.png diff --git a/Shared2/Assets.xcassets/AppIconImage.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconImage.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconImage.imageset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconImage.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/AppIconNeonGreen.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/AppIconNeonGreen.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/AppIconNeonGreen.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/AppIconNeonGreen.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@1x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Pro-83.5@2x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Pro-83.5@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@1x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@1x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@1x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@2x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@3x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@2x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@3x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@3x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@3x.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreenImage.imageset/AppIconNeonGreen.png b/FeelsWidget2/Assets.xcassets/AppIconNeonGreenImage.imageset/AppIconNeonGreen.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreenImage.imageset/AppIconNeonGreen.png rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreenImage.imageset/AppIconNeonGreen.png diff --git a/Shared2/Assets.xcassets/AppIconNeonGreenImage.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconNeonGreenImage.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconNeonGreenImage.imageset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconNeonGreenImage.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/AppIconPink.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/AppIconPink.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/AppIconPink.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/AppIconPink.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@1x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Pro-83.5@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Pro-83.5@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@1x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@1x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@1x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-29@3x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-29@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@3x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@3x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@3x.png b/FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconPinkImage.imageset/AppIconPink.png b/FeelsWidget2/Assets.xcassets/AppIconPinkImage.imageset/AppIconPink.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPinkImage.imageset/AppIconPink.png rename to FeelsWidget2/Assets.xcassets/AppIconPinkImage.imageset/AppIconPink.png diff --git a/Shared2/Assets.xcassets/AppIconPinkImage.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconPinkImage.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconPinkImage.imageset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconPinkImage.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/AppIconPurple.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/AppIconPurple.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/AppIconPurple.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/AppIconPurple.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@1x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Pro-83.5@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Pro-83.5@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@1x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@1x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@1x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@1x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@3x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@3x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@3x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@2x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@2x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@3x.png b/FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@3x.png rename to FeelsWidget2/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconPurpleImage.imageset/AppIconPurple.png b/FeelsWidget2/Assets.xcassets/AppIconPurpleImage.imageset/AppIconPurple.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurpleImage.imageset/AppIconPurple.png rename to FeelsWidget2/Assets.xcassets/AppIconPurpleImage.imageset/AppIconPurple.png diff --git a/Shared2/Assets.xcassets/AppIconPurpleImage.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/AppIconPurpleImage.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconPurpleImage.imageset/Contents.json rename to FeelsWidget2/Assets.xcassets/AppIconPurpleImage.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/Contents.json b/FeelsWidget2/Assets.xcassets/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/Contents.json rename to FeelsWidget2/Assets.xcassets/Contents.json diff --git a/Shared2/Assets.xcassets/custom_icon/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/Contents.json rename to FeelsWidget2/Assets.xcassets/custom_icon/Contents.json diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/android-brands.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/android-brands.imageset/Contents.json new file mode 100644 index 0000000..2405215 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/android-brands.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "android-brands.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/android-brands.imageset/android-brands.png b/FeelsWidget2/Assets.xcassets/custom_icon/android-brands.imageset/android-brands.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/android-brands.imageset/android-brands.png rename to FeelsWidget2/Assets.xcassets/custom_icon/android-brands.imageset/android-brands.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/apple-brands.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/apple-brands.imageset/Contents.json new file mode 100644 index 0000000..1f26f49 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/apple-brands.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "apple-brands.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/apple-brands.imageset/apple-brands.png b/FeelsWidget2/Assets.xcassets/custom_icon/apple-brands.imageset/apple-brands.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/apple-brands.imageset/apple-brands.png rename to FeelsWidget2/Assets.xcassets/custom_icon/apple-brands.imageset/apple-brands.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/arrow-up-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/arrow-up-solid.imageset/Contents.json new file mode 100644 index 0000000..972d1eb --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/arrow-up-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "arrow-up-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/arrow-up-solid.imageset/arrow-up-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/arrow-up-solid.imageset/arrow-up-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/arrow-up-solid.imageset/arrow-up-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/arrow-up-solid.imageset/arrow-up-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/baby-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/baby-solid.imageset/Contents.json new file mode 100644 index 0000000..124563f --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/baby-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "baby-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/baby-solid.imageset/baby-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/baby-solid.imageset/baby-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/baby-solid.imageset/baby-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/baby-solid.imageset/baby-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/ban-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/ban-solid.imageset/Contents.json new file mode 100644 index 0000000..cea75fd --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/ban-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "ban-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/ban-solid.imageset/ban-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/ban-solid.imageset/ban-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/ban-solid.imageset/ban-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/ban-solid.imageset/ban-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/baseball-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/baseball-solid.imageset/Contents.json new file mode 100644 index 0000000..4d44722 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/baseball-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "baseball-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/baseball-solid.imageset/baseball-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/baseball-solid.imageset/baseball-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/baseball-solid.imageset/baseball-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/baseball-solid.imageset/baseball-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/battery-empty-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/battery-empty-solid.imageset/Contents.json new file mode 100644 index 0000000..ae1ffdf --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/battery-empty-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "battery-empty-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/battery-empty-solid.imageset/battery-empty-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/battery-empty-solid.imageset/battery-empty-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-empty-solid.imageset/battery-empty-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/battery-empty-solid.imageset/battery-empty-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/battery-full-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/battery-full-solid.imageset/Contents.json new file mode 100644 index 0000000..2e39e06 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/battery-full-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "battery-full-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/battery-full-solid.imageset/battery-full-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/battery-full-solid.imageset/battery-full-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-full-solid.imageset/battery-full-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/battery-full-solid.imageset/battery-full-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/battery-half-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/battery-half-solid.imageset/Contents.json new file mode 100644 index 0000000..86461b6 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/battery-half-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "battery-half-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/battery-half-solid.imageset/battery-half-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/battery-half-solid.imageset/battery-half-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-half-solid.imageset/battery-half-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/battery-half-solid.imageset/battery-half-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/Contents.json new file mode 100644 index 0000000..f1af99b --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "battery-quarter-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/battery-quarter-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/battery-quarter-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/battery-quarter-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/battery-quarter-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/Contents.json new file mode 100644 index 0000000..cd2499a --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "battery-three-quarters-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/battery-three-quarters-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/battery-three-quarters-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/battery-three-quarters-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/battery-three-quarters-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/bitcoin-brands.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/bitcoin-brands.imageset/Contents.json new file mode 100644 index 0000000..5896427 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/bitcoin-brands.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "bitcoin-brands.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/bitcoin-brands.imageset/bitcoin-brands.png b/FeelsWidget2/Assets.xcassets/custom_icon/bitcoin-brands.imageset/bitcoin-brands.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bitcoin-brands.imageset/bitcoin-brands.png rename to FeelsWidget2/Assets.xcassets/custom_icon/bitcoin-brands.imageset/bitcoin-brands.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/Contents.json new file mode 100644 index 0000000..04a9ad4 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "bolt-lightning-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/bolt-lightning-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/bolt-lightning-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/bolt-lightning-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/bolt-lightning-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/bolt-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/bolt-solid.imageset/Contents.json new file mode 100644 index 0000000..dc8c23a --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/bolt-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "bolt-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/bolt-solid.imageset/bolt-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/bolt-solid.imageset/bolt-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bolt-solid.imageset/bolt-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/bolt-solid.imageset/bolt-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/bomb-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/bomb-solid.imageset/Contents.json new file mode 100644 index 0000000..ce0954d --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/bomb-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "bomb-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/bomb-solid.imageset/bomb-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/bomb-solid.imageset/bomb-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bomb-solid.imageset/bomb-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/bomb-solid.imageset/bomb-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/btc-brands.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/btc-brands.imageset/Contents.json new file mode 100644 index 0000000..8310d2a --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/btc-brands.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "btc-brands.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/btc-brands.imageset/btc-brands.png b/FeelsWidget2/Assets.xcassets/custom_icon/btc-brands.imageset/btc-brands.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/btc-brands.imageset/btc-brands.png rename to FeelsWidget2/Assets.xcassets/custom_icon/btc-brands.imageset/btc-brands.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/bullhorn-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/bullhorn-solid.imageset/Contents.json new file mode 100644 index 0000000..06fb10c --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/bullhorn-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "bullhorn-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/bullhorn-solid.imageset/bullhorn-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/bullhorn-solid.imageset/bullhorn-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bullhorn-solid.imageset/bullhorn-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/bullhorn-solid.imageset/bullhorn-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/bullseye-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/bullseye-solid.imageset/Contents.json new file mode 100644 index 0000000..23e0fe4 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/bullseye-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "bullseye-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/bullseye-solid.imageset/bullseye-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/bullseye-solid.imageset/bullseye-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bullseye-solid.imageset/bullseye-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/bullseye-solid.imageset/bullseye-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/burger-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/burger-solid.imageset/Contents.json new file mode 100644 index 0000000..80b28b5 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/burger-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "burger-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/burger-solid.imageset/burger-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/burger-solid.imageset/burger-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/burger-solid.imageset/burger-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/burger-solid.imageset/burger-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/cannabis-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/cannabis-solid.imageset/Contents.json new file mode 100644 index 0000000..5f38dc3 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/cannabis-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "cannabis-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/cannabis-solid.imageset/cannabis-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/cannabis-solid.imageset/cannabis-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/cannabis-solid.imageset/cannabis-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/cannabis-solid.imageset/cannabis-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/caret-down-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/caret-down-solid.imageset/Contents.json new file mode 100644 index 0000000..37b5371 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/caret-down-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "caret-down-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/caret-down-solid.imageset/caret-down-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/caret-down-solid.imageset/caret-down-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-down-solid.imageset/caret-down-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/caret-down-solid.imageset/caret-down-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/caret-left-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/caret-left-solid.imageset/Contents.json new file mode 100644 index 0000000..d431263 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/caret-left-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "caret-left-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/caret-left-solid.imageset/caret-left-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/caret-left-solid.imageset/caret-left-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-left-solid.imageset/caret-left-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/caret-left-solid.imageset/caret-left-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/caret-right-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/caret-right-solid.imageset/Contents.json new file mode 100644 index 0000000..fecc611 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/caret-right-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "caret-right-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/caret-right-solid.imageset/caret-right-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/caret-right-solid.imageset/caret-right-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-right-solid.imageset/caret-right-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/caret-right-solid.imageset/caret-right-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/caret-up-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/caret-up-solid.imageset/Contents.json new file mode 100644 index 0000000..3d48da8 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/caret-up-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "caret-up-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/caret-up-solid.imageset/caret-up-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/caret-up-solid.imageset/caret-up-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-up-solid.imageset/caret-up-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/caret-up-solid.imageset/caret-up-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/chess-king-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/chess-king-solid.imageset/Contents.json new file mode 100644 index 0000000..22b37be --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/chess-king-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "chess-king-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/chess-king-solid.imageset/chess-king-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/chess-king-solid.imageset/chess-king-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/chess-king-solid.imageset/chess-king-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/chess-king-solid.imageset/chess-king-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/chess-queen-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/chess-queen-solid.imageset/Contents.json new file mode 100644 index 0000000..171aa4e --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/chess-queen-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "chess-queen-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/chess-queen-solid.imageset/chess-queen-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/chess-queen-solid.imageset/chess-queen-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/chess-queen-solid.imageset/chess-queen-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/chess-queen-solid.imageset/chess-queen-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/Contents.json new file mode 100644 index 0000000..c40f4cf --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "circle-xmark-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/circle-xmark-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/circle-xmark-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/circle-xmark-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/circle-xmark-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/clock-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/clock-solid.imageset/Contents.json new file mode 100644 index 0000000..13a73bc --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/clock-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "clock-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/clock-solid.imageset/clock-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/clock-solid.imageset/clock-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/clock-solid.imageset/clock-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/clock-solid.imageset/clock-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/code-compare-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/code-compare-solid.imageset/Contents.json new file mode 100644 index 0000000..ea02326 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/code-compare-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "code-compare-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/code-compare-solid.imageset/code-compare-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/code-compare-solid.imageset/code-compare-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/code-compare-solid.imageset/code-compare-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/code-compare-solid.imageset/code-compare-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/code-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/code-solid.imageset/Contents.json new file mode 100644 index 0000000..a55156a --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/code-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "code-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/code-solid.imageset/code-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/code-solid.imageset/code-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/code-solid.imageset/code-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/code-solid.imageset/code-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/cross-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/cross-solid.imageset/Contents.json new file mode 100644 index 0000000..82b6c99 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/cross-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "cross-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/cross-solid.imageset/cross-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/cross-solid.imageset/cross-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/cross-solid.imageset/cross-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/cross-solid.imageset/cross-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/crosshairs-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/crosshairs-solid.imageset/Contents.json new file mode 100644 index 0000000..2a7e31c --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/crosshairs-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "crosshairs-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/crosshairs-solid.imageset/crosshairs-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/crosshairs-solid.imageset/crosshairs-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/crosshairs-solid.imageset/crosshairs-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/crosshairs-solid.imageset/crosshairs-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/crown-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/crown-solid.imageset/Contents.json new file mode 100644 index 0000000..cd842f1 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/crown-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "crown-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/crown-solid.imageset/crown-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/crown-solid.imageset/crown-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/crown-solid.imageset/crown-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/crown-solid.imageset/crown-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/Contents.json new file mode 100644 index 0000000..f690980 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "dharmachakra-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/dharmachakra-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/dharmachakra-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/dharmachakra-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/dharmachakra-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/dice-d20-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/dice-d20-solid.imageset/Contents.json new file mode 100644 index 0000000..9b10d53 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/dice-d20-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "dice-d20-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/dice-d20-solid.imageset/dice-d20-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/dice-d20-solid.imageset/dice-d20-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dice-d20-solid.imageset/dice-d20-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/dice-d20-solid.imageset/dice-d20-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/dice-one-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/dice-one-solid.imageset/Contents.json new file mode 100644 index 0000000..c819401 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/dice-one-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "dice-one-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/dice-one-solid.imageset/dice-one-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/dice-one-solid.imageset/dice-one-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dice-one-solid.imageset/dice-one-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/dice-one-solid.imageset/dice-one-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/divide-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/divide-solid.imageset/Contents.json new file mode 100644 index 0000000..46c47a5 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/divide-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "divide-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/divide-solid.imageset/divide-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/divide-solid.imageset/divide-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/divide-solid.imageset/divide-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/divide-solid.imageset/divide-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/Contents.json new file mode 100644 index 0000000..373575b --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "dollar-sign-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/dollar-sign-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/dollar-sign-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/dollar-sign-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/dollar-sign-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/dragon-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/dragon-solid.imageset/Contents.json new file mode 100644 index 0000000..1dd72ee --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/dragon-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "dragon-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/dragon-solid.imageset/dragon-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/dragon-solid.imageset/dragon-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dragon-solid.imageset/dragon-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/dragon-solid.imageset/dragon-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/egg-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/egg-solid.imageset/Contents.json new file mode 100644 index 0000000..d9a06fa --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/egg-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "egg-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/egg-solid.imageset/egg-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/egg-solid.imageset/egg-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/egg-solid.imageset/egg-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/egg-solid.imageset/egg-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/empire-brands.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/empire-brands.imageset/Contents.json new file mode 100644 index 0000000..4386ef2 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/empire-brands.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "empire-brands.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/empire-brands.imageset/empire-brands.png b/FeelsWidget2/Assets.xcassets/custom_icon/empire-brands.imageset/empire-brands.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/empire-brands.imageset/empire-brands.png rename to FeelsWidget2/Assets.xcassets/custom_icon/empire-brands.imageset/empire-brands.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/exclamation-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/exclamation-solid.imageset/Contents.json new file mode 100644 index 0000000..f9215ea --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/exclamation-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "exclamation-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/exclamation-solid.imageset/exclamation-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/exclamation-solid.imageset/exclamation-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/exclamation-solid.imageset/exclamation-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/exclamation-solid.imageset/exclamation-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/eye-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/eye-solid.imageset/Contents.json new file mode 100644 index 0000000..7f5011c --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/eye-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "eye-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/eye-solid.imageset/eye-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/eye-solid.imageset/eye-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/eye-solid.imageset/eye-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/eye-solid.imageset/eye-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/fan-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/fan-solid.imageset/Contents.json new file mode 100644 index 0000000..4cbe0b3 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/fan-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "fan-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/fan-solid.imageset/fan-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/fan-solid.imageset/fan-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fan-solid.imageset/fan-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/fan-solid.imageset/fan-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/fire-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/fire-solid.imageset/Contents.json new file mode 100644 index 0000000..baffe46 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/fire-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "fire-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/fire-solid.imageset/fire-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/fire-solid.imageset/fire-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fire-solid.imageset/fire-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/fire-solid.imageset/fire-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/Contents.json new file mode 100644 index 0000000..0ef0534 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "floppy-disk-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/floppy-disk-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/floppy-disk-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/floppy-disk-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/floppy-disk-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/fly-brands.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/fly-brands.imageset/Contents.json new file mode 100644 index 0000000..1f490ef --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/fly-brands.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "fly-brands.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/fly-brands.imageset/fly-brands.png b/FeelsWidget2/Assets.xcassets/custom_icon/fly-brands.imageset/fly-brands.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fly-brands.imageset/fly-brands.png rename to FeelsWidget2/Assets.xcassets/custom_icon/fly-brands.imageset/fly-brands.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/Contents.json new file mode 100644 index 0000000..efd8ae1 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "fort-awesome-brands.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/fort-awesome-brands.png b/FeelsWidget2/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/fort-awesome-brands.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/fort-awesome-brands.png rename to FeelsWidget2/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/fort-awesome-brands.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/frown-regular.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/frown-regular.imageset/Contents.json new file mode 100644 index 0000000..c386cbb --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/frown-regular.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "frown-regular.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/frown-regular.imageset/frown-regular.png b/FeelsWidget2/Assets.xcassets/custom_icon/frown-regular.imageset/frown-regular.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/frown-regular.imageset/frown-regular.png rename to FeelsWidget2/Assets.xcassets/custom_icon/frown-regular.imageset/frown-regular.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/futbol-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/futbol-solid.imageset/Contents.json new file mode 100644 index 0000000..8e1236a --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/futbol-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "futbol-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/futbol-solid.imageset/futbol-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/futbol-solid.imageset/futbol-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/futbol-solid.imageset/futbol-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/futbol-solid.imageset/futbol-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/gem-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/gem-solid.imageset/Contents.json new file mode 100644 index 0000000..08ddd08 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/gem-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "gem-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/gem-solid.imageset/gem-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/gem-solid.imageset/gem-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/gem-solid.imageset/gem-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/gem-solid.imageset/gem-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/grin-regular.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/grin-regular.imageset/Contents.json new file mode 100644 index 0000000..6bed8a8 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/grin-regular.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "grin-regular.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/grin-regular.imageset/grin-regular.png b/FeelsWidget2/Assets.xcassets/custom_icon/grin-regular.imageset/grin-regular.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/grin-regular.imageset/grin-regular.png rename to FeelsWidget2/Assets.xcassets/custom_icon/grin-regular.imageset/grin-regular.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/heart-crack-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/heart-crack-solid.imageset/Contents.json new file mode 100644 index 0000000..aabd266 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/heart-crack-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "heart-crack-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/heart-crack-solid.imageset/heart-crack-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/heart-crack-solid.imageset/heart-crack-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/heart-crack-solid.imageset/heart-crack-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/heart-crack-solid.imageset/heart-crack-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/heart-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/heart-solid.imageset/Contents.json new file mode 100644 index 0000000..929aca8 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/heart-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "heart-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/heart-solid.imageset/heart-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/heart-solid.imageset/heart-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/heart-solid.imageset/heart-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/heart-solid.imageset/heart-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/hotjar-brands.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/hotjar-brands.imageset/Contents.json new file mode 100644 index 0000000..77a5a12 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/hotjar-brands.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "hotjar-brands.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/hotjar-brands.imageset/hotjar-brands.png b/FeelsWidget2/Assets.xcassets/custom_icon/hotjar-brands.imageset/hotjar-brands.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/hotjar-brands.imageset/hotjar-brands.png rename to FeelsWidget2/Assets.xcassets/custom_icon/hotjar-brands.imageset/hotjar-brands.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/Contents.json new file mode 100644 index 0000000..364c506 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "jet-fighter-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/jet-fighter-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/jet-fighter-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/jet-fighter-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/jet-fighter-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/lemon-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/lemon-solid.imageset/Contents.json new file mode 100644 index 0000000..9af8145 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/lemon-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "lemon-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/lemon-solid.imageset/lemon-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/lemon-solid.imageset/lemon-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/lemon-solid.imageset/lemon-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/lemon-solid.imageset/lemon-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/life-ring-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/life-ring-solid.imageset/Contents.json new file mode 100644 index 0000000..5b1162d --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/life-ring-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "life-ring-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/life-ring-solid.imageset/life-ring-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/life-ring-solid.imageset/life-ring-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/life-ring-solid.imageset/life-ring-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/life-ring-solid.imageset/life-ring-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/lightbulb-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/lightbulb-solid.imageset/Contents.json new file mode 100644 index 0000000..0844e22 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/lightbulb-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "lightbulb-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/lightbulb-solid.imageset/lightbulb-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/lightbulb-solid.imageset/lightbulb-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/lightbulb-solid.imageset/lightbulb-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/lightbulb-solid.imageset/lightbulb-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/Contents.json new file mode 100644 index 0000000..6ab250a --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "location-crosshairs-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/location-crosshairs-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/location-crosshairs-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/location-crosshairs-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/location-crosshairs-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/meh-regular.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/meh-regular.imageset/Contents.json new file mode 100644 index 0000000..c3534e4 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/meh-regular.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "meh-regular.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/meh-regular.imageset/meh-regular.png b/FeelsWidget2/Assets.xcassets/custom_icon/meh-regular.imageset/meh-regular.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/meh-regular.imageset/meh-regular.png rename to FeelsWidget2/Assets.xcassets/custom_icon/meh-regular.imageset/meh-regular.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/meteor-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/meteor-solid.imageset/Contents.json new file mode 100644 index 0000000..a70409d --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/meteor-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "meteor-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/meteor-solid.imageset/meteor-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/meteor-solid.imageset/meteor-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/meteor-solid.imageset/meteor-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/meteor-solid.imageset/meteor-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/microphone-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/microphone-solid.imageset/Contents.json new file mode 100644 index 0000000..7e7e54d --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/microphone-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "microphone-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/microphone-solid.imageset/microphone-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/microphone-solid.imageset/microphone-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/microphone-solid.imageset/microphone-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/microphone-solid.imageset/microphone-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/moon-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/moon-solid.imageset/Contents.json new file mode 100644 index 0000000..ecfeab2 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/moon-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "moon-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/moon-solid.imageset/moon-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/moon-solid.imageset/moon-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/moon-solid.imageset/moon-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/moon-solid.imageset/moon-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/peace-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/peace-solid.imageset/Contents.json new file mode 100644 index 0000000..e9ae28f --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/peace-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "peace-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/peace-solid.imageset/peace-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/peace-solid.imageset/peace-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/peace-solid.imageset/peace-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/peace-solid.imageset/peace-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/Contents.json new file mode 100644 index 0000000..2db52e9 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "pizza-slice-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/pizza-slice-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/pizza-slice-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/pizza-slice-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/pizza-slice-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/poo-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/poo-solid.imageset/Contents.json new file mode 100644 index 0000000..4d89cb7 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/poo-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "poo-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/poo-solid.imageset/poo-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/poo-solid.imageset/poo-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/poo-solid.imageset/poo-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/poo-solid.imageset/poo-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/poo-storm-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/poo-storm-solid.imageset/Contents.json new file mode 100644 index 0000000..5e4b217 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/poo-storm-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "poo-storm-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/poo-storm-solid.imageset/poo-storm-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/poo-storm-solid.imageset/poo-storm-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/poo-storm-solid.imageset/poo-storm-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/poo-storm-solid.imageset/poo-storm-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/rainbow-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/rainbow-solid.imageset/Contents.json new file mode 100644 index 0000000..8734ddf --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/rainbow-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "rainbow-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/rainbow-solid.imageset/rainbow-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/rainbow-solid.imageset/rainbow-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/rainbow-solid.imageset/rainbow-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/rainbow-solid.imageset/rainbow-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/sad-tear-regular.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/sad-tear-regular.imageset/Contents.json new file mode 100644 index 0000000..14e62e5 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/sad-tear-regular.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "sad-tear-regular.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/sad-tear-regular.imageset/sad-tear-regular.png b/FeelsWidget2/Assets.xcassets/custom_icon/sad-tear-regular.imageset/sad-tear-regular.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/sad-tear-regular.imageset/sad-tear-regular.png rename to FeelsWidget2/Assets.xcassets/custom_icon/sad-tear-regular.imageset/sad-tear-regular.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/Contents.json new file mode 100644 index 0000000..6898896 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "shuttle-space-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/shuttle-space-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/shuttle-space-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/shuttle-space-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/shuttle-space-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/Contents.json new file mode 100644 index 0000000..76ebdd1 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "skull-crossbones-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/skull-crossbones-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/skull-crossbones-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/skull-crossbones-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/skull-crossbones-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/skull-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/skull-solid.imageset/Contents.json new file mode 100644 index 0000000..1b0e2b0 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/skull-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "skull-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/skull-solid.imageset/skull-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/skull-solid.imageset/skull-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/skull-solid.imageset/skull-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/skull-solid.imageset/skull-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/smile-beam-regular.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/smile-beam-regular.imageset/Contents.json new file mode 100644 index 0000000..fc7ace3 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/smile-beam-regular.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "smile-beam-regular.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/smile-beam-regular.imageset/smile-beam-regular.png b/FeelsWidget2/Assets.xcassets/custom_icon/smile-beam-regular.imageset/smile-beam-regular.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/smile-beam-regular.imageset/smile-beam-regular.png rename to FeelsWidget2/Assets.xcassets/custom_icon/smile-beam-regular.imageset/smile-beam-regular.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/star-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/star-solid.imageset/Contents.json new file mode 100644 index 0000000..85f1d54 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/star-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "star-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/star-solid.imageset/star-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/star-solid.imageset/star-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/star-solid.imageset/star-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/star-solid.imageset/star-solid.png diff --git a/FeelsWidget2/Assets.xcassets/custom_icon/virus-covid-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/custom_icon/virus-covid-solid.imageset/Contents.json new file mode 100644 index 0000000..07735e1 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/custom_icon/virus-covid-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "virus-covid-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/virus-covid-solid.imageset/virus-covid-solid.png b/FeelsWidget2/Assets.xcassets/custom_icon/virus-covid-solid.imageset/virus-covid-solid.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/virus-covid-solid.imageset/virus-covid-solid.png rename to FeelsWidget2/Assets.xcassets/custom_icon/virus-covid-solid.imageset/virus-covid-solid.png diff --git a/Shared2/Assets.xcassets/default_image/Contents.json b/FeelsWidget2/Assets.xcassets/default_image/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/default_image/Contents.json rename to FeelsWidget2/Assets.xcassets/default_image/Contents.json diff --git a/FeelsWidget2/Assets.xcassets/default_image/average.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/default_image/average.imageset/Contents.json new file mode 100644 index 0000000..c3534e4 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/default_image/average.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "meh-regular.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/default_image/average.imageset/meh-regular.png b/FeelsWidget2/Assets.xcassets/default_image/average.imageset/meh-regular.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/average.imageset/meh-regular.png rename to FeelsWidget2/Assets.xcassets/default_image/average.imageset/meh-regular.png diff --git a/FeelsWidget2/Assets.xcassets/default_image/bad.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/default_image/bad.imageset/Contents.json new file mode 100644 index 0000000..c386cbb --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/default_image/bad.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "frown-regular.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/default_image/bad.imageset/frown-regular.png b/FeelsWidget2/Assets.xcassets/default_image/bad.imageset/frown-regular.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/bad.imageset/frown-regular.png rename to FeelsWidget2/Assets.xcassets/default_image/bad.imageset/frown-regular.png diff --git a/FeelsWidget2/Assets.xcassets/default_image/good.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/default_image/good.imageset/Contents.json new file mode 100644 index 0000000..6bed8a8 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/default_image/good.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "grin-regular.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/default_image/good.imageset/grin-regular.png b/FeelsWidget2/Assets.xcassets/default_image/good.imageset/grin-regular.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/good.imageset/grin-regular.png rename to FeelsWidget2/Assets.xcassets/default_image/good.imageset/grin-regular.png diff --git a/FeelsWidget2/Assets.xcassets/default_image/great.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/default_image/great.imageset/Contents.json new file mode 100644 index 0000000..fc7ace3 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/default_image/great.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "smile-beam-regular.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/default_image/great.imageset/smile-beam-regular.png b/FeelsWidget2/Assets.xcassets/default_image/great.imageset/smile-beam-regular.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/great.imageset/smile-beam-regular.png rename to FeelsWidget2/Assets.xcassets/default_image/great.imageset/smile-beam-regular.png diff --git a/FeelsWidget2/Assets.xcassets/default_image/horrible.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/default_image/horrible.imageset/Contents.json new file mode 100644 index 0000000..14e62e5 --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/default_image/horrible.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "sad-tear-regular.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Shared2/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular.png b/FeelsWidget2/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular.png rename to FeelsWidget2/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular.png diff --git a/FeelsWidget2/Assets.xcassets/default_image/missing.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/default_image/missing.imageset/Contents.json new file mode 100644 index 0000000..29e51cc --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/default_image/missing.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "xmark-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/FeelsWidget2/Assets.xcassets/default_image/missing.imageset/xmark-solid.png b/FeelsWidget2/Assets.xcassets/default_image/missing.imageset/xmark-solid.png new file mode 100644 index 0000000..686a37b Binary files /dev/null and b/FeelsWidget2/Assets.xcassets/default_image/missing.imageset/xmark-solid.png differ diff --git a/FeelsWidget2/Assets.xcassets/default_image/xmark-solid.imageset/Contents.json b/FeelsWidget2/Assets.xcassets/default_image/xmark-solid.imageset/Contents.json new file mode 100644 index 0000000..29e51cc --- /dev/null +++ b/FeelsWidget2/Assets.xcassets/default_image/xmark-solid.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "filename" : "xmark-solid.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/FeelsWidget2/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid.png b/FeelsWidget2/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid.png new file mode 100644 index 0000000..686a37b Binary files /dev/null and b/FeelsWidget2/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid.png differ diff --git a/FeelsWidget2/FeelsVoteWidget.swift b/FeelsWidget2/FeelsVoteWidget.swift new file mode 100644 index 0000000..e3cd6a1 --- /dev/null +++ b/FeelsWidget2/FeelsVoteWidget.swift @@ -0,0 +1,335 @@ +// +// FeelsVoteWidget.swift +// FeelsWidget +// +// Interactive widget for mood voting (iOS 17+) +// + +import WidgetKit +import SwiftUI +import AppIntents + +// MARK: - App Intent for Mood Voting + +struct VoteMoodIntent: AppIntent { + static var title: LocalizedStringResource = "Vote Mood" + static var description = IntentDescription("Record your mood for today") + + @Parameter(title: "Mood") + var moodValue: Int + + init() { + self.moodValue = 2 + } + + init(mood: Mood) { + self.moodValue = mood.rawValue + } + + func perform() async throws -> some IntentResult { + let mood = Mood(rawValue: moodValue) ?? .average + let votingDate = ShowBasedOnVoteLogics.getCurrentVotingDate(onboardingData: UserDefaultsStore.getOnboarding()) + + // Add mood entry + PersistenceController.shared.add(mood: mood, forDate: votingDate, entryType: .widget) + + // Store last voted date + let dateString = ISO8601DateFormatter().string(from: Calendar.current.startOfDay(for: votingDate)) + GroupUserDefaults.groupDefaults.set(dateString, forKey: UserDefaultsStore.Keys.lastVotedDate.rawValue) + + // Reload widget timeline + WidgetCenter.shared.reloadTimelines(ofKind: "FeelsVoteWidget") + + return .result() + } +} + +// MARK: - Vote Widget Provider + +struct VoteWidgetProvider: TimelineProvider { + func placeholder(in context: Context) -> VoteWidgetEntry { + VoteWidgetEntry(date: Date(), hasSubscription: true, hasVotedToday: false, todaysMood: nil, stats: nil) + } + + func getSnapshot(in context: Context, completion: @escaping (VoteWidgetEntry) -> Void) { + let entry = createEntry() + completion(entry) + } + + func getTimeline(in context: Context, completion: @escaping (Timeline) -> Void) { + let entry = createEntry() + + // Refresh at midnight + let midnight = Calendar.current.startOfDay(for: Calendar.current.date(byAdding: .day, value: 1, to: Date())!) + let timeline = Timeline(entries: [entry], policy: .after(midnight)) + completion(timeline) + } + + private func createEntry() -> VoteWidgetEntry { + let hasSubscription = GroupUserDefaults.groupDefaults.bool(forKey: UserDefaultsStore.Keys.hasActiveSubscription.rawValue) + + let votingDate = ShowBasedOnVoteLogics.getCurrentVotingDate(onboardingData: UserDefaultsStore.getOnboarding()) + let dayStart = Calendar.current.startOfDay(for: votingDate) + let dayEnd = Calendar.current.date(bySettingHour: 23, minute: 59, second: 59, of: dayStart)! + + // Check if user has voted today + let todayEntry = PersistenceController.shared.getData(startDate: dayStart, endDate: dayEnd, includedDays: []).first + let hasVotedToday = todayEntry != nil && todayEntry?.mood != Mood.missing && todayEntry?.mood != Mood.placeholder + + // Get today's mood if voted + let todaysMood: Mood? = hasVotedToday ? todayEntry?.mood : nil + + // Get stats for display after voting + var stats: MoodStats? = nil + if hasVotedToday { + let allEntries = PersistenceController.shared.getData( + startDate: Date(timeIntervalSince1970: 0), + endDate: Date(), + includedDays: [] + ) + let validEntries = allEntries.filter { $0.mood != Mood.missing && $0.mood != Mood.placeholder } + let totalCount = validEntries.count + + if totalCount > 0 { + var moodCounts: [Mood: Int] = [:] + for entry in validEntries { + moodCounts[entry.mood, default: 0] += 1 + } + stats = MoodStats(totalEntries: totalCount, moodCounts: moodCounts) + } + } + + return VoteWidgetEntry( + date: Date(), + hasSubscription: hasSubscription, + hasVotedToday: hasVotedToday, + todaysMood: todaysMood, + stats: stats + ) + } +} + +// MARK: - Stats Model + +struct MoodStats { + let totalEntries: Int + let moodCounts: [Mood: Int] + + func percentage(for mood: Mood) -> Double { + guard totalEntries > 0 else { return 0 } + return Double(moodCounts[mood, default: 0]) / Double(totalEntries) * 100 + } +} + +// MARK: - Timeline Entry + +struct VoteWidgetEntry: TimelineEntry { + let date: Date + let hasSubscription: Bool + let hasVotedToday: Bool + let todaysMood: Mood? + let stats: MoodStats? +} + +// MARK: - Widget Views + +struct FeelsVoteWidgetEntryView: View { + @Environment(\.widgetFamily) var family + var entry: VoteWidgetProvider.Entry + + var body: some View { + Group { + if entry.hasSubscription { + if entry.hasVotedToday { + // Show stats after voting + VotedStatsView(entry: entry) + } else { + // Show voting buttons + VotingView(family: family) + } + } else { + // Non-subscriber view - tap to open app + NonSubscriberView() + } + } + .containerBackground(.fill.tertiary, for: .widget) + } +} + +// MARK: - Voting View (for subscribers who haven't voted) + +struct VotingView: View { + let family: WidgetFamily + let moods: [Mood] = [.horrible, .bad, .average, .good, .great] + + var body: some View { + VStack(spacing: 8) { + Text("How are you feeling?") + .font(.headline) + .foregroundStyle(.primary) + + if family == .systemSmall { + // Compact layout for small widget + LazyVGrid(columns: [GridItem(.flexible()), GridItem(.flexible()), GridItem(.flexible())], spacing: 8) { + ForEach(moods, id: \.rawValue) { mood in + MoodButton(mood: mood, isCompact: true) + } + } + } else { + // Horizontal layout for medium/large + HStack(spacing: 12) { + ForEach(moods, id: \.rawValue) { mood in + MoodButton(mood: mood, isCompact: false) + } + } + } + } + .padding() + } +} + +struct MoodButton: View { + let mood: Mood + let isCompact: Bool + + private var moodTint: MoodTintable.Type { + UserDefaultsStore.moodTintable() + } + + private var moodImages: MoodImagable.Type { + UserDefaultsStore.moodMoodImagable() + } + + var body: some View { + Button(intent: VoteMoodIntent(mood: mood)) { + VStack(spacing: 4) { + moodImages.icon(forMood: mood) + .resizable() + .aspectRatio(contentMode: .fit) + .frame(width: isCompact ? 28 : 36, height: isCompact ? 28 : 36) + .foregroundColor(moodTint.color(forMood: mood)) + + if !isCompact { + Text(mood.strValue) + .font(.caption2) + .foregroundStyle(.secondary) + } + } + } + .buttonStyle(.plain) + } +} + +// MARK: - Voted Stats View (shown after voting) + +struct VotedStatsView: View { + let entry: VoteWidgetEntry + + private var moodTint: MoodTintable.Type { + UserDefaultsStore.moodTintable() + } + + private var moodImages: MoodImagable.Type { + UserDefaultsStore.moodMoodImagable() + } + + var body: some View { + VStack(spacing: 12) { + // Today's mood + if let mood = entry.todaysMood { + HStack(spacing: 8) { + moodImages.icon(forMood: mood) + .resizable() + .aspectRatio(contentMode: .fit) + .frame(width: 32, height: 32) + .foregroundColor(moodTint.color(forMood: mood)) + + VStack(alignment: .leading, spacing: 2) { + Text("Today") + .font(.caption) + .foregroundStyle(.secondary) + Text(mood.strValue) + .font(.headline) + .foregroundColor(moodTint.color(forMood: mood)) + } + + Spacer() + } + } + + // Stats + if let stats = entry.stats { + Divider() + + VStack(spacing: 4) { + Text("\(stats.totalEntries) entries") + .font(.caption) + .foregroundStyle(.secondary) + + HStack(spacing: 4) { + ForEach([Mood.great, .good, .average, .bad, .horrible], id: \.rawValue) { mood in + let percentage = stats.percentage(for: mood) + if percentage > 0 { + RoundedRectangle(cornerRadius: 2) + .fill(moodTint.color(forMood: mood)) + .frame(width: max(4, CGFloat(percentage) * 0.8)) + } + } + } + .frame(height: 8) + } + } + } + .padding() + } +} + +// MARK: - Non-Subscriber View + +struct NonSubscriberView: View { + var body: some View { + Link(destination: URL(string: "feels://subscribe")!) { + VStack(spacing: 8) { + Image(systemName: "heart.fill") + .font(.largeTitle) + .foregroundStyle(.pink) + + Text("Track Your Mood") + .font(.headline) + .foregroundStyle(.primary) + + Text("Tap to subscribe") + .font(.caption) + .foregroundStyle(.secondary) + .multilineTextAlignment(.center) + } + .padding() + .frame(maxWidth: .infinity, maxHeight: .infinity) + } + } +} + +// MARK: - Widget Configuration + +struct FeelsVoteWidget: Widget { + let kind: String = "FeelsVoteWidget" + + var body: some WidgetConfiguration { + StaticConfiguration(kind: kind, provider: VoteWidgetProvider()) { entry in + FeelsVoteWidgetEntryView(entry: entry) + } + .configurationDisplayName("Mood Vote") + .description("Quickly rate your mood for today") + .supportedFamilies([.systemSmall, .systemMedium]) + } +} + +// MARK: - Preview + +#Preview(as: .systemSmall) { + FeelsVoteWidget() +} timeline: { + VoteWidgetEntry(date: Date(), hasSubscription: true, hasVotedToday: false, todaysMood: nil, stats: nil) + VoteWidgetEntry(date: Date(), hasSubscription: true, hasVotedToday: true, todaysMood: .great, stats: MoodStats(totalEntries: 30, moodCounts: [.great: 10, .good: 12, .average: 5, .bad: 2, .horrible: 1])) + VoteWidgetEntry(date: Date(), hasSubscription: false, hasVotedToday: false, todaysMood: nil, stats: nil) +} diff --git a/FeelsWidget2/FeelsWidget.intentdefinition b/FeelsWidget2/FeelsWidget.intentdefinition new file mode 100644 index 0000000..bdb4045 --- /dev/null +++ b/FeelsWidget2/FeelsWidget.intentdefinition @@ -0,0 +1,59 @@ + + + + + INEnums + + INIntentDefinitionModelVersion + 1.2 + INIntentDefinitionNamespace + 88xZPY + INIntentDefinitionSystemVersion + 20A294 + INIntentDefinitionToolsBuildVersion + 12A6144 + INIntentDefinitionToolsVersion + 12.0 + INIntents + + + INIntentCategory + information + INIntentDescriptionID + tVvJ9c + INIntentEligibleForWidgets + + INIntentIneligibleForSuggestions + + INIntentName + Configuration + INIntentResponse + + INIntentResponseCodes + + + INIntentResponseCodeName + success + INIntentResponseCodeSuccess + + + + INIntentResponseCodeName + failure + + + + INIntentTitle + Configuration + INIntentTitleID + gpCwrM + INIntentType + Custom + INIntentVerb + View + + + INTypes + + + diff --git a/FeelsWidget2/FeelsWidget.swift b/FeelsWidget2/FeelsWidget.swift new file mode 100644 index 0000000..af4365b --- /dev/null +++ b/FeelsWidget2/FeelsWidget.swift @@ -0,0 +1,460 @@ +// +// FeelsWidget.swift +// FeelsWidget +// +// Created by Trey Tartt on 1/7/22. +// + +import WidgetKit +import SwiftUI +import Intents +import CoreData + +class WatchTimelineView: Identifiable { + let id = UUID() + let image: Image + let graphic: Image + let date: Date + let color: Color + let secondaryColor: Color + + init(image: Image, graphic: Image, date: Date, color: Color, secondaryColor: Color) { + self.image = image + self.date = date + self.color = color + self.graphic = graphic + self.secondaryColor = secondaryColor + } +} + +struct TimeLineCreator { + static func createViews(daysBack: Int) -> [WatchTimelineView] { + var timeLineView = [WatchTimelineView]() + + let latestDayToShow = ShowBasedOnVoteLogics.getCurrentVotingDate(onboardingData: UserDefaultsStore.getOnboarding()) + let dates = Array(0...daysBack).map({ + Calendar.current.date(byAdding: .day, value: -$0, to: latestDayToShow)! + }) + + for date in dates { + let dayStart = Calendar.current.startOfDay(for: date) + let dayEnd = Calendar.current.date(bySettingHour: 23, minute: 59, second: 59, of: dayStart)! + let moodTint: MoodTintable.Type = UserDefaultsStore.moodTintable() + let moodImages: MoodImagable.Type = UserDefaultsStore.moodMoodImagable() + + if let todayEntry = PersistenceController.shared.getData(startDate: dayStart, endDate: dayEnd, includedDays: []).first { + timeLineView.append(WatchTimelineView(image: moodImages.icon(forMood: todayEntry.mood), + graphic: moodImages.icon(forMood: todayEntry.mood), + date: dayStart, + color: moodTint.color(forMood: todayEntry.mood), + secondaryColor: moodTint.secondary(forMood: todayEntry.mood))) + } else { + timeLineView.append(WatchTimelineView(image: moodImages.icon(forMood: .missing), + graphic: moodImages.icon(forMood: .missing), + date: Date(), + color: moodTint.color(forMood: .missing), + secondaryColor: moodTint.secondary(forMood: .missing))) + } + } + + timeLineView = timeLineView.sorted(by: { $0.date > $1.date }) + return timeLineView + } +} + +struct Provider: IntentTimelineProvider { + let timeLineCreator = TimeLineCreator() + + /* + placeholder for widget, no data + gets redacted auto + */ + func placeholder(in context: Context) -> SimpleEntry { + return SimpleEntry(date: Date(), + configuration: ConfigurationIntent(), + timeLineViews: Array(TimeLineCreator.createViews(daysBack: 11).prefix(10))) + } + + func getSnapshot(for configuration: ConfigurationIntent, in context: Context, completion: @escaping (SimpleEntry) -> ()) { + let entry = SimpleEntry(date: Date(), + configuration: ConfigurationIntent(), + timeLineViews: Array(TimeLineCreator.createViews(daysBack: 11).prefix(10))) + completion(entry) + } + + func getTimeline(for configuration: ConfigurationIntent, in context: Context, completion: @escaping (Timeline) -> ()) { + let entry = SimpleEntry(date: Calendar.current.date(byAdding: .second, value: 15, to: Date())!, + configuration: ConfigurationIntent(), + timeLineViews: nil) + + let midNightEntry = SimpleEntry(date: Calendar.current.date(bySettingHour: 23, minute: 59, second: 59, of: Date())!, + configuration: ConfigurationIntent(), + timeLineViews: nil) + + let date = Calendar.current.date(byAdding: .second, value: 10, to: Date())! + let timeline = Timeline(entries: [entry, midNightEntry], policy: .after(date)) + completion(timeline) + } +} + +struct SimpleEntry: TimelineEntry { + let date: Date + let configuration: ConfigurationIntent + let timeLineViews: [WatchTimelineView]? + let showStats: Bool + + init(date: Date, configuration: ConfigurationIntent, timeLineViews: [WatchTimelineView]?, showStats: Bool = false) { + self.date = date + self.configuration = configuration + self.timeLineViews = timeLineViews + self.showStats = showStats + } +} + +/**********************************************************/ +struct FeelsWidgetEntryView : View { + @Environment(\.sizeCategory) var sizeCategory + @Environment(\.widgetFamily) var family + + var entry: Provider.Entry + + @ViewBuilder + var body: some View { + ZStack { + Color(UIColor.systemBackground) + switch family { + case .systemSmall: + SmallWidgetView(entry: entry) + case .systemMedium: + MediumWidgetView(entry: entry) + case .systemLarge: + LargeWidgetView(entry: entry) + case .systemExtraLarge: + LargeWidgetView(entry: entry) + @unknown default: + fatalError() + } + }.onReceive(NotificationCenter.default.publisher(for: .NSPersistentStoreRemoteChange)) { _ in + // make sure you don't call this too often + WidgetCenter.shared.reloadAllTimelines() + } + } +} + +struct SmallWidgetView: View { + var entry: Provider.Entry + var timeLineView = [WatchTimelineView]() + + init(entry: Provider.Entry) { + self.entry = entry + timeLineView = [TimeLineCreator.createViews(daysBack: 2).first!] + } + + var body: some View { + ZStack { + Color(UIColor.secondarySystemBackground) + HStack { + ForEach(self.timeLineView) { watchView in + EntryCard(timeLineView: watchView) + } + } + .padding() + } + .clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) + .frame(minHeight: 0, maxHeight: 55) + .padding() + } +} + +struct MediumWidgetView: View { + var entry: Provider.Entry + var timeLineView = [WatchTimelineView]() + + init(entry: Provider.Entry) { + self.entry = entry + timeLineView = Array(TimeLineCreator.createViews(daysBack: 6).prefix(5)) + } + + var body: some View { + VStack { + Spacer() + + TimeHeaderView(startDate: timeLineView.first!.date, endDate: timeLineView.last!.date) + .frame(minWidth: 0, maxWidth: .infinity) + .multilineTextAlignment(.leading) + + TimeBodyView(group: timeLineView) + .clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) + .frame(minHeight: 0, maxHeight: 55) + .padding() + + Spacer() + } + } +} + +struct LargeWidgetView: View { + var entry: Provider.Entry + var timeLineView = [WatchTimelineView]() + + init(entry: Provider.Entry) { + self.entry = entry + timeLineView = Array(TimeLineCreator.createViews(daysBack: 11).prefix(10)) + } + + var firstGroup: ([WatchTimelineView], String) { + return (Array(self.timeLineView.prefix(5)), UUID().uuidString) + } + + var secondGroup: ([WatchTimelineView], String) { + return (Array(self.timeLineView.suffix(5)), UUID().uuidString) + } + + var body: some View { + VStack { + Spacer() + + ForEach([firstGroup, secondGroup], id: \.1) { group in + VStack { + Spacer() + + TimeHeaderView(startDate: group.0.first!.date, endDate: group.0.last!.date) + .frame(minWidth: 0, maxWidth: .infinity) + .multilineTextAlignment(.leading) + + TimeBodyView(group: group.0) + .clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) + .frame(minHeight: 0, maxHeight: 55) + .padding() + + Spacer() + } + } + + Spacer() + } + } +} +/**********************************************************/ +struct FeelsGraphicWidgetEntryView : View { + @Environment(\.sizeCategory) var sizeCategory + @Environment(\.widgetFamily) var family + + var entry: Provider.Entry + + @ViewBuilder + var body: some View { + SmallGraphicWidgetView(entry: entry) + .onReceive(NotificationCenter.default.publisher(for: .NSPersistentStoreRemoteChange)) { _ in + // make sure you don't call this too often + WidgetCenter.shared.reloadAllTimelines() + } + } +} + +struct SmallGraphicWidgetView: View { + var entry: Provider.Entry + var timeLineView: [WatchTimelineView] + + init(entry: Provider.Entry) { + self.entry = entry + timeLineView = TimeLineCreator.createViews(daysBack: 2) + } + + var body: some View { + if let first = timeLineView.first { + IconView(iconViewModel: IconViewModel(backgroundImage: first.graphic, + bgColor: first.color, + bgOverlayColor: first.secondaryColor, + centerImage: first.graphic, + innerColor: first.color)) + } else { + IconView(iconViewModel: IconViewModel.great) + } + } +} +/**********************************************************/ +struct FeelsIconWidgetEntryView : View { + @Environment(\.sizeCategory) var sizeCategory + @Environment(\.widgetFamily) var family + + var entry: Provider.Entry + + @ViewBuilder + var body: some View { + SmallIconView(entry: entry) + } +} + +struct SmallIconView: View { + var entry: Provider.Entry + + var body: some View { + GeometryReader { geo in + if let inUseWidget = UserDefaultsStore.getCustomWidgets().first(where: { + $0.inUse == true + }) { + CustomWidgetView(customWidgetModel: inUseWidget) + .frame(width: geo.size.width, height: geo.size.height) + } else { + CustomWidgetView(customWidgetModel: CustomWidgetModel.randomWidget) + .frame(width: geo.size.width, height: geo.size.height) + } + } + } +} +/**********************************************************/ +struct TimeHeaderView: View { + let startDate: Date + let endDate: Date + + var formatter: DateFormatter { + let dateFormatter = DateFormatter() + dateFormatter.dateStyle = .medium + return dateFormatter + } + + var body: some View { + HStack { + Text(startDate, formatter: formatter) + .font(.system(.footnote)) + Text(" - ") + .font(.system(.footnote)) + Text(endDate, formatter: formatter) + .font(.system(.footnote)) + } + } +} + +struct TimeBodyView: View { + let group: [WatchTimelineView] + + var body: some View { + ZStack { + Color(UIColor.secondarySystemBackground) + HStack { + ForEach(group) { watchView in + EntryCard(timeLineView: watchView) + } + } + .padding() + } + } +} + +struct EntryCard: View { + var timeLineView: WatchTimelineView + + var body: some View { + timeLineView.image + .resizable() + .aspectRatio(contentMode: .fit) + .frame(width: 50, height: 50, alignment: .center) + .foregroundColor(timeLineView.color) + } +} + +@main +struct FeelsBundle: WidgetBundle { + var body: some Widget { + FeelsWidget() + FeelsGraphicWidget() + FeelsIconWidget() + FeelsVoteWidget() + } +} + +struct FeelsWidget: Widget { + let kind: String = "FeelsWidget" + + var body: some WidgetConfiguration { + IntentConfiguration(kind: kind, + intent: ConfigurationIntent.self, + provider: Provider()) { entry in + FeelsWidgetEntryView(entry: entry) + } + .configurationDisplayName("Feels") + .description("") + .supportedFamilies([.systemSmall, .systemMedium, .systemLarge]) + } +} + +struct FeelsIconWidget: Widget { + let kind: String = "FeelsIconWidget" + + var body: some WidgetConfiguration { + IntentConfiguration(kind: kind, + intent: ConfigurationIntent.self, + provider: Provider()) { entry in + FeelsIconWidgetEntryView(entry: entry) + } + .configurationDisplayName("Feels Icon") + .description("") + .supportedFamilies([.systemSmall]) + } +} + +struct FeelsGraphicWidget: Widget { + let kind: String = "FeelsGraphicWidget" + + var body: some WidgetConfiguration { + IntentConfiguration(kind: kind, + intent: ConfigurationIntent.self, + provider: Provider()) { entry in + FeelsGraphicWidgetEntryView(entry: entry) + } + .configurationDisplayName("Mood Graphic") + .description("") + .supportedFamilies([.systemSmall]) + } +} + +struct FeelsWidget_Previews: PreviewProvider { + static var previews: some View { + Group { + FeelsGraphicWidgetEntryView(entry: SimpleEntry(date: Date(), + configuration: ConfigurationIntent(), + timeLineViews: [WatchTimelineView(image: HandEmojiMoodImages.icon(forMood: .great), + graphic: HandEmojiMoodImages.icon(forMood: .great), + date: Date(), + color: MoodTints.Neon.color(forMood: .great), + + secondaryColor: .white), + WatchTimelineView(image: HandEmojiMoodImages.icon(forMood: .great), + graphic: HandEmojiMoodImages.icon(forMood: .great), + date: Date(), + color: MoodTints.Neon.color(forMood: .great), + + secondaryColor: .white)])) + .previewContext(WidgetPreviewContext(family: .systemSmall)) + + FeelsGraphicWidgetEntryView(entry: SimpleEntry(date: Date(), + configuration: ConfigurationIntent(), + timeLineViews: [WatchTimelineView(image: HandEmojiMoodImages.icon(forMood: .horrible), + graphic: HandEmojiMoodImages.icon(forMood: .horrible), + date: Date(), + color: MoodTints.Neon.color(forMood: .horrible), + + secondaryColor: .white), + WatchTimelineView(image: HandEmojiMoodImages.icon(forMood: .horrible), + graphic: HandEmojiMoodImages.icon(forMood: .horrible), + date: Date(), + color: MoodTints.Neon.color(forMood: .horrible), + + secondaryColor: .white)])) + .previewContext(WidgetPreviewContext(family: .systemSmall)) + + // FeelsWidgetEntryView(entry: SimpleEntry(date: Date(), + // configuration: ConfigurationIntent(), + // timeLineViews: FeelsWidget_Previews.data)) + // .previewContext(WidgetPreviewContext(family: .systemMedium)) + // .environment(\.sizeCategory, .medium) + // + // FeelsWidgetEntryView(entry: SimpleEntry(date: Date(), + // configuration: ConfigurationIntent(), + // timeLineViews: FeelsWidget_Previews.data)) + // .previewContext(WidgetPreviewContext(family: .systemLarge)) + // .environment(\.sizeCategory, .large) + } + } +} diff --git a/FeelsWidgetExtension-Info.plist b/FeelsWidgetExtension-Info.plist new file mode 100644 index 0000000..0f118fb --- /dev/null +++ b/FeelsWidgetExtension-Info.plist @@ -0,0 +1,11 @@ + + + + + NSExtension + + NSExtensionPointIdentifier + com.apple.widgetkit-extension + + + diff --git a/Shared/AppDelegate.swift b/Shared/AppDelegate.swift new file mode 100644 index 0000000..9660dba --- /dev/null +++ b/Shared/AppDelegate.swift @@ -0,0 +1,80 @@ +// +// AppDelegate.swift +// Feels (iOS) +// +// Created by Trey Tartt on 1/10/22. +// + +import Foundation +import UserNotifications +import UIKit +import WidgetKit +import SwiftUI +// import Firebase // Firebase removed + +class AppDelegate: NSObject, UIApplicationDelegate { + private let savedOnboardingData = UserDefaultsStore.getOnboarding() + @AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor + + func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { + // PersistenceController.shared.clearDB() + // PersistenceController.shared.deleteLast(numberOfEntries: 5) +// PersistenceController.shared.deleteRandomFromLast(numberOfEntries: 10) + // GroupUserDefaults.groupDefaults.set(false, forKey: UserDefaultsStore.Keys.showNSFW.rawValue) + + // FirebaseApp.configure() // Firebase removed + PersistenceController.shared.removeNoForDates() + PersistenceController.shared.fillInMissingDates() + UNUserNotificationCenter.current().delegate = self + + UIPageControl.appearance().currentPageIndicatorTintColor = UIColor(textColor) + UIPageControl.appearance().pageIndicatorTintColor = UIColor.systemGray + + let appearance = UITabBarAppearance() + appearance.configureWithOpaqueBackground() + UITabBar.appearance().standardAppearance = appearance + UITabBar.appearance().scrollEdgeAppearance = appearance + + EventLogger.log(event: "app_launced") + + return true + } + + func applicationWillEnterForeground(_ application: UIApplication) { + PersistenceController.shared.fillInMissingDates() + + // reschedule notifications so there's a new title next notification + LocalNotification.rescheduleNotifiations() + + EventLogger.log(event: "app_foregorund") + } +} + +extension AppDelegate: UNUserNotificationCenterDelegate { + func requestAuthorization() { } + + func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) { + completionHandler([.badge, .banner, .sound]) + } + + func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) { + if let action = LocalNotification.ActionType(rawValue: response.actionIdentifier) { + let date = ShowBasedOnVoteLogics.getCurrentVotingDate(onboardingData: savedOnboardingData) + switch action { + case .horrible: + PersistenceController.shared.add(mood: .horrible, forDate: date, entryType: .notification) + case .bad: + PersistenceController.shared.add(mood: .bad, forDate: date, entryType: .notification) + case .average: + PersistenceController.shared.add(mood: .average, forDate: date, entryType: .notification) + case .good: + PersistenceController.shared.add(mood: .good, forDate: date, entryType: .notification) + case .great: + PersistenceController.shared.add(mood: .great, forDate: date, entryType: .notification) + } + UIApplication.shared.applicationIconBadgeNumber = 0 + } + WidgetCenter.shared.reloadAllTimelines() + completionHandler() + } +} diff --git a/Shared/Assets.xcassets/AccentColor.colorset/Contents.json b/Shared/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 0000000..eb87897 --- /dev/null +++ b/Shared/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/AppIcon.png b/Shared/Assets.xcassets/AppIcon.appiconset/AppIcon.png new file mode 100644 index 0000000..f564135 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/AppIcon.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json b/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..2e47aab --- /dev/null +++ b/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIcon.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..8ee6763 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..1547543 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..c851ea3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..51264c7 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..5dc216f Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..13383ed Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..8d45431 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..af39cde Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..8da949a Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..e848d7f Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..9cfec82 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..597460c Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..0b679b1 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..1547543 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..4db0e84 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..99632b6 Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..597460c Binary files /dev/null and b/Shared/Assets.xcassets/AppIcon.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/AppIconAverage.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/AppIconAverage.png new file mode 100644 index 0000000..3481e6d Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/AppIconAverage.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconAverage.appiconset/Contents.json new file mode 100644 index 0000000..edebf0c --- /dev/null +++ b/Shared/Assets.xcassets/AppIconAverage.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconAverage.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..217dfb0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..a8491d0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..723bba3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..87067da Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..c73d6fc Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..a8491d0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..b680cb3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..309c839 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..7d3e769 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..b0324e3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..b6cf2eb Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..75caba2 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..1ddfe22 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..9a043c4 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..a8b61f1 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..4972e79 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..75caba2 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverage.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconAverageImage.imageset/AppIconAverage.png b/Shared/Assets.xcassets/AppIconAverageImage.imageset/AppIconAverage.png new file mode 100644 index 0000000..3481e6d Binary files /dev/null and b/Shared/Assets.xcassets/AppIconAverageImage.imageset/AppIconAverage.png differ diff --git a/Shared/Assets.xcassets/AppIconAverageImage.imageset/Contents.json b/Shared/Assets.xcassets/AppIconAverageImage.imageset/Contents.json new file mode 100644 index 0000000..5afa85a --- /dev/null +++ b/Shared/Assets.xcassets/AppIconAverageImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppIconAverage.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/AppIconBad.png b/Shared/Assets.xcassets/AppIconBad.appiconset/AppIconBad.png new file mode 100644 index 0000000..049fe6b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/AppIconBad.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconBad.appiconset/Contents.json new file mode 100644 index 0000000..26f651f --- /dev/null +++ b/Shared/Assets.xcassets/AppIconBad.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconBad.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..4f6f49b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..02fd6e5 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..8778a21 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..28dc298 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..be5e33c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..02fd6e5 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..cc068c7 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..a587a2b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..4a3de99 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..be5e33c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..ad82a8c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..52560c0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..56ac067 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..02fd6e5 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..0c2c0db Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..cc068c7 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..52560c0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBad.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBadImage.imageset/AppIconBad.png b/Shared/Assets.xcassets/AppIconBadImage.imageset/AppIconBad.png new file mode 100644 index 0000000..049fe6b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBadImage.imageset/AppIconBad.png differ diff --git a/Shared/Assets.xcassets/AppIconBadImage.imageset/Contents.json b/Shared/Assets.xcassets/AppIconBadImage.imageset/Contents.json new file mode 100644 index 0000000..6bfb89a --- /dev/null +++ b/Shared/Assets.xcassets/AppIconBadImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppIconBad.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/AppIconBlueGreen.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/AppIconBlueGreen.png new file mode 100644 index 0000000..14385af Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/AppIconBlueGreen.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/Contents.json new file mode 100644 index 0000000..10f1dc1 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconBlueGreen.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..b29317c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..511301e Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..44cdbab Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..96f0844 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..d2aaa56 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..511301e Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..6e4f441 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..1be1cb0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..f82c843 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..2d9dba6 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..a04aa43 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..e50aea7 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..a327403 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..63503bc Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..9cfea9b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..904ed36 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..a8da8ba Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreen.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreenImage.imageset/AppIconBlueGreen.png b/Shared/Assets.xcassets/AppIconBlueGreenImage.imageset/AppIconBlueGreen.png new file mode 100644 index 0000000..14385af Binary files /dev/null and b/Shared/Assets.xcassets/AppIconBlueGreenImage.imageset/AppIconBlueGreen.png differ diff --git a/Shared/Assets.xcassets/AppIconBlueGreenImage.imageset/Contents.json b/Shared/Assets.xcassets/AppIconBlueGreenImage.imageset/Contents.json new file mode 100644 index 0000000..bafde75 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconBlueGreenImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppIconBlueGreen.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/AppIconCustom1.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/AppIconCustom1.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/AppIconCustom1.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/AppIconCustom1.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom1.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom1.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/AppIconCustom10.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/AppIconCustom10.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/AppIconCustom10.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/AppIconCustom10.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom10.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom10.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10Image.imageset/AppIconCustom10.png b/Shared/Assets.xcassets/AppIconCustom10Image.imageset/AppIconCustom10.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10Image.imageset/AppIconCustom10.png rename to Shared/Assets.xcassets/AppIconCustom10Image.imageset/AppIconCustom10.png diff --git a/Shared2/Assets.xcassets/AppIconCustom10Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom10Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom10Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom10Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/AppIconCustom11.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/AppIconCustom11.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/AppIconCustom11.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/AppIconCustom11.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom11.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom11.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11Image.imageset/AppIconCustom11.png b/Shared/Assets.xcassets/AppIconCustom11Image.imageset/AppIconCustom11.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11Image.imageset/AppIconCustom11.png rename to Shared/Assets.xcassets/AppIconCustom11Image.imageset/AppIconCustom11.png diff --git a/Shared2/Assets.xcassets/AppIconCustom11Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom11Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom11Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom11Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/AppIconCustom12.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/AppIconCustom12.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/AppIconCustom12.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/AppIconCustom12.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom12.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom12.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12Image.imageset/AppIconCustom12.png b/Shared/Assets.xcassets/AppIconCustom12Image.imageset/AppIconCustom12.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12Image.imageset/AppIconCustom12.png rename to Shared/Assets.xcassets/AppIconCustom12Image.imageset/AppIconCustom12.png diff --git a/Shared2/Assets.xcassets/AppIconCustom12Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom12Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom12Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom12Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/AppIconCustom13.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/AppIconCustom13.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/AppIconCustom13.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/AppIconCustom13.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom13.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom13.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13Image.imageset/AppIconCustom13.png b/Shared/Assets.xcassets/AppIconCustom13Image.imageset/AppIconCustom13.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13Image.imageset/AppIconCustom13.png rename to Shared/Assets.xcassets/AppIconCustom13Image.imageset/AppIconCustom13.png diff --git a/Shared2/Assets.xcassets/AppIconCustom13Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom13Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom13Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom13Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/AppIconCustom14.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/AppIconCustom14.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/AppIconCustom14.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/AppIconCustom14.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom14.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom14.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14Image.imageset/AppIconCustom14.png b/Shared/Assets.xcassets/AppIconCustom14Image.imageset/AppIconCustom14.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14Image.imageset/AppIconCustom14.png rename to Shared/Assets.xcassets/AppIconCustom14Image.imageset/AppIconCustom14.png diff --git a/Shared2/Assets.xcassets/AppIconCustom14Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom14Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom14Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom14Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/AppIconCustom15.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/AppIconCustom15.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/AppIconCustom15.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/AppIconCustom15.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom15.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom15.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15Image.imageset/AppIconCustom15.png b/Shared/Assets.xcassets/AppIconCustom15Image.imageset/AppIconCustom15.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15Image.imageset/AppIconCustom15.png rename to Shared/Assets.xcassets/AppIconCustom15Image.imageset/AppIconCustom15.png diff --git a/Shared2/Assets.xcassets/AppIconCustom15Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom15Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom15Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom15Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/AppIconCustom16.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/AppIconCustom16.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/AppIconCustom16.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/AppIconCustom16.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom16.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom16.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16Image.imageset/AppIconCustom16.png b/Shared/Assets.xcassets/AppIconCustom16Image.imageset/AppIconCustom16.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16Image.imageset/AppIconCustom16.png rename to Shared/Assets.xcassets/AppIconCustom16Image.imageset/AppIconCustom16.png diff --git a/Shared2/Assets.xcassets/AppIconCustom16Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom16Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom16Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom16Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/AppIconCustom17.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/AppIconCustom17.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/AppIconCustom17.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/AppIconCustom17.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom17.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom17.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17Image.imageset/AppIconCustom17.png b/Shared/Assets.xcassets/AppIconCustom17Image.imageset/AppIconCustom17.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17Image.imageset/AppIconCustom17.png rename to Shared/Assets.xcassets/AppIconCustom17Image.imageset/AppIconCustom17.png diff --git a/Shared2/Assets.xcassets/AppIconCustom17Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom17Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom17Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom17Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/AppIconCustom18.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/AppIconCustom18.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/AppIconCustom18.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/AppIconCustom18.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom18.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom18.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18Image.imageset/AppIconCustom18.png b/Shared/Assets.xcassets/AppIconCustom18Image.imageset/AppIconCustom18.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18Image.imageset/AppIconCustom18.png rename to Shared/Assets.xcassets/AppIconCustom18Image.imageset/AppIconCustom18.png diff --git a/Shared2/Assets.xcassets/AppIconCustom18Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom18Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom18Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom18Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/AppIconCustom19.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/AppIconCustom19.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/AppIconCustom19.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/AppIconCustom19.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom19.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom19.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19Image.imageset/AppIconCustom19.png b/Shared/Assets.xcassets/AppIconCustom19Image.imageset/AppIconCustom19.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19Image.imageset/AppIconCustom19.png rename to Shared/Assets.xcassets/AppIconCustom19Image.imageset/AppIconCustom19.png diff --git a/Shared2/Assets.xcassets/AppIconCustom19Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom19Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom19Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom19Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom1Image.imageset/AppIconCustom1.png b/Shared/Assets.xcassets/AppIconCustom1Image.imageset/AppIconCustom1.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1Image.imageset/AppIconCustom1.png rename to Shared/Assets.xcassets/AppIconCustom1Image.imageset/AppIconCustom1.png diff --git a/Shared2/Assets.xcassets/AppIconCustom1Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom1Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom1Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom1Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/AppIconCustom2.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/AppIconCustom2.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/AppIconCustom2.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/AppIconCustom2.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom2.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom2.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/AppIconCustom20.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/AppIconCustom20.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/AppIconCustom20.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/AppIconCustom20.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom20.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom20.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20Image.imageset/AppIconCustom20.png b/Shared/Assets.xcassets/AppIconCustom20Image.imageset/AppIconCustom20.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20Image.imageset/AppIconCustom20.png rename to Shared/Assets.xcassets/AppIconCustom20Image.imageset/AppIconCustom20.png diff --git a/Shared2/Assets.xcassets/AppIconCustom20Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom20Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom20Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom20Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/AppIconCustom21.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/AppIconCustom21.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/AppIconCustom21.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/AppIconCustom21.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom21.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom21.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21Image.imageset/AppIconCustom21.png b/Shared/Assets.xcassets/AppIconCustom21Image.imageset/AppIconCustom21.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21Image.imageset/AppIconCustom21.png rename to Shared/Assets.xcassets/AppIconCustom21Image.imageset/AppIconCustom21.png diff --git a/Shared2/Assets.xcassets/AppIconCustom21Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom21Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom21Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom21Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/AppIconCustom22.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/AppIconCustom22.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/AppIconCustom22.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/AppIconCustom22.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom22.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom22.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22Image.imageset/AppIconCustom22.png b/Shared/Assets.xcassets/AppIconCustom22Image.imageset/AppIconCustom22.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22Image.imageset/AppIconCustom22.png rename to Shared/Assets.xcassets/AppIconCustom22Image.imageset/AppIconCustom22.png diff --git a/Shared2/Assets.xcassets/AppIconCustom22Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom22Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom22Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom22Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/AppIconCustom23.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/AppIconCustom23.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/AppIconCustom23.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/AppIconCustom23.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom23.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom23.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23Image.imageset/AppIconCustom23.png b/Shared/Assets.xcassets/AppIconCustom23Image.imageset/AppIconCustom23.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23Image.imageset/AppIconCustom23.png rename to Shared/Assets.xcassets/AppIconCustom23Image.imageset/AppIconCustom23.png diff --git a/Shared2/Assets.xcassets/AppIconCustom23Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom23Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom23Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom23Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/AppIconCustom24.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/AppIconCustom24.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/AppIconCustom24.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/AppIconCustom24.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom24.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom24.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24Image.imageset/AppIconCustom24.png b/Shared/Assets.xcassets/AppIconCustom24Image.imageset/AppIconCustom24.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24Image.imageset/AppIconCustom24.png rename to Shared/Assets.xcassets/AppIconCustom24Image.imageset/AppIconCustom24.png diff --git a/Shared2/Assets.xcassets/AppIconCustom24Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom24Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom24Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom24Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/AppIconCustom25.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/AppIconCustom25.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/AppIconCustom25.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/AppIconCustom25.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom25.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom25.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25Image.imageset/AppIconCustom25.png b/Shared/Assets.xcassets/AppIconCustom25Image.imageset/AppIconCustom25.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25Image.imageset/AppIconCustom25.png rename to Shared/Assets.xcassets/AppIconCustom25Image.imageset/AppIconCustom25.png diff --git a/Shared2/Assets.xcassets/AppIconCustom25Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom25Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom25Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom25Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/AppIconCustom26.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/AppIconCustom26.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/AppIconCustom26.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/AppIconCustom26.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom26.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom26.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26Image.imageset/AppIconCustom26.png b/Shared/Assets.xcassets/AppIconCustom26Image.imageset/AppIconCustom26.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26Image.imageset/AppIconCustom26.png rename to Shared/Assets.xcassets/AppIconCustom26Image.imageset/AppIconCustom26.png diff --git a/Shared2/Assets.xcassets/AppIconCustom26Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom26Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom26Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom26Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/AppIconCustom27.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/AppIconCustom27.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/AppIconCustom27.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/AppIconCustom27.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom27.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom27.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27Image.imageset/AppIconCustom27.png b/Shared/Assets.xcassets/AppIconCustom27Image.imageset/AppIconCustom27.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27Image.imageset/AppIconCustom27.png rename to Shared/Assets.xcassets/AppIconCustom27Image.imageset/AppIconCustom27.png diff --git a/Shared2/Assets.xcassets/AppIconCustom27Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom27Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom27Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom27Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/AppIconCustom28.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/AppIconCustom28.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/AppIconCustom28.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/AppIconCustom28.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom28.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom28.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28Image.imageset/AppIconCustom28.png b/Shared/Assets.xcassets/AppIconCustom28Image.imageset/AppIconCustom28.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28Image.imageset/AppIconCustom28.png rename to Shared/Assets.xcassets/AppIconCustom28Image.imageset/AppIconCustom28.png diff --git a/Shared2/Assets.xcassets/AppIconCustom28Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom28Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom28Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom28Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/AppIconCustom29.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/AppIconCustom29.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/AppIconCustom29.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/AppIconCustom29.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom29.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom29.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29Image.imageset/AppIconCustom29.png b/Shared/Assets.xcassets/AppIconCustom29Image.imageset/AppIconCustom29.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29Image.imageset/AppIconCustom29.png rename to Shared/Assets.xcassets/AppIconCustom29Image.imageset/AppIconCustom29.png diff --git a/Shared2/Assets.xcassets/AppIconCustom29Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom29Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom29Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom29Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom2Image.imageset/AppIconCustom2.png b/Shared/Assets.xcassets/AppIconCustom2Image.imageset/AppIconCustom2.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2Image.imageset/AppIconCustom2.png rename to Shared/Assets.xcassets/AppIconCustom2Image.imageset/AppIconCustom2.png diff --git a/Shared2/Assets.xcassets/AppIconCustom2Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom2Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom2Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom2Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/AppIconCustom3.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/AppIconCustom3.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/AppIconCustom3.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/AppIconCustom3.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom3.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom3.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3Image.imageset/AppIconCustom3.png b/Shared/Assets.xcassets/AppIconCustom3Image.imageset/AppIconCustom3.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3Image.imageset/AppIconCustom3.png rename to Shared/Assets.xcassets/AppIconCustom3Image.imageset/AppIconCustom3.png diff --git a/Shared2/Assets.xcassets/AppIconCustom3Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom3Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom3Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom3Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/AppIconCustom4.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/AppIconCustom4.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/AppIconCustom4.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/AppIconCustom4.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom4.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom4.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4Image.imageset/AppIconCustom4.png b/Shared/Assets.xcassets/AppIconCustom4Image.imageset/AppIconCustom4.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4Image.imageset/AppIconCustom4.png rename to Shared/Assets.xcassets/AppIconCustom4Image.imageset/AppIconCustom4.png diff --git a/Shared2/Assets.xcassets/AppIconCustom4Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom4Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom4Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom4Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/AppIconCustom5.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/AppIconCustom5.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/AppIconCustom5.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/AppIconCustom5.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom5.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom5.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5Image.imageset/AppIconCustom5.png b/Shared/Assets.xcassets/AppIconCustom5Image.imageset/AppIconCustom5.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5Image.imageset/AppIconCustom5.png rename to Shared/Assets.xcassets/AppIconCustom5Image.imageset/AppIconCustom5.png diff --git a/Shared2/Assets.xcassets/AppIconCustom5Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom5Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom5Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom5Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/AppIconCustom6.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/AppIconCustom6.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/AppIconCustom6.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/AppIconCustom6.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom6.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom6.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6Image.imageset/AppIconCustom6.png b/Shared/Assets.xcassets/AppIconCustom6Image.imageset/AppIconCustom6.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6Image.imageset/AppIconCustom6.png rename to Shared/Assets.xcassets/AppIconCustom6Image.imageset/AppIconCustom6.png diff --git a/Shared2/Assets.xcassets/AppIconCustom6Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom6Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom6Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom6Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/AppIconCustom7.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/AppIconCustom7.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/AppIconCustom7.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/AppIconCustom7.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom7.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom7.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7Image.imageset/AppIconCustom7.png b/Shared/Assets.xcassets/AppIconCustom7Image.imageset/AppIconCustom7.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7Image.imageset/AppIconCustom7.png rename to Shared/Assets.xcassets/AppIconCustom7Image.imageset/AppIconCustom7.png diff --git a/Shared2/Assets.xcassets/AppIconCustom7Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom7Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom7Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom7Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/AppIconCustom8.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/AppIconCustom8.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/AppIconCustom8.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/AppIconCustom8.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom8.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom8.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8Image.imageset/AppIconCustom8.png b/Shared/Assets.xcassets/AppIconCustom8Image.imageset/AppIconCustom8.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8Image.imageset/AppIconCustom8.png rename to Shared/Assets.xcassets/AppIconCustom8Image.imageset/AppIconCustom8.png diff --git a/Shared2/Assets.xcassets/AppIconCustom8Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom8Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom8Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom8Image.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/AppIconCustom9.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/AppIconCustom9.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/AppIconCustom9.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/AppIconCustom9.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconCustom9.appiconset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/Contents.json diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Notification-20@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Notification-20@1x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Notification-20@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Pro-83.5@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Pro-83.5@2x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Pro-83.5@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Settings-29@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Settings-29@1x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Settings-29@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Settings-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Settings-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Settings-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-40@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-40@1x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-40@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-76@1x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-76@1x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-76@1x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-76@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-76@2x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPad-Spotlight-76@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-29@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-29@2x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-29@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-29@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-29@3x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-29@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-App-60@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-App-60@2x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-App-60@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-App-60@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-App-60@3x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-App-60@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Notification-20@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Notification-20@2x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Notification-20@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Notification-20@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Notification-20@3x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Notification-20@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Spotlight-40@2x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Spotlight-40@2x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Spotlight-40@2x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Spotlight-40@3x.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Spotlight-40@3x.png rename to Shared/Assets.xcassets/AppIconCustom9.appiconset/iPhone-Spotlight-40@3x.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9Image.imageset/AppIconCustom9.png b/Shared/Assets.xcassets/AppIconCustom9Image.imageset/AppIconCustom9.png similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9Image.imageset/AppIconCustom9.png rename to Shared/Assets.xcassets/AppIconCustom9Image.imageset/AppIconCustom9.png diff --git a/Shared2/Assets.xcassets/AppIconCustom9Image.imageset/Contents.json b/Shared/Assets.xcassets/AppIconCustom9Image.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/AppIconCustom9Image.imageset/Contents.json rename to Shared/Assets.xcassets/AppIconCustom9Image.imageset/Contents.json diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/AppIconGood.png b/Shared/Assets.xcassets/AppIconGood.appiconset/AppIconGood.png new file mode 100644 index 0000000..77af65b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/AppIconGood.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconGood.appiconset/Contents.json new file mode 100644 index 0000000..8af81e2 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconGood.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconGood.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..1113f12 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..7bcd1a7 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..029cc2e Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..c80b7bc Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..d005855 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..7bcd1a7 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..ab0a363 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..3803ae0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..6924b97 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..6fa35db Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..1ef27f1 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..08e546a Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..8ef213e Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..415ca9c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..41121df Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..ab0a363 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..08e546a Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGood.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconGoodImage.imageset/AppIconGood.png b/Shared/Assets.xcassets/AppIconGoodImage.imageset/AppIconGood.png new file mode 100644 index 0000000..77af65b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconGoodImage.imageset/AppIconGood.png differ diff --git a/Shared/Assets.xcassets/AppIconGoodImage.imageset/Contents.json b/Shared/Assets.xcassets/AppIconGoodImage.imageset/Contents.json new file mode 100644 index 0000000..00c3215 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconGoodImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppIconGood.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/AppIconHorrible.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/AppIconHorrible.png new file mode 100644 index 0000000..25340a9 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/AppIconHorrible.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconHorrible.appiconset/Contents.json new file mode 100644 index 0000000..e606adb --- /dev/null +++ b/Shared/Assets.xcassets/AppIconHorrible.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconHorrible.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..7d0aca3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..6b89b41 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..97ae2f9 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..4fa636c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..8728d80 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..6b89b41 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..ee7346c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..dc1faee Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..61af921 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..032b270 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..15a9068 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..7176348 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..36dc66b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..40319a3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..e576677 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..b6f37c8 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..7176348 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorrible.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconHorribleImage.imageset/AppIconHorrible.png b/Shared/Assets.xcassets/AppIconHorribleImage.imageset/AppIconHorrible.png new file mode 100644 index 0000000..25340a9 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconHorribleImage.imageset/AppIconHorrible.png differ diff --git a/Shared/Assets.xcassets/AppIconHorribleImage.imageset/Contents.json b/Shared/Assets.xcassets/AppIconHorribleImage.imageset/Contents.json new file mode 100644 index 0000000..f60efc4 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconHorribleImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppIconHorrible.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconImage.imageset/AppIcon.png b/Shared/Assets.xcassets/AppIconImage.imageset/AppIcon.png new file mode 100644 index 0000000..f564135 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconImage.imageset/AppIcon.png differ diff --git a/Shared/Assets.xcassets/AppIconImage.imageset/Contents.json b/Shared/Assets.xcassets/AppIconImage.imageset/Contents.json new file mode 100644 index 0000000..df110f9 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/AppIconNeonGreen.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/AppIconNeonGreen.png new file mode 100644 index 0000000..ce441c3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/AppIconNeonGreen.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/Contents.json new file mode 100644 index 0000000..1740e39 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconNeonGreen.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..7ae2532 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..6aa8a07 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..21dcd0b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..2a7a59e Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..22bb417 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..6aa8a07 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..1ae1477 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..41d7572 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..313a498 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..22bb417 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..61f801d Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..156724a Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..5dd37be Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..6aa8a07 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..0943b90 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..1ae1477 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..156724a Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreen.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreenImage.imageset/AppIconNeonGreen.png b/Shared/Assets.xcassets/AppIconNeonGreenImage.imageset/AppIconNeonGreen.png new file mode 100644 index 0000000..ce441c3 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconNeonGreenImage.imageset/AppIconNeonGreen.png differ diff --git a/Shared/Assets.xcassets/AppIconNeonGreenImage.imageset/Contents.json b/Shared/Assets.xcassets/AppIconNeonGreenImage.imageset/Contents.json new file mode 100644 index 0000000..523210b --- /dev/null +++ b/Shared/Assets.xcassets/AppIconNeonGreenImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppIconNeonGreen.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/AppIconPink.png b/Shared/Assets.xcassets/AppIconPink.appiconset/AppIconPink.png new file mode 100644 index 0000000..de02b11 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/AppIconPink.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconPink.appiconset/Contents.json new file mode 100644 index 0000000..a1c2777 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconPink.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconPink.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..2e961df Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..068b338 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..20886a0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..976c4b4 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..def5ce6 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..b6fe156 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..7d1e7f6 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..223d113 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..4cd2ecc Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..81ea718 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..a15cb70 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..a3376ae Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..f6c411d Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..068b338 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..d8c79e0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..fe7f8ce Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..a3376ae Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPink.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPinkImage.imageset/AppIconPink.png b/Shared/Assets.xcassets/AppIconPinkImage.imageset/AppIconPink.png new file mode 100644 index 0000000..de02b11 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPinkImage.imageset/AppIconPink.png differ diff --git a/Shared/Assets.xcassets/AppIconPinkImage.imageset/Contents.json b/Shared/Assets.xcassets/AppIconPinkImage.imageset/Contents.json new file mode 100644 index 0000000..5d5c281 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconPinkImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppIconPink.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/AppIconPurple.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/AppIconPurple.png new file mode 100644 index 0000000..b8e5a59 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/AppIconPurple.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/Contents.json b/Shared/Assets.xcassets/AppIconPurple.appiconset/Contents.json new file mode 100644 index 0000000..d11fbe5 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconPurple.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "iPhone-Notification-20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPhone-Notification-20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "iPhone-29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPhone-29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "iPhone-Spotlight-40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPhone-Spotlight-40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "iPhone-App-60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "iPhone-App-60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "iPad-Notification-20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "iPad-Notification-20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "iPad-Settings-29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "iPad-Settings-29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "iPad-Spotlight-40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "iPad-Spotlight-76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "iPad-Spotlight-76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "iPad-Pro-83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "AppIconPurple.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@1x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@1x.png new file mode 100644 index 0000000..6476abf Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@2x.png new file mode 100644 index 0000000..8769e24 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Pro-83.5@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Pro-83.5@2x.png new file mode 100644 index 0000000..e52cf9b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Pro-83.5@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@1x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@1x.png new file mode 100644 index 0000000..e30d17a Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@2x.png new file mode 100644 index 0000000..1ad0ad6 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Settings-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@1x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@1x.png new file mode 100644 index 0000000..8769e24 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@2x.png new file mode 100644 index 0000000..12e06d0 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@1x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@1x.png new file mode 100644 index 0000000..e14adf1 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@1x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@2x.png new file mode 100644 index 0000000..03ef10c Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPad-Spotlight-76@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@2x.png new file mode 100644 index 0000000..15e931b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@3x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@3x.png new file mode 100644 index 0000000..875ac4b Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-29@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@2x.png new file mode 100644 index 0000000..32ef805 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@3x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@3x.png new file mode 100644 index 0000000..e6e1bbf Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-App-60@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@2x.png new file mode 100644 index 0000000..ad009c9 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@3x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@3x.png new file mode 100644 index 0000000..1f8843d Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Notification-20@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@2x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@2x.png new file mode 100644 index 0000000..73893bc Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@2x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@3x.png b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@3x.png new file mode 100644 index 0000000..32ef805 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurple.appiconset/iPhone-Spotlight-40@3x.png differ diff --git a/Shared/Assets.xcassets/AppIconPurpleImage.imageset/AppIconPurple.png b/Shared/Assets.xcassets/AppIconPurpleImage.imageset/AppIconPurple.png new file mode 100644 index 0000000..b8e5a59 Binary files /dev/null and b/Shared/Assets.xcassets/AppIconPurpleImage.imageset/AppIconPurple.png differ diff --git a/Shared/Assets.xcassets/AppIconPurpleImage.imageset/Contents.json b/Shared/Assets.xcassets/AppIconPurpleImage.imageset/Contents.json new file mode 100644 index 0000000..03d52c8 --- /dev/null +++ b/Shared/Assets.xcassets/AppIconPurpleImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppIconPurple.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/Contents.json b/Shared/Assets.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Shared/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/custom_icon/Contents.json b/Shared/Assets.xcassets/custom_icon/Contents.json new file mode 100644 index 0000000..6e96565 --- /dev/null +++ b/Shared/Assets.xcassets/custom_icon/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/Shared2/Assets.xcassets/custom_icon/android-brands.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/android-brands.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/android-brands.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/android-brands.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/android-brands.imageset/android-brands.png b/Shared/Assets.xcassets/custom_icon/android-brands.imageset/android-brands.png new file mode 100644 index 0000000..5bb9fa5 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/android-brands.imageset/android-brands.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/android-brands.imageset/android-brands@2x.png b/Shared/Assets.xcassets/custom_icon/android-brands.imageset/android-brands@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/android-brands.imageset/android-brands@2x.png rename to Shared/Assets.xcassets/custom_icon/android-brands.imageset/android-brands@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/android-brands.imageset/android-brands@3x.png b/Shared/Assets.xcassets/custom_icon/android-brands.imageset/android-brands@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/android-brands.imageset/android-brands@3x.png rename to Shared/Assets.xcassets/custom_icon/android-brands.imageset/android-brands@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/apple-brands.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/apple-brands.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/apple-brands.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/apple-brands.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/apple-brands.imageset/apple-brands.png b/Shared/Assets.xcassets/custom_icon/apple-brands.imageset/apple-brands.png new file mode 100644 index 0000000..ab2d2a6 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/apple-brands.imageset/apple-brands.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/apple-brands.imageset/apple-brands@2x.png b/Shared/Assets.xcassets/custom_icon/apple-brands.imageset/apple-brands@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/apple-brands.imageset/apple-brands@2x.png rename to Shared/Assets.xcassets/custom_icon/apple-brands.imageset/apple-brands@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/apple-brands.imageset/apple-brands@3x.png b/Shared/Assets.xcassets/custom_icon/apple-brands.imageset/apple-brands@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/apple-brands.imageset/apple-brands@3x.png rename to Shared/Assets.xcassets/custom_icon/apple-brands.imageset/apple-brands@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/arrow-up-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/arrow-up-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/arrow-up-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/arrow-up-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/arrow-up-solid.imageset/arrow-up-solid.png b/Shared/Assets.xcassets/custom_icon/arrow-up-solid.imageset/arrow-up-solid.png new file mode 100644 index 0000000..d063daf Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/arrow-up-solid.imageset/arrow-up-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/arrow-up-solid.imageset/arrow-up-solid@2x.png b/Shared/Assets.xcassets/custom_icon/arrow-up-solid.imageset/arrow-up-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/arrow-up-solid.imageset/arrow-up-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/arrow-up-solid.imageset/arrow-up-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/arrow-up-solid.imageset/arrow-up-solid@3x.png b/Shared/Assets.xcassets/custom_icon/arrow-up-solid.imageset/arrow-up-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/arrow-up-solid.imageset/arrow-up-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/arrow-up-solid.imageset/arrow-up-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/baby-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/baby-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/baby-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/baby-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/baby-solid.imageset/baby-solid.png b/Shared/Assets.xcassets/custom_icon/baby-solid.imageset/baby-solid.png new file mode 100644 index 0000000..74a1767 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/baby-solid.imageset/baby-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/baby-solid.imageset/baby-solid@2x.png b/Shared/Assets.xcassets/custom_icon/baby-solid.imageset/baby-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/baby-solid.imageset/baby-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/baby-solid.imageset/baby-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/baby-solid.imageset/baby-solid@3x.png b/Shared/Assets.xcassets/custom_icon/baby-solid.imageset/baby-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/baby-solid.imageset/baby-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/baby-solid.imageset/baby-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/ban-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/ban-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/ban-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/ban-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/ban-solid.imageset/ban-solid.png b/Shared/Assets.xcassets/custom_icon/ban-solid.imageset/ban-solid.png new file mode 100644 index 0000000..6763140 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/ban-solid.imageset/ban-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/ban-solid.imageset/ban-solid@2x.png b/Shared/Assets.xcassets/custom_icon/ban-solid.imageset/ban-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/ban-solid.imageset/ban-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/ban-solid.imageset/ban-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/ban-solid.imageset/ban-solid@3x.png b/Shared/Assets.xcassets/custom_icon/ban-solid.imageset/ban-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/ban-solid.imageset/ban-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/ban-solid.imageset/ban-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/baseball-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/baseball-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/baseball-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/baseball-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/baseball-solid.imageset/baseball-solid.png b/Shared/Assets.xcassets/custom_icon/baseball-solid.imageset/baseball-solid.png new file mode 100644 index 0000000..64179a9 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/baseball-solid.imageset/baseball-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/baseball-solid.imageset/baseball-solid@2x.png b/Shared/Assets.xcassets/custom_icon/baseball-solid.imageset/baseball-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/baseball-solid.imageset/baseball-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/baseball-solid.imageset/baseball-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/baseball-solid.imageset/baseball-solid@3x.png b/Shared/Assets.xcassets/custom_icon/baseball-solid.imageset/baseball-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/baseball-solid.imageset/baseball-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/baseball-solid.imageset/baseball-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/battery-empty-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/battery-empty-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-empty-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/battery-empty-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/battery-empty-solid.imageset/battery-empty-solid.png b/Shared/Assets.xcassets/custom_icon/battery-empty-solid.imageset/battery-empty-solid.png new file mode 100644 index 0000000..a51dbe3 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/battery-empty-solid.imageset/battery-empty-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/battery-empty-solid.imageset/battery-empty-solid@2x.png b/Shared/Assets.xcassets/custom_icon/battery-empty-solid.imageset/battery-empty-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-empty-solid.imageset/battery-empty-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/battery-empty-solid.imageset/battery-empty-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/battery-empty-solid.imageset/battery-empty-solid@3x.png b/Shared/Assets.xcassets/custom_icon/battery-empty-solid.imageset/battery-empty-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-empty-solid.imageset/battery-empty-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/battery-empty-solid.imageset/battery-empty-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/battery-full-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/battery-full-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-full-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/battery-full-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/battery-full-solid.imageset/battery-full-solid.png b/Shared/Assets.xcassets/custom_icon/battery-full-solid.imageset/battery-full-solid.png new file mode 100644 index 0000000..f2fefe4 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/battery-full-solid.imageset/battery-full-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/battery-full-solid.imageset/battery-full-solid@2x.png b/Shared/Assets.xcassets/custom_icon/battery-full-solid.imageset/battery-full-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-full-solid.imageset/battery-full-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/battery-full-solid.imageset/battery-full-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/battery-full-solid.imageset/battery-full-solid@3x.png b/Shared/Assets.xcassets/custom_icon/battery-full-solid.imageset/battery-full-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-full-solid.imageset/battery-full-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/battery-full-solid.imageset/battery-full-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/battery-half-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/battery-half-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-half-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/battery-half-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/battery-half-solid.imageset/battery-half-solid.png b/Shared/Assets.xcassets/custom_icon/battery-half-solid.imageset/battery-half-solid.png new file mode 100644 index 0000000..d0699b7 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/battery-half-solid.imageset/battery-half-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/battery-half-solid.imageset/battery-half-solid@2x.png b/Shared/Assets.xcassets/custom_icon/battery-half-solid.imageset/battery-half-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-half-solid.imageset/battery-half-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/battery-half-solid.imageset/battery-half-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/battery-half-solid.imageset/battery-half-solid@3x.png b/Shared/Assets.xcassets/custom_icon/battery-half-solid.imageset/battery-half-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-half-solid.imageset/battery-half-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/battery-half-solid.imageset/battery-half-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/battery-quarter-solid.png b/Shared/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/battery-quarter-solid.png new file mode 100644 index 0000000..d1431ab Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/battery-quarter-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/battery-quarter-solid@2x.png b/Shared/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/battery-quarter-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/battery-quarter-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/battery-quarter-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/battery-quarter-solid@3x.png b/Shared/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/battery-quarter-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/battery-quarter-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/battery-quarter-solid.imageset/battery-quarter-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/battery-three-quarters-solid.png b/Shared/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/battery-three-quarters-solid.png new file mode 100644 index 0000000..048cde2 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/battery-three-quarters-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/battery-three-quarters-solid@2x.png b/Shared/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/battery-three-quarters-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/battery-three-quarters-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/battery-three-quarters-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/battery-three-quarters-solid@3x.png b/Shared/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/battery-three-quarters-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/battery-three-quarters-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/battery-three-quarters-solid.imageset/battery-three-quarters-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/bitcoin-brands.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/bitcoin-brands.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bitcoin-brands.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/bitcoin-brands.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/bitcoin-brands.imageset/bitcoin-brands.png b/Shared/Assets.xcassets/custom_icon/bitcoin-brands.imageset/bitcoin-brands.png new file mode 100644 index 0000000..b6244dd Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/bitcoin-brands.imageset/bitcoin-brands.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/bitcoin-brands.imageset/bitcoin-brands@2x.png b/Shared/Assets.xcassets/custom_icon/bitcoin-brands.imageset/bitcoin-brands@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bitcoin-brands.imageset/bitcoin-brands@2x.png rename to Shared/Assets.xcassets/custom_icon/bitcoin-brands.imageset/bitcoin-brands@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/bitcoin-brands.imageset/bitcoin-brands@3x.png b/Shared/Assets.xcassets/custom_icon/bitcoin-brands.imageset/bitcoin-brands@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bitcoin-brands.imageset/bitcoin-brands@3x.png rename to Shared/Assets.xcassets/custom_icon/bitcoin-brands.imageset/bitcoin-brands@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/bolt-lightning-solid.png b/Shared/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/bolt-lightning-solid.png new file mode 100644 index 0000000..f8e8756 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/bolt-lightning-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/bolt-lightning-solid@2x.png b/Shared/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/bolt-lightning-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/bolt-lightning-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/bolt-lightning-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/bolt-lightning-solid@3x.png b/Shared/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/bolt-lightning-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/bolt-lightning-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/bolt-lightning-solid.imageset/bolt-lightning-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/bolt-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/bolt-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bolt-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/bolt-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/bolt-solid.imageset/bolt-solid.png b/Shared/Assets.xcassets/custom_icon/bolt-solid.imageset/bolt-solid.png new file mode 100644 index 0000000..6352f24 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/bolt-solid.imageset/bolt-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/bolt-solid.imageset/bolt-solid@2x.png b/Shared/Assets.xcassets/custom_icon/bolt-solid.imageset/bolt-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bolt-solid.imageset/bolt-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/bolt-solid.imageset/bolt-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/bolt-solid.imageset/bolt-solid@3x.png b/Shared/Assets.xcassets/custom_icon/bolt-solid.imageset/bolt-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bolt-solid.imageset/bolt-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/bolt-solid.imageset/bolt-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/bomb-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/bomb-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bomb-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/bomb-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/bomb-solid.imageset/bomb-solid.png b/Shared/Assets.xcassets/custom_icon/bomb-solid.imageset/bomb-solid.png new file mode 100644 index 0000000..fcec06f Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/bomb-solid.imageset/bomb-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/bomb-solid.imageset/bomb-solid@2x.png b/Shared/Assets.xcassets/custom_icon/bomb-solid.imageset/bomb-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bomb-solid.imageset/bomb-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/bomb-solid.imageset/bomb-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/bomb-solid.imageset/bomb-solid@3x.png b/Shared/Assets.xcassets/custom_icon/bomb-solid.imageset/bomb-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bomb-solid.imageset/bomb-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/bomb-solid.imageset/bomb-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/btc-brands.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/btc-brands.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/btc-brands.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/btc-brands.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/btc-brands.imageset/btc-brands.png b/Shared/Assets.xcassets/custom_icon/btc-brands.imageset/btc-brands.png new file mode 100644 index 0000000..ae0cdbf Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/btc-brands.imageset/btc-brands.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/btc-brands.imageset/btc-brands@2x.png b/Shared/Assets.xcassets/custom_icon/btc-brands.imageset/btc-brands@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/btc-brands.imageset/btc-brands@2x.png rename to Shared/Assets.xcassets/custom_icon/btc-brands.imageset/btc-brands@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/btc-brands.imageset/btc-brands@3x.png b/Shared/Assets.xcassets/custom_icon/btc-brands.imageset/btc-brands@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/btc-brands.imageset/btc-brands@3x.png rename to Shared/Assets.xcassets/custom_icon/btc-brands.imageset/btc-brands@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/bullhorn-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/bullhorn-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bullhorn-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/bullhorn-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/bullhorn-solid.imageset/bullhorn-solid.png b/Shared/Assets.xcassets/custom_icon/bullhorn-solid.imageset/bullhorn-solid.png new file mode 100644 index 0000000..c7f0667 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/bullhorn-solid.imageset/bullhorn-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/bullhorn-solid.imageset/bullhorn-solid@2x.png b/Shared/Assets.xcassets/custom_icon/bullhorn-solid.imageset/bullhorn-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bullhorn-solid.imageset/bullhorn-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/bullhorn-solid.imageset/bullhorn-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/bullhorn-solid.imageset/bullhorn-solid@3x.png b/Shared/Assets.xcassets/custom_icon/bullhorn-solid.imageset/bullhorn-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bullhorn-solid.imageset/bullhorn-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/bullhorn-solid.imageset/bullhorn-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/bullseye-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/bullseye-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bullseye-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/bullseye-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/bullseye-solid.imageset/bullseye-solid.png b/Shared/Assets.xcassets/custom_icon/bullseye-solid.imageset/bullseye-solid.png new file mode 100644 index 0000000..878bff8 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/bullseye-solid.imageset/bullseye-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/bullseye-solid.imageset/bullseye-solid@2x.png b/Shared/Assets.xcassets/custom_icon/bullseye-solid.imageset/bullseye-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bullseye-solid.imageset/bullseye-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/bullseye-solid.imageset/bullseye-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/bullseye-solid.imageset/bullseye-solid@3x.png b/Shared/Assets.xcassets/custom_icon/bullseye-solid.imageset/bullseye-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/bullseye-solid.imageset/bullseye-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/bullseye-solid.imageset/bullseye-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/burger-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/burger-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/burger-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/burger-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/burger-solid.imageset/burger-solid.png b/Shared/Assets.xcassets/custom_icon/burger-solid.imageset/burger-solid.png new file mode 100644 index 0000000..5528b51 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/burger-solid.imageset/burger-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/burger-solid.imageset/burger-solid@2x.png b/Shared/Assets.xcassets/custom_icon/burger-solid.imageset/burger-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/burger-solid.imageset/burger-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/burger-solid.imageset/burger-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/burger-solid.imageset/burger-solid@3x.png b/Shared/Assets.xcassets/custom_icon/burger-solid.imageset/burger-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/burger-solid.imageset/burger-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/burger-solid.imageset/burger-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/cannabis-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/cannabis-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/cannabis-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/cannabis-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/cannabis-solid.imageset/cannabis-solid.png b/Shared/Assets.xcassets/custom_icon/cannabis-solid.imageset/cannabis-solid.png new file mode 100644 index 0000000..6be2be6 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/cannabis-solid.imageset/cannabis-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/cannabis-solid.imageset/cannabis-solid@2x.png b/Shared/Assets.xcassets/custom_icon/cannabis-solid.imageset/cannabis-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/cannabis-solid.imageset/cannabis-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/cannabis-solid.imageset/cannabis-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/cannabis-solid.imageset/cannabis-solid@3x.png b/Shared/Assets.xcassets/custom_icon/cannabis-solid.imageset/cannabis-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/cannabis-solid.imageset/cannabis-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/cannabis-solid.imageset/cannabis-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/caret-down-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/caret-down-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-down-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/caret-down-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/caret-down-solid.imageset/caret-down-solid.png b/Shared/Assets.xcassets/custom_icon/caret-down-solid.imageset/caret-down-solid.png new file mode 100644 index 0000000..62d098d Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/caret-down-solid.imageset/caret-down-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/caret-down-solid.imageset/caret-down-solid@2x.png b/Shared/Assets.xcassets/custom_icon/caret-down-solid.imageset/caret-down-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-down-solid.imageset/caret-down-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/caret-down-solid.imageset/caret-down-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/caret-down-solid.imageset/caret-down-solid@3x.png b/Shared/Assets.xcassets/custom_icon/caret-down-solid.imageset/caret-down-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-down-solid.imageset/caret-down-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/caret-down-solid.imageset/caret-down-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/caret-left-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/caret-left-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-left-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/caret-left-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/caret-left-solid.imageset/caret-left-solid.png b/Shared/Assets.xcassets/custom_icon/caret-left-solid.imageset/caret-left-solid.png new file mode 100644 index 0000000..2cfe572 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/caret-left-solid.imageset/caret-left-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/caret-left-solid.imageset/caret-left-solid@2x.png b/Shared/Assets.xcassets/custom_icon/caret-left-solid.imageset/caret-left-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-left-solid.imageset/caret-left-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/caret-left-solid.imageset/caret-left-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/caret-left-solid.imageset/caret-left-solid@3x.png b/Shared/Assets.xcassets/custom_icon/caret-left-solid.imageset/caret-left-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-left-solid.imageset/caret-left-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/caret-left-solid.imageset/caret-left-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/caret-right-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/caret-right-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-right-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/caret-right-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/caret-right-solid.imageset/caret-right-solid.png b/Shared/Assets.xcassets/custom_icon/caret-right-solid.imageset/caret-right-solid.png new file mode 100644 index 0000000..690a7b5 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/caret-right-solid.imageset/caret-right-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/caret-right-solid.imageset/caret-right-solid@2x.png b/Shared/Assets.xcassets/custom_icon/caret-right-solid.imageset/caret-right-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-right-solid.imageset/caret-right-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/caret-right-solid.imageset/caret-right-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/caret-right-solid.imageset/caret-right-solid@3x.png b/Shared/Assets.xcassets/custom_icon/caret-right-solid.imageset/caret-right-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-right-solid.imageset/caret-right-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/caret-right-solid.imageset/caret-right-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/caret-up-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/caret-up-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-up-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/caret-up-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/caret-up-solid.imageset/caret-up-solid.png b/Shared/Assets.xcassets/custom_icon/caret-up-solid.imageset/caret-up-solid.png new file mode 100644 index 0000000..cc26759 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/caret-up-solid.imageset/caret-up-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/caret-up-solid.imageset/caret-up-solid@2x.png b/Shared/Assets.xcassets/custom_icon/caret-up-solid.imageset/caret-up-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-up-solid.imageset/caret-up-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/caret-up-solid.imageset/caret-up-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/caret-up-solid.imageset/caret-up-solid@3x.png b/Shared/Assets.xcassets/custom_icon/caret-up-solid.imageset/caret-up-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/caret-up-solid.imageset/caret-up-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/caret-up-solid.imageset/caret-up-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/chess-king-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/chess-king-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/chess-king-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/chess-king-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/chess-king-solid.imageset/chess-king-solid.png b/Shared/Assets.xcassets/custom_icon/chess-king-solid.imageset/chess-king-solid.png new file mode 100644 index 0000000..f5126a7 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/chess-king-solid.imageset/chess-king-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/chess-king-solid.imageset/chess-king-solid@2x.png b/Shared/Assets.xcassets/custom_icon/chess-king-solid.imageset/chess-king-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/chess-king-solid.imageset/chess-king-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/chess-king-solid.imageset/chess-king-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/chess-king-solid.imageset/chess-king-solid@3x.png b/Shared/Assets.xcassets/custom_icon/chess-king-solid.imageset/chess-king-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/chess-king-solid.imageset/chess-king-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/chess-king-solid.imageset/chess-king-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/chess-queen-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/chess-queen-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/chess-queen-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/chess-queen-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/chess-queen-solid.imageset/chess-queen-solid.png b/Shared/Assets.xcassets/custom_icon/chess-queen-solid.imageset/chess-queen-solid.png new file mode 100644 index 0000000..0c47678 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/chess-queen-solid.imageset/chess-queen-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/chess-queen-solid.imageset/chess-queen-solid@2x.png b/Shared/Assets.xcassets/custom_icon/chess-queen-solid.imageset/chess-queen-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/chess-queen-solid.imageset/chess-queen-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/chess-queen-solid.imageset/chess-queen-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/chess-queen-solid.imageset/chess-queen-solid@3x.png b/Shared/Assets.xcassets/custom_icon/chess-queen-solid.imageset/chess-queen-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/chess-queen-solid.imageset/chess-queen-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/chess-queen-solid.imageset/chess-queen-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/circle-xmark-solid.png b/Shared/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/circle-xmark-solid.png new file mode 100644 index 0000000..2301b11 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/circle-xmark-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/circle-xmark-solid@2x.png b/Shared/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/circle-xmark-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/circle-xmark-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/circle-xmark-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/circle-xmark-solid@3x.png b/Shared/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/circle-xmark-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/circle-xmark-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/circle-xmark-solid.imageset/circle-xmark-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/clock-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/clock-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/clock-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/clock-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/clock-solid.imageset/clock-solid.png b/Shared/Assets.xcassets/custom_icon/clock-solid.imageset/clock-solid.png new file mode 100644 index 0000000..4247be2 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/clock-solid.imageset/clock-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/clock-solid.imageset/clock-solid@2x.png b/Shared/Assets.xcassets/custom_icon/clock-solid.imageset/clock-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/clock-solid.imageset/clock-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/clock-solid.imageset/clock-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/clock-solid.imageset/clock-solid@3x.png b/Shared/Assets.xcassets/custom_icon/clock-solid.imageset/clock-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/clock-solid.imageset/clock-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/clock-solid.imageset/clock-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/code-compare-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/code-compare-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/code-compare-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/code-compare-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/code-compare-solid.imageset/code-compare-solid.png b/Shared/Assets.xcassets/custom_icon/code-compare-solid.imageset/code-compare-solid.png new file mode 100644 index 0000000..69e9860 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/code-compare-solid.imageset/code-compare-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/code-compare-solid.imageset/code-compare-solid@2x.png b/Shared/Assets.xcassets/custom_icon/code-compare-solid.imageset/code-compare-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/code-compare-solid.imageset/code-compare-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/code-compare-solid.imageset/code-compare-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/code-compare-solid.imageset/code-compare-solid@3x.png b/Shared/Assets.xcassets/custom_icon/code-compare-solid.imageset/code-compare-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/code-compare-solid.imageset/code-compare-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/code-compare-solid.imageset/code-compare-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/code-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/code-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/code-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/code-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/code-solid.imageset/code-solid.png b/Shared/Assets.xcassets/custom_icon/code-solid.imageset/code-solid.png new file mode 100644 index 0000000..efdb8b2 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/code-solid.imageset/code-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/code-solid.imageset/code-solid@2x.png b/Shared/Assets.xcassets/custom_icon/code-solid.imageset/code-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/code-solid.imageset/code-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/code-solid.imageset/code-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/code-solid.imageset/code-solid@3x.png b/Shared/Assets.xcassets/custom_icon/code-solid.imageset/code-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/code-solid.imageset/code-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/code-solid.imageset/code-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/cross-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/cross-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/cross-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/cross-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/cross-solid.imageset/cross-solid.png b/Shared/Assets.xcassets/custom_icon/cross-solid.imageset/cross-solid.png new file mode 100644 index 0000000..b0b3a41 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/cross-solid.imageset/cross-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/cross-solid.imageset/cross-solid@2x.png b/Shared/Assets.xcassets/custom_icon/cross-solid.imageset/cross-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/cross-solid.imageset/cross-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/cross-solid.imageset/cross-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/cross-solid.imageset/cross-solid@3x.png b/Shared/Assets.xcassets/custom_icon/cross-solid.imageset/cross-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/cross-solid.imageset/cross-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/cross-solid.imageset/cross-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/crosshairs-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/crosshairs-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/crosshairs-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/crosshairs-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/crosshairs-solid.imageset/crosshairs-solid.png b/Shared/Assets.xcassets/custom_icon/crosshairs-solid.imageset/crosshairs-solid.png new file mode 100644 index 0000000..df39497 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/crosshairs-solid.imageset/crosshairs-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/crosshairs-solid.imageset/crosshairs-solid@2x.png b/Shared/Assets.xcassets/custom_icon/crosshairs-solid.imageset/crosshairs-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/crosshairs-solid.imageset/crosshairs-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/crosshairs-solid.imageset/crosshairs-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/crosshairs-solid.imageset/crosshairs-solid@3x.png b/Shared/Assets.xcassets/custom_icon/crosshairs-solid.imageset/crosshairs-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/crosshairs-solid.imageset/crosshairs-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/crosshairs-solid.imageset/crosshairs-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/crown-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/crown-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/crown-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/crown-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/crown-solid.imageset/crown-solid.png b/Shared/Assets.xcassets/custom_icon/crown-solid.imageset/crown-solid.png new file mode 100644 index 0000000..63c1588 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/crown-solid.imageset/crown-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/crown-solid.imageset/crown-solid@2x.png b/Shared/Assets.xcassets/custom_icon/crown-solid.imageset/crown-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/crown-solid.imageset/crown-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/crown-solid.imageset/crown-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/crown-solid.imageset/crown-solid@3x.png b/Shared/Assets.xcassets/custom_icon/crown-solid.imageset/crown-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/crown-solid.imageset/crown-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/crown-solid.imageset/crown-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/dharmachakra-solid.png b/Shared/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/dharmachakra-solid.png new file mode 100644 index 0000000..72cec6a Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/dharmachakra-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/dharmachakra-solid@2x.png b/Shared/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/dharmachakra-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/dharmachakra-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/dharmachakra-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/dharmachakra-solid@3x.png b/Shared/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/dharmachakra-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/dharmachakra-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/dharmachakra-solid.imageset/dharmachakra-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/dice-d20-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/dice-d20-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dice-d20-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/dice-d20-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/dice-d20-solid.imageset/dice-d20-solid.png b/Shared/Assets.xcassets/custom_icon/dice-d20-solid.imageset/dice-d20-solid.png new file mode 100644 index 0000000..6f69604 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/dice-d20-solid.imageset/dice-d20-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/dice-d20-solid.imageset/dice-d20-solid@2x.png b/Shared/Assets.xcassets/custom_icon/dice-d20-solid.imageset/dice-d20-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dice-d20-solid.imageset/dice-d20-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/dice-d20-solid.imageset/dice-d20-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/dice-d20-solid.imageset/dice-d20-solid@3x.png b/Shared/Assets.xcassets/custom_icon/dice-d20-solid.imageset/dice-d20-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dice-d20-solid.imageset/dice-d20-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/dice-d20-solid.imageset/dice-d20-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/dice-one-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/dice-one-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dice-one-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/dice-one-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/dice-one-solid.imageset/dice-one-solid.png b/Shared/Assets.xcassets/custom_icon/dice-one-solid.imageset/dice-one-solid.png new file mode 100644 index 0000000..e77d359 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/dice-one-solid.imageset/dice-one-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/dice-one-solid.imageset/dice-one-solid@2x.png b/Shared/Assets.xcassets/custom_icon/dice-one-solid.imageset/dice-one-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dice-one-solid.imageset/dice-one-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/dice-one-solid.imageset/dice-one-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/dice-one-solid.imageset/dice-one-solid@3x.png b/Shared/Assets.xcassets/custom_icon/dice-one-solid.imageset/dice-one-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dice-one-solid.imageset/dice-one-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/dice-one-solid.imageset/dice-one-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/divide-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/divide-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/divide-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/divide-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/divide-solid.imageset/divide-solid.png b/Shared/Assets.xcassets/custom_icon/divide-solid.imageset/divide-solid.png new file mode 100644 index 0000000..67562d7 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/divide-solid.imageset/divide-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/divide-solid.imageset/divide-solid@2x.png b/Shared/Assets.xcassets/custom_icon/divide-solid.imageset/divide-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/divide-solid.imageset/divide-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/divide-solid.imageset/divide-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/divide-solid.imageset/divide-solid@3x.png b/Shared/Assets.xcassets/custom_icon/divide-solid.imageset/divide-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/divide-solid.imageset/divide-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/divide-solid.imageset/divide-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/dollar-sign-solid.png b/Shared/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/dollar-sign-solid.png new file mode 100644 index 0000000..907cc09 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/dollar-sign-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/dollar-sign-solid@2x.png b/Shared/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/dollar-sign-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/dollar-sign-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/dollar-sign-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/dollar-sign-solid@3x.png b/Shared/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/dollar-sign-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/dollar-sign-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/dollar-sign-solid.imageset/dollar-sign-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/dragon-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/dragon-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dragon-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/dragon-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/dragon-solid.imageset/dragon-solid.png b/Shared/Assets.xcassets/custom_icon/dragon-solid.imageset/dragon-solid.png new file mode 100644 index 0000000..0347b20 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/dragon-solid.imageset/dragon-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/dragon-solid.imageset/dragon-solid@2x.png b/Shared/Assets.xcassets/custom_icon/dragon-solid.imageset/dragon-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dragon-solid.imageset/dragon-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/dragon-solid.imageset/dragon-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/dragon-solid.imageset/dragon-solid@3x.png b/Shared/Assets.xcassets/custom_icon/dragon-solid.imageset/dragon-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/dragon-solid.imageset/dragon-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/dragon-solid.imageset/dragon-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/egg-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/egg-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/egg-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/egg-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/egg-solid.imageset/egg-solid.png b/Shared/Assets.xcassets/custom_icon/egg-solid.imageset/egg-solid.png new file mode 100644 index 0000000..f4d08cc Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/egg-solid.imageset/egg-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/egg-solid.imageset/egg-solid@2x.png b/Shared/Assets.xcassets/custom_icon/egg-solid.imageset/egg-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/egg-solid.imageset/egg-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/egg-solid.imageset/egg-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/egg-solid.imageset/egg-solid@3x.png b/Shared/Assets.xcassets/custom_icon/egg-solid.imageset/egg-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/egg-solid.imageset/egg-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/egg-solid.imageset/egg-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/empire-brands.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/empire-brands.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/empire-brands.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/empire-brands.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/empire-brands.imageset/empire-brands.png b/Shared/Assets.xcassets/custom_icon/empire-brands.imageset/empire-brands.png new file mode 100644 index 0000000..5703c62 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/empire-brands.imageset/empire-brands.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/empire-brands.imageset/empire-brands@2x.png b/Shared/Assets.xcassets/custom_icon/empire-brands.imageset/empire-brands@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/empire-brands.imageset/empire-brands@2x.png rename to Shared/Assets.xcassets/custom_icon/empire-brands.imageset/empire-brands@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/empire-brands.imageset/empire-brands@3x.png b/Shared/Assets.xcassets/custom_icon/empire-brands.imageset/empire-brands@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/empire-brands.imageset/empire-brands@3x.png rename to Shared/Assets.xcassets/custom_icon/empire-brands.imageset/empire-brands@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/exclamation-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/exclamation-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/exclamation-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/exclamation-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/exclamation-solid.imageset/exclamation-solid.png b/Shared/Assets.xcassets/custom_icon/exclamation-solid.imageset/exclamation-solid.png new file mode 100644 index 0000000..91dc8fd Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/exclamation-solid.imageset/exclamation-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/exclamation-solid.imageset/exclamation-solid@2x.png b/Shared/Assets.xcassets/custom_icon/exclamation-solid.imageset/exclamation-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/exclamation-solid.imageset/exclamation-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/exclamation-solid.imageset/exclamation-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/exclamation-solid.imageset/exclamation-solid@3x.png b/Shared/Assets.xcassets/custom_icon/exclamation-solid.imageset/exclamation-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/exclamation-solid.imageset/exclamation-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/exclamation-solid.imageset/exclamation-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/eye-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/eye-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/eye-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/eye-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/eye-solid.imageset/eye-solid.png b/Shared/Assets.xcassets/custom_icon/eye-solid.imageset/eye-solid.png new file mode 100644 index 0000000..829214e Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/eye-solid.imageset/eye-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/eye-solid.imageset/eye-solid@2x.png b/Shared/Assets.xcassets/custom_icon/eye-solid.imageset/eye-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/eye-solid.imageset/eye-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/eye-solid.imageset/eye-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/eye-solid.imageset/eye-solid@3x.png b/Shared/Assets.xcassets/custom_icon/eye-solid.imageset/eye-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/eye-solid.imageset/eye-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/eye-solid.imageset/eye-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/fan-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/fan-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fan-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/fan-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/fan-solid.imageset/fan-solid.png b/Shared/Assets.xcassets/custom_icon/fan-solid.imageset/fan-solid.png new file mode 100644 index 0000000..82ba874 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/fan-solid.imageset/fan-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/fan-solid.imageset/fan-solid@2x.png b/Shared/Assets.xcassets/custom_icon/fan-solid.imageset/fan-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fan-solid.imageset/fan-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/fan-solid.imageset/fan-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/fan-solid.imageset/fan-solid@3x.png b/Shared/Assets.xcassets/custom_icon/fan-solid.imageset/fan-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fan-solid.imageset/fan-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/fan-solid.imageset/fan-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/fire-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/fire-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fire-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/fire-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/fire-solid.imageset/fire-solid.png b/Shared/Assets.xcassets/custom_icon/fire-solid.imageset/fire-solid.png new file mode 100644 index 0000000..3954b16 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/fire-solid.imageset/fire-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/fire-solid.imageset/fire-solid@2x.png b/Shared/Assets.xcassets/custom_icon/fire-solid.imageset/fire-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fire-solid.imageset/fire-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/fire-solid.imageset/fire-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/fire-solid.imageset/fire-solid@3x.png b/Shared/Assets.xcassets/custom_icon/fire-solid.imageset/fire-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fire-solid.imageset/fire-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/fire-solid.imageset/fire-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/floppy-disk-solid.png b/Shared/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/floppy-disk-solid.png new file mode 100644 index 0000000..24299aa Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/floppy-disk-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/floppy-disk-solid@2x.png b/Shared/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/floppy-disk-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/floppy-disk-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/floppy-disk-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/floppy-disk-solid@3x.png b/Shared/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/floppy-disk-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/floppy-disk-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/floppy-disk-solid.imageset/floppy-disk-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/fly-brands.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/fly-brands.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fly-brands.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/fly-brands.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/fly-brands.imageset/fly-brands.png b/Shared/Assets.xcassets/custom_icon/fly-brands.imageset/fly-brands.png new file mode 100644 index 0000000..f23614d Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/fly-brands.imageset/fly-brands.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/fly-brands.imageset/fly-brands@2x.png b/Shared/Assets.xcassets/custom_icon/fly-brands.imageset/fly-brands@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fly-brands.imageset/fly-brands@2x.png rename to Shared/Assets.xcassets/custom_icon/fly-brands.imageset/fly-brands@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/fly-brands.imageset/fly-brands@3x.png b/Shared/Assets.xcassets/custom_icon/fly-brands.imageset/fly-brands@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fly-brands.imageset/fly-brands@3x.png rename to Shared/Assets.xcassets/custom_icon/fly-brands.imageset/fly-brands@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/fort-awesome-brands.png b/Shared/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/fort-awesome-brands.png new file mode 100644 index 0000000..4710433 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/fort-awesome-brands.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/fort-awesome-brands@2x.png b/Shared/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/fort-awesome-brands@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/fort-awesome-brands@2x.png rename to Shared/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/fort-awesome-brands@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/fort-awesome-brands@3x.png b/Shared/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/fort-awesome-brands@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/fort-awesome-brands@3x.png rename to Shared/Assets.xcassets/custom_icon/fort-awesome-brands.imageset/fort-awesome-brands@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/frown-regular.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/frown-regular.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/frown-regular.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/frown-regular.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/frown-regular.imageset/frown-regular.png b/Shared/Assets.xcassets/custom_icon/frown-regular.imageset/frown-regular.png new file mode 100644 index 0000000..fd959e4 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/frown-regular.imageset/frown-regular.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/frown-regular.imageset/frown-regular@2x.png b/Shared/Assets.xcassets/custom_icon/frown-regular.imageset/frown-regular@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/frown-regular.imageset/frown-regular@2x.png rename to Shared/Assets.xcassets/custom_icon/frown-regular.imageset/frown-regular@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/frown-regular.imageset/frown-regular@3x.png b/Shared/Assets.xcassets/custom_icon/frown-regular.imageset/frown-regular@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/frown-regular.imageset/frown-regular@3x.png rename to Shared/Assets.xcassets/custom_icon/frown-regular.imageset/frown-regular@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/futbol-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/futbol-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/futbol-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/futbol-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/futbol-solid.imageset/futbol-solid.png b/Shared/Assets.xcassets/custom_icon/futbol-solid.imageset/futbol-solid.png new file mode 100644 index 0000000..3d76740 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/futbol-solid.imageset/futbol-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/futbol-solid.imageset/futbol-solid@2x.png b/Shared/Assets.xcassets/custom_icon/futbol-solid.imageset/futbol-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/futbol-solid.imageset/futbol-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/futbol-solid.imageset/futbol-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/futbol-solid.imageset/futbol-solid@3x.png b/Shared/Assets.xcassets/custom_icon/futbol-solid.imageset/futbol-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/futbol-solid.imageset/futbol-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/futbol-solid.imageset/futbol-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/gem-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/gem-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/gem-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/gem-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/gem-solid.imageset/gem-solid.png b/Shared/Assets.xcassets/custom_icon/gem-solid.imageset/gem-solid.png new file mode 100644 index 0000000..53417c5 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/gem-solid.imageset/gem-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/gem-solid.imageset/gem-solid@2x.png b/Shared/Assets.xcassets/custom_icon/gem-solid.imageset/gem-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/gem-solid.imageset/gem-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/gem-solid.imageset/gem-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/gem-solid.imageset/gem-solid@3x.png b/Shared/Assets.xcassets/custom_icon/gem-solid.imageset/gem-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/gem-solid.imageset/gem-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/gem-solid.imageset/gem-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/grin-regular.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/grin-regular.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/grin-regular.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/grin-regular.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/grin-regular.imageset/grin-regular.png b/Shared/Assets.xcassets/custom_icon/grin-regular.imageset/grin-regular.png new file mode 100644 index 0000000..181cc39 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/grin-regular.imageset/grin-regular.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/grin-regular.imageset/grin-regular@2x.png b/Shared/Assets.xcassets/custom_icon/grin-regular.imageset/grin-regular@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/grin-regular.imageset/grin-regular@2x.png rename to Shared/Assets.xcassets/custom_icon/grin-regular.imageset/grin-regular@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/grin-regular.imageset/grin-regular@3x.png b/Shared/Assets.xcassets/custom_icon/grin-regular.imageset/grin-regular@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/grin-regular.imageset/grin-regular@3x.png rename to Shared/Assets.xcassets/custom_icon/grin-regular.imageset/grin-regular@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/heart-crack-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/heart-crack-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/heart-crack-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/heart-crack-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/heart-crack-solid.imageset/heart-crack-solid.png b/Shared/Assets.xcassets/custom_icon/heart-crack-solid.imageset/heart-crack-solid.png new file mode 100644 index 0000000..3c7b53a Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/heart-crack-solid.imageset/heart-crack-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/heart-crack-solid.imageset/heart-crack-solid@2x.png b/Shared/Assets.xcassets/custom_icon/heart-crack-solid.imageset/heart-crack-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/heart-crack-solid.imageset/heart-crack-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/heart-crack-solid.imageset/heart-crack-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/heart-crack-solid.imageset/heart-crack-solid@3x.png b/Shared/Assets.xcassets/custom_icon/heart-crack-solid.imageset/heart-crack-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/heart-crack-solid.imageset/heart-crack-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/heart-crack-solid.imageset/heart-crack-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/heart-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/heart-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/heart-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/heart-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/heart-solid.imageset/heart-solid.png b/Shared/Assets.xcassets/custom_icon/heart-solid.imageset/heart-solid.png new file mode 100644 index 0000000..70a0293 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/heart-solid.imageset/heart-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/heart-solid.imageset/heart-solid@2x.png b/Shared/Assets.xcassets/custom_icon/heart-solid.imageset/heart-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/heart-solid.imageset/heart-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/heart-solid.imageset/heart-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/heart-solid.imageset/heart-solid@3x.png b/Shared/Assets.xcassets/custom_icon/heart-solid.imageset/heart-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/heart-solid.imageset/heart-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/heart-solid.imageset/heart-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/hotjar-brands.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/hotjar-brands.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/hotjar-brands.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/hotjar-brands.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/hotjar-brands.imageset/hotjar-brands.png b/Shared/Assets.xcassets/custom_icon/hotjar-brands.imageset/hotjar-brands.png new file mode 100644 index 0000000..712779f Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/hotjar-brands.imageset/hotjar-brands.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/hotjar-brands.imageset/hotjar-brands@2x.png b/Shared/Assets.xcassets/custom_icon/hotjar-brands.imageset/hotjar-brands@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/hotjar-brands.imageset/hotjar-brands@2x.png rename to Shared/Assets.xcassets/custom_icon/hotjar-brands.imageset/hotjar-brands@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/hotjar-brands.imageset/hotjar-brands@3x.png b/Shared/Assets.xcassets/custom_icon/hotjar-brands.imageset/hotjar-brands@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/hotjar-brands.imageset/hotjar-brands@3x.png rename to Shared/Assets.xcassets/custom_icon/hotjar-brands.imageset/hotjar-brands@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/jet-fighter-solid.png b/Shared/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/jet-fighter-solid.png new file mode 100644 index 0000000..43e7f40 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/jet-fighter-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/jet-fighter-solid@2x.png b/Shared/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/jet-fighter-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/jet-fighter-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/jet-fighter-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/jet-fighter-solid@3x.png b/Shared/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/jet-fighter-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/jet-fighter-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/jet-fighter-solid.imageset/jet-fighter-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/lemon-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/lemon-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/lemon-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/lemon-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/lemon-solid.imageset/lemon-solid.png b/Shared/Assets.xcassets/custom_icon/lemon-solid.imageset/lemon-solid.png new file mode 100644 index 0000000..1e368bc Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/lemon-solid.imageset/lemon-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/lemon-solid.imageset/lemon-solid@2x.png b/Shared/Assets.xcassets/custom_icon/lemon-solid.imageset/lemon-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/lemon-solid.imageset/lemon-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/lemon-solid.imageset/lemon-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/lemon-solid.imageset/lemon-solid@3x.png b/Shared/Assets.xcassets/custom_icon/lemon-solid.imageset/lemon-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/lemon-solid.imageset/lemon-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/lemon-solid.imageset/lemon-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/life-ring-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/life-ring-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/life-ring-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/life-ring-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/life-ring-solid.imageset/life-ring-solid.png b/Shared/Assets.xcassets/custom_icon/life-ring-solid.imageset/life-ring-solid.png new file mode 100644 index 0000000..18d8d9a Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/life-ring-solid.imageset/life-ring-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/life-ring-solid.imageset/life-ring-solid@2x.png b/Shared/Assets.xcassets/custom_icon/life-ring-solid.imageset/life-ring-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/life-ring-solid.imageset/life-ring-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/life-ring-solid.imageset/life-ring-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/life-ring-solid.imageset/life-ring-solid@3x.png b/Shared/Assets.xcassets/custom_icon/life-ring-solid.imageset/life-ring-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/life-ring-solid.imageset/life-ring-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/life-ring-solid.imageset/life-ring-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/lightbulb-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/lightbulb-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/lightbulb-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/lightbulb-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/lightbulb-solid.imageset/lightbulb-solid.png b/Shared/Assets.xcassets/custom_icon/lightbulb-solid.imageset/lightbulb-solid.png new file mode 100644 index 0000000..e651fea Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/lightbulb-solid.imageset/lightbulb-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/lightbulb-solid.imageset/lightbulb-solid@2x.png b/Shared/Assets.xcassets/custom_icon/lightbulb-solid.imageset/lightbulb-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/lightbulb-solid.imageset/lightbulb-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/lightbulb-solid.imageset/lightbulb-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/lightbulb-solid.imageset/lightbulb-solid@3x.png b/Shared/Assets.xcassets/custom_icon/lightbulb-solid.imageset/lightbulb-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/lightbulb-solid.imageset/lightbulb-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/lightbulb-solid.imageset/lightbulb-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/location-crosshairs-solid.png b/Shared/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/location-crosshairs-solid.png new file mode 100644 index 0000000..7a876cb Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/location-crosshairs-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/location-crosshairs-solid@2x.png b/Shared/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/location-crosshairs-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/location-crosshairs-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/location-crosshairs-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/location-crosshairs-solid@3x.png b/Shared/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/location-crosshairs-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/location-crosshairs-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/location-crosshairs-solid.imageset/location-crosshairs-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/meh-regular.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/meh-regular.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/meh-regular.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/meh-regular.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/meh-regular.imageset/meh-regular.png b/Shared/Assets.xcassets/custom_icon/meh-regular.imageset/meh-regular.png new file mode 100644 index 0000000..3be0f95 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/meh-regular.imageset/meh-regular.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/meh-regular.imageset/meh-regular@2x.png b/Shared/Assets.xcassets/custom_icon/meh-regular.imageset/meh-regular@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/meh-regular.imageset/meh-regular@2x.png rename to Shared/Assets.xcassets/custom_icon/meh-regular.imageset/meh-regular@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/meh-regular.imageset/meh-regular@3x.png b/Shared/Assets.xcassets/custom_icon/meh-regular.imageset/meh-regular@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/meh-regular.imageset/meh-regular@3x.png rename to Shared/Assets.xcassets/custom_icon/meh-regular.imageset/meh-regular@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/meteor-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/meteor-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/meteor-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/meteor-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/meteor-solid.imageset/meteor-solid.png b/Shared/Assets.xcassets/custom_icon/meteor-solid.imageset/meteor-solid.png new file mode 100644 index 0000000..48d5f26 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/meteor-solid.imageset/meteor-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/meteor-solid.imageset/meteor-solid@2x.png b/Shared/Assets.xcassets/custom_icon/meteor-solid.imageset/meteor-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/meteor-solid.imageset/meteor-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/meteor-solid.imageset/meteor-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/meteor-solid.imageset/meteor-solid@3x.png b/Shared/Assets.xcassets/custom_icon/meteor-solid.imageset/meteor-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/meteor-solid.imageset/meteor-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/meteor-solid.imageset/meteor-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/microphone-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/microphone-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/microphone-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/microphone-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/microphone-solid.imageset/microphone-solid.png b/Shared/Assets.xcassets/custom_icon/microphone-solid.imageset/microphone-solid.png new file mode 100644 index 0000000..606669c Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/microphone-solid.imageset/microphone-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/microphone-solid.imageset/microphone-solid@2x.png b/Shared/Assets.xcassets/custom_icon/microphone-solid.imageset/microphone-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/microphone-solid.imageset/microphone-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/microphone-solid.imageset/microphone-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/microphone-solid.imageset/microphone-solid@3x.png b/Shared/Assets.xcassets/custom_icon/microphone-solid.imageset/microphone-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/microphone-solid.imageset/microphone-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/microphone-solid.imageset/microphone-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/moon-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/moon-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/moon-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/moon-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/moon-solid.imageset/moon-solid.png b/Shared/Assets.xcassets/custom_icon/moon-solid.imageset/moon-solid.png new file mode 100644 index 0000000..d66157b Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/moon-solid.imageset/moon-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/moon-solid.imageset/moon-solid@2x.png b/Shared/Assets.xcassets/custom_icon/moon-solid.imageset/moon-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/moon-solid.imageset/moon-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/moon-solid.imageset/moon-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/moon-solid.imageset/moon-solid@3x.png b/Shared/Assets.xcassets/custom_icon/moon-solid.imageset/moon-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/moon-solid.imageset/moon-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/moon-solid.imageset/moon-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/peace-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/peace-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/peace-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/peace-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/peace-solid.imageset/peace-solid.png b/Shared/Assets.xcassets/custom_icon/peace-solid.imageset/peace-solid.png new file mode 100644 index 0000000..e0f9928 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/peace-solid.imageset/peace-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/peace-solid.imageset/peace-solid@2x.png b/Shared/Assets.xcassets/custom_icon/peace-solid.imageset/peace-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/peace-solid.imageset/peace-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/peace-solid.imageset/peace-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/peace-solid.imageset/peace-solid@3x.png b/Shared/Assets.xcassets/custom_icon/peace-solid.imageset/peace-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/peace-solid.imageset/peace-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/peace-solid.imageset/peace-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/pizza-slice-solid.png b/Shared/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/pizza-slice-solid.png new file mode 100644 index 0000000..8a4758a Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/pizza-slice-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/pizza-slice-solid@2x.png b/Shared/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/pizza-slice-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/pizza-slice-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/pizza-slice-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/pizza-slice-solid@3x.png b/Shared/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/pizza-slice-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/pizza-slice-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/pizza-slice-solid.imageset/pizza-slice-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/poo-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/poo-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/poo-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/poo-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/poo-solid.imageset/poo-solid.png b/Shared/Assets.xcassets/custom_icon/poo-solid.imageset/poo-solid.png new file mode 100644 index 0000000..b6822bf Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/poo-solid.imageset/poo-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/poo-solid.imageset/poo-solid@2x.png b/Shared/Assets.xcassets/custom_icon/poo-solid.imageset/poo-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/poo-solid.imageset/poo-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/poo-solid.imageset/poo-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/poo-solid.imageset/poo-solid@3x.png b/Shared/Assets.xcassets/custom_icon/poo-solid.imageset/poo-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/poo-solid.imageset/poo-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/poo-solid.imageset/poo-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/poo-storm-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/poo-storm-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/poo-storm-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/poo-storm-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/poo-storm-solid.imageset/poo-storm-solid.png b/Shared/Assets.xcassets/custom_icon/poo-storm-solid.imageset/poo-storm-solid.png new file mode 100644 index 0000000..f523e10 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/poo-storm-solid.imageset/poo-storm-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/poo-storm-solid.imageset/poo-storm-solid@2x.png b/Shared/Assets.xcassets/custom_icon/poo-storm-solid.imageset/poo-storm-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/poo-storm-solid.imageset/poo-storm-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/poo-storm-solid.imageset/poo-storm-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/poo-storm-solid.imageset/poo-storm-solid@3x.png b/Shared/Assets.xcassets/custom_icon/poo-storm-solid.imageset/poo-storm-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/poo-storm-solid.imageset/poo-storm-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/poo-storm-solid.imageset/poo-storm-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/rainbow-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/rainbow-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/rainbow-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/rainbow-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/rainbow-solid.imageset/rainbow-solid.png b/Shared/Assets.xcassets/custom_icon/rainbow-solid.imageset/rainbow-solid.png new file mode 100644 index 0000000..3f079f9 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/rainbow-solid.imageset/rainbow-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/rainbow-solid.imageset/rainbow-solid@2x.png b/Shared/Assets.xcassets/custom_icon/rainbow-solid.imageset/rainbow-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/rainbow-solid.imageset/rainbow-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/rainbow-solid.imageset/rainbow-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/rainbow-solid.imageset/rainbow-solid@3x.png b/Shared/Assets.xcassets/custom_icon/rainbow-solid.imageset/rainbow-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/rainbow-solid.imageset/rainbow-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/rainbow-solid.imageset/rainbow-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/sad-tear-regular.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/sad-tear-regular.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/sad-tear-regular.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/sad-tear-regular.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/sad-tear-regular.imageset/sad-tear-regular.png b/Shared/Assets.xcassets/custom_icon/sad-tear-regular.imageset/sad-tear-regular.png new file mode 100644 index 0000000..822d76d Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/sad-tear-regular.imageset/sad-tear-regular.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/sad-tear-regular.imageset/sad-tear-regular@2x.png b/Shared/Assets.xcassets/custom_icon/sad-tear-regular.imageset/sad-tear-regular@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/sad-tear-regular.imageset/sad-tear-regular@2x.png rename to Shared/Assets.xcassets/custom_icon/sad-tear-regular.imageset/sad-tear-regular@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/sad-tear-regular.imageset/sad-tear-regular@3x.png b/Shared/Assets.xcassets/custom_icon/sad-tear-regular.imageset/sad-tear-regular@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/sad-tear-regular.imageset/sad-tear-regular@3x.png rename to Shared/Assets.xcassets/custom_icon/sad-tear-regular.imageset/sad-tear-regular@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/shuttle-space-solid.png b/Shared/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/shuttle-space-solid.png new file mode 100644 index 0000000..e5bfb71 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/shuttle-space-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/shuttle-space-solid@2x.png b/Shared/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/shuttle-space-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/shuttle-space-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/shuttle-space-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/shuttle-space-solid@3x.png b/Shared/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/shuttle-space-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/shuttle-space-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/shuttle-space-solid.imageset/shuttle-space-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/skull-crossbones-solid.png b/Shared/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/skull-crossbones-solid.png new file mode 100644 index 0000000..99a58ff Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/skull-crossbones-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/skull-crossbones-solid@2x.png b/Shared/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/skull-crossbones-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/skull-crossbones-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/skull-crossbones-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/skull-crossbones-solid@3x.png b/Shared/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/skull-crossbones-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/skull-crossbones-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/skull-crossbones-solid.imageset/skull-crossbones-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/skull-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/skull-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/skull-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/skull-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/skull-solid.imageset/skull-solid.png b/Shared/Assets.xcassets/custom_icon/skull-solid.imageset/skull-solid.png new file mode 100644 index 0000000..705b611 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/skull-solid.imageset/skull-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/skull-solid.imageset/skull-solid@2x.png b/Shared/Assets.xcassets/custom_icon/skull-solid.imageset/skull-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/skull-solid.imageset/skull-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/skull-solid.imageset/skull-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/skull-solid.imageset/skull-solid@3x.png b/Shared/Assets.xcassets/custom_icon/skull-solid.imageset/skull-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/skull-solid.imageset/skull-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/skull-solid.imageset/skull-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/smile-beam-regular.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/smile-beam-regular.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/smile-beam-regular.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/smile-beam-regular.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/smile-beam-regular.imageset/smile-beam-regular.png b/Shared/Assets.xcassets/custom_icon/smile-beam-regular.imageset/smile-beam-regular.png new file mode 100644 index 0000000..59873c1 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/smile-beam-regular.imageset/smile-beam-regular.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/smile-beam-regular.imageset/smile-beam-regular@2x.png b/Shared/Assets.xcassets/custom_icon/smile-beam-regular.imageset/smile-beam-regular@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/smile-beam-regular.imageset/smile-beam-regular@2x.png rename to Shared/Assets.xcassets/custom_icon/smile-beam-regular.imageset/smile-beam-regular@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/smile-beam-regular.imageset/smile-beam-regular@3x.png b/Shared/Assets.xcassets/custom_icon/smile-beam-regular.imageset/smile-beam-regular@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/smile-beam-regular.imageset/smile-beam-regular@3x.png rename to Shared/Assets.xcassets/custom_icon/smile-beam-regular.imageset/smile-beam-regular@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/star-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/star-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/star-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/star-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/star-solid.imageset/star-solid.png b/Shared/Assets.xcassets/custom_icon/star-solid.imageset/star-solid.png new file mode 100644 index 0000000..0d538eb Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/star-solid.imageset/star-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/star-solid.imageset/star-solid@2x.png b/Shared/Assets.xcassets/custom_icon/star-solid.imageset/star-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/star-solid.imageset/star-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/star-solid.imageset/star-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/star-solid.imageset/star-solid@3x.png b/Shared/Assets.xcassets/custom_icon/star-solid.imageset/star-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/star-solid.imageset/star-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/star-solid.imageset/star-solid@3x.png diff --git a/Shared2/Assets.xcassets/custom_icon/virus-covid-solid.imageset/Contents.json b/Shared/Assets.xcassets/custom_icon/virus-covid-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/virus-covid-solid.imageset/Contents.json rename to Shared/Assets.xcassets/custom_icon/virus-covid-solid.imageset/Contents.json diff --git a/Shared/Assets.xcassets/custom_icon/virus-covid-solid.imageset/virus-covid-solid.png b/Shared/Assets.xcassets/custom_icon/virus-covid-solid.imageset/virus-covid-solid.png new file mode 100644 index 0000000..99e1748 Binary files /dev/null and b/Shared/Assets.xcassets/custom_icon/virus-covid-solid.imageset/virus-covid-solid.png differ diff --git a/Shared2/Assets.xcassets/custom_icon/virus-covid-solid.imageset/virus-covid-solid@2x.png b/Shared/Assets.xcassets/custom_icon/virus-covid-solid.imageset/virus-covid-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/virus-covid-solid.imageset/virus-covid-solid@2x.png rename to Shared/Assets.xcassets/custom_icon/virus-covid-solid.imageset/virus-covid-solid@2x.png diff --git a/Shared2/Assets.xcassets/custom_icon/virus-covid-solid.imageset/virus-covid-solid@3x.png b/Shared/Assets.xcassets/custom_icon/virus-covid-solid.imageset/virus-covid-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/custom_icon/virus-covid-solid.imageset/virus-covid-solid@3x.png rename to Shared/Assets.xcassets/custom_icon/virus-covid-solid.imageset/virus-covid-solid@3x.png diff --git a/Shared/Assets.xcassets/default_image/Contents.json b/Shared/Assets.xcassets/default_image/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Shared/Assets.xcassets/default_image/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared2/Assets.xcassets/default_image/average.imageset/Contents.json b/Shared/Assets.xcassets/default_image/average.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/default_image/average.imageset/Contents.json rename to Shared/Assets.xcassets/default_image/average.imageset/Contents.json diff --git a/Shared/Assets.xcassets/default_image/average.imageset/meh-regular.png b/Shared/Assets.xcassets/default_image/average.imageset/meh-regular.png new file mode 100644 index 0000000..6a59218 Binary files /dev/null and b/Shared/Assets.xcassets/default_image/average.imageset/meh-regular.png differ diff --git a/Shared2/Assets.xcassets/default_image/average.imageset/meh-regular@2x.png b/Shared/Assets.xcassets/default_image/average.imageset/meh-regular@2x.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/average.imageset/meh-regular@2x.png rename to Shared/Assets.xcassets/default_image/average.imageset/meh-regular@2x.png diff --git a/Shared2/Assets.xcassets/default_image/average.imageset/meh-regular@3x.png b/Shared/Assets.xcassets/default_image/average.imageset/meh-regular@3x.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/average.imageset/meh-regular@3x.png rename to Shared/Assets.xcassets/default_image/average.imageset/meh-regular@3x.png diff --git a/Shared2/Assets.xcassets/default_image/bad.imageset/Contents.json b/Shared/Assets.xcassets/default_image/bad.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/default_image/bad.imageset/Contents.json rename to Shared/Assets.xcassets/default_image/bad.imageset/Contents.json diff --git a/Shared/Assets.xcassets/default_image/bad.imageset/frown-regular.png b/Shared/Assets.xcassets/default_image/bad.imageset/frown-regular.png new file mode 100644 index 0000000..c85a63b Binary files /dev/null and b/Shared/Assets.xcassets/default_image/bad.imageset/frown-regular.png differ diff --git a/Shared2/Assets.xcassets/default_image/bad.imageset/frown-regular@2x.png b/Shared/Assets.xcassets/default_image/bad.imageset/frown-regular@2x.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/bad.imageset/frown-regular@2x.png rename to Shared/Assets.xcassets/default_image/bad.imageset/frown-regular@2x.png diff --git a/Shared2/Assets.xcassets/default_image/bad.imageset/frown-regular@3x.png b/Shared/Assets.xcassets/default_image/bad.imageset/frown-regular@3x.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/bad.imageset/frown-regular@3x.png rename to Shared/Assets.xcassets/default_image/bad.imageset/frown-regular@3x.png diff --git a/Shared2/Assets.xcassets/default_image/good.imageset/Contents.json b/Shared/Assets.xcassets/default_image/good.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/default_image/good.imageset/Contents.json rename to Shared/Assets.xcassets/default_image/good.imageset/Contents.json diff --git a/Shared/Assets.xcassets/default_image/good.imageset/grin-regular.png b/Shared/Assets.xcassets/default_image/good.imageset/grin-regular.png new file mode 100644 index 0000000..181cc39 Binary files /dev/null and b/Shared/Assets.xcassets/default_image/good.imageset/grin-regular.png differ diff --git a/Shared2/Assets.xcassets/default_image/good.imageset/grin-regular@2x.png b/Shared/Assets.xcassets/default_image/good.imageset/grin-regular@2x.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/good.imageset/grin-regular@2x.png rename to Shared/Assets.xcassets/default_image/good.imageset/grin-regular@2x.png diff --git a/Shared2/Assets.xcassets/default_image/good.imageset/grin-regular@3x.png b/Shared/Assets.xcassets/default_image/good.imageset/grin-regular@3x.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/good.imageset/grin-regular@3x.png rename to Shared/Assets.xcassets/default_image/good.imageset/grin-regular@3x.png diff --git a/Shared2/Assets.xcassets/default_image/great.imageset/Contents.json b/Shared/Assets.xcassets/default_image/great.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/default_image/great.imageset/Contents.json rename to Shared/Assets.xcassets/default_image/great.imageset/Contents.json diff --git a/Shared/Assets.xcassets/default_image/great.imageset/smile-beam-regular.png b/Shared/Assets.xcassets/default_image/great.imageset/smile-beam-regular.png new file mode 100644 index 0000000..f445029 Binary files /dev/null and b/Shared/Assets.xcassets/default_image/great.imageset/smile-beam-regular.png differ diff --git a/Shared2/Assets.xcassets/default_image/great.imageset/smile-beam-regular@2x.png b/Shared/Assets.xcassets/default_image/great.imageset/smile-beam-regular@2x.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/great.imageset/smile-beam-regular@2x.png rename to Shared/Assets.xcassets/default_image/great.imageset/smile-beam-regular@2x.png diff --git a/Shared2/Assets.xcassets/default_image/great.imageset/smile-beam-regular@3x.png b/Shared/Assets.xcassets/default_image/great.imageset/smile-beam-regular@3x.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/great.imageset/smile-beam-regular@3x.png rename to Shared/Assets.xcassets/default_image/great.imageset/smile-beam-regular@3x.png diff --git a/Shared2/Assets.xcassets/default_image/horrible.imageset/Contents.json b/Shared/Assets.xcassets/default_image/horrible.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/default_image/horrible.imageset/Contents.json rename to Shared/Assets.xcassets/default_image/horrible.imageset/Contents.json diff --git a/Shared/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular.png b/Shared/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular.png new file mode 100644 index 0000000..1804bfa Binary files /dev/null and b/Shared/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular.png differ diff --git a/Shared2/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular@2x.png b/Shared/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular@2x.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular@2x.png rename to Shared/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular@2x.png diff --git a/Shared2/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular@3x.png b/Shared/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular@3x.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular@3x.png rename to Shared/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular@3x.png diff --git a/Shared2/Assets.xcassets/default_image/xmark-solid.imageset/Contents.json b/Shared/Assets.xcassets/default_image/xmark-solid.imageset/Contents.json similarity index 100% rename from Shared2/Assets.xcassets/default_image/xmark-solid.imageset/Contents.json rename to Shared/Assets.xcassets/default_image/xmark-solid.imageset/Contents.json diff --git a/Shared2/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid.png b/Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid.png rename to Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid.png diff --git a/Shared2/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@2x.png b/Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@2x.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@2x.png rename to Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@2x.png diff --git a/Shared2/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@3x.png b/Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@3x.png similarity index 100% rename from Shared2/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@3x.png rename to Shared/Assets.xcassets/default_image/xmark-solid.imageset/xmark-solid@3x.png diff --git a/Shared2/BGTask.swift b/Shared/BGTask.swift similarity index 100% rename from Shared2/BGTask.swift rename to Shared/BGTask.swift diff --git a/Shared/Color+Codable.swift b/Shared/Color+Codable.swift new file mode 100644 index 0000000..b5ff0d0 --- /dev/null +++ b/Shared/Color+Codable.swift @@ -0,0 +1,121 @@ +// +// Color+Codable.swift +// FirestoreCodableSamples +// +// Created by Peter Friese on 18.03.21. +// + +import SwiftUI + +// Inspired by https://cocoacasts.com/from-hex-to-uicolor-and-back-in-swift +// Make Color codable. This includes support for transparency. +// See https://www.digitalocean.com/community/tutorials/css-hex-code-colors-alpha-values +extension Color: Codable { + init(hex: String) { + let rgba = hex.toRGBA() + + self.init(.sRGB, + red: Double(rgba.r), + green: Double(rgba.g), + blue: Double(rgba.b), + opacity: Double(rgba.alpha)) + } + + public init(from decoder: Decoder) throws { + let container = try decoder.singleValueContainer() + let hex = try container.decode(String.self) + + self.init(hex: hex) + } + + public func encode(to encoder: Encoder) throws { + var container = encoder.singleValueContainer() + try container.encode(toHex) + } + + var toHex: String? { + return toHex() + } + + func toHex(alpha: Bool = false) -> String? { + guard let components = cgColor?.components, components.count >= 3 else { + return nil + } + + let r = Float(components[0]) + let g = Float(components[1]) + let b = Float(components[2]) + var a = Float(1.0) + + if components.count >= 4 { + a = Float(components[3]) + } + + if alpha { + return String(format: "%02lX%02lX%02lX%02lX", + lroundf(r * 255), + lroundf(g * 255), + lroundf(b * 255), + lroundf(a * 255)) + } + else { + return String(format: "%02lX%02lX%02lX", + lroundf(r * 255), + lroundf(g * 255), + lroundf(b * 255)) + } + } +} + +extension String { + func toRGBA() -> (r: CGFloat, g: CGFloat, b: CGFloat, alpha: CGFloat) { + var hexSanitized = self.trimmingCharacters(in: .whitespacesAndNewlines) + hexSanitized = hexSanitized.replacingOccurrences(of: "#", with: "") + + var rgb: UInt64 = 0 + + var r: CGFloat = 0.0 + var g: CGFloat = 0.0 + var b: CGFloat = 0.0 + var a: CGFloat = 1.0 + + let length = hexSanitized.count + + Scanner(string: hexSanitized).scanHexInt64(&rgb) + + if length == 6 { + r = CGFloat((rgb & 0xFF0000) >> 16) / 255.0 + g = CGFloat((rgb & 0x00FF00) >> 8) / 255.0 + b = CGFloat(rgb & 0x0000FF) / 255.0 + } + else if length == 8 { + r = CGFloat((rgb & 0xFF000000) >> 24) / 255.0 + g = CGFloat((rgb & 0x00FF0000) >> 16) / 255.0 + b = CGFloat((rgb & 0x0000FF00) >> 8) / 255.0 + a = CGFloat(rgb & 0x000000FF) / 255.0 + } + + return (r, g, b, a) + } +} + +extension Color: RawRepresentable { + // TODO: Sort out alpha + public init?(rawValue: Int) { + let red = Double((rawValue & 0xFF0000) >> 16) / 0xFF + let green = Double((rawValue & 0x00FF00) >> 8) / 0xFF + let blue = Double(rawValue & 0x0000FF) / 0xFF + self = Color(red: red, green: green, blue: blue) + } + + public var rawValue: Int { + let red = Int(coreImageColor.red * 255 + 0.5) + let green = Int(coreImageColor.green * 255 + 0.5) + let blue = Int(coreImageColor.blue * 255 + 0.5) + return (red << 16) | (green << 8) | blue + } + + private var coreImageColor: CIColor { + return CIColor(color: UIColor(self)) + } +} diff --git a/Shared/Date+Extensions.swift b/Shared/Date+Extensions.swift new file mode 100644 index 0000000..6be0fb4 --- /dev/null +++ b/Shared/Date+Extensions.swift @@ -0,0 +1,103 @@ +// +// Date+Extensions.swift +// Feels (iOS) +// +// Created by Trey Tartt on 2/19/22. +// + +import Foundation + +extension Date: RawRepresentable { + public var rawValue: String { + self.timeIntervalSinceReferenceDate.description + } + + public init?(rawValue: String) { + self = Date(timeIntervalSinceReferenceDate: Double(rawValue) ?? 0.0) + } + + var startOfDay: Date { + return Calendar.current.startOfDay(for: self) + } + + var startOfMonth: Date { + + let calendar = Calendar(identifier: .gregorian) + let components = calendar.dateComponents([.year, .month], from: self) + + return calendar.date(from: components)! + } + + var endOfDay: Date { + var components = DateComponents() + components.day = 1 + components.second = -1 + return Calendar.current.date(byAdding: components, to: startOfDay)! + } + + var endOfMonth: Date { + var components = DateComponents() + components.month = 1 + components.second = -1 + return Calendar(identifier: .gregorian).date(byAdding: components, to: startOfMonth)! + } + + func toLocalTime() -> Date { + let timezone = TimeZone.current + let seconds = TimeInterval(timezone.secondsFromGMT(for: self)) + return Date(timeInterval: seconds, since: self) + } + + var weekday: Int { + Calendar.current.component(.weekday, from: self) + } + + var firstDayOfTheMonth: Date { + Calendar.current.dateComponents([.calendar, .year,.month], from: self).date! + } + + static public func dates(from fromDate: Date, toDate: Date, includingToDate: Bool = false) -> [Date] { + var dates: [Date] = [] + var date = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: fromDate)! + let toDate = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: toDate)! + + if includingToDate { + while date <= toDate { + dates.append(date) + guard let newDate = Calendar.current.date(byAdding: .day, value: 1, to: date) else { break } + date = newDate + } + } else { + while date < toDate { + dates.append(date) + guard let newDate = Calendar.current.date(byAdding: .day, value: 1, to: date) else { break } + date = newDate + } + } + + return dates + } + + static func dateRange(monthInt: Int, yearInt: Int) -> (startDate: Date, endDate: Date) { + var dateComponents = DateComponents() + dateComponents.year = yearInt + dateComponents.month = monthInt + dateComponents.day = 3 + dateComponents.hour = 12 + var userCalendar = Calendar(identifier: .gregorian) + userCalendar.timeZone = TimeZone(secondsFromGMT: 0)! + let someDateTime = userCalendar.date(from: dateComponents)! + + let startDate = someDateTime.startOfMonth + var endDate = someDateTime.endOfMonth + endDate = Calendar.current.date(byAdding: .hour, value: -8, to: endDate)! + + return (startDate, endDate) + } + + func formattedDate() -> String { + let dateFormatter = DateFormatter() + dateFormatter.dateFormat = "MMM dd, yyyy" + return dateFormatter.string(from: self) + } +} diff --git a/Shared/EventLogger.swift b/Shared/EventLogger.swift new file mode 100644 index 0000000..17586e0 --- /dev/null +++ b/Shared/EventLogger.swift @@ -0,0 +1,19 @@ +// +// EventLogger.swift +// Feels +// +// Created by Trey Tartt on 3/10/22. +// + +import Foundation +// import Firebase // Firebase removed + +class EventLogger { + static func log(event: String, withData data: [String: Any]? = nil) { + // Firebase Analytics disabled + // Analytics.logEvent(event, parameters: data) + #if DEBUG + print("[EventLogger] \(event)", data ?? "") + #endif + } +} diff --git a/Shared/Mooood.xcdatamodeld/.xccurrentversion b/Shared/Feels.xcdatamodeld/.xccurrentversion similarity index 85% rename from Shared/Mooood.xcdatamodeld/.xccurrentversion rename to Shared/Feels.xcdatamodeld/.xccurrentversion index 775cb51..bc6bac5 100644 --- a/Shared/Mooood.xcdatamodeld/.xccurrentversion +++ b/Shared/Feels.xcdatamodeld/.xccurrentversion @@ -3,6 +3,6 @@ _XCCurrentVersionName - Shared.xcdatamodel + Shared 2.xcdatamodel diff --git a/Shared/Feels.xcdatamodeld/Shared 2.xcdatamodel/contents b/Shared/Feels.xcdatamodeld/Shared 2.xcdatamodel/contents new file mode 100644 index 0000000..8863425 --- /dev/null +++ b/Shared/Feels.xcdatamodeld/Shared 2.xcdatamodel/contents @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Shared/Mooood.xcdatamodeld/Shared.xcdatamodel/contents b/Shared/Feels.xcdatamodeld/Shared.xcdatamodel/contents similarity index 62% rename from Shared/Mooood.xcdatamodeld/Shared.xcdatamodel/contents rename to Shared/Feels.xcdatamodeld/Shared.xcdatamodel/contents index 432945a..64afd9a 100644 --- a/Shared/Mooood.xcdatamodeld/Shared.xcdatamodel/contents +++ b/Shared/Feels.xcdatamodeld/Shared.xcdatamodel/contents @@ -1,11 +1,14 @@ - + + + + - + \ No newline at end of file diff --git a/Shared/FeelsApp.swift b/Shared/FeelsApp.swift new file mode 100644 index 0000000..fe6792a --- /dev/null +++ b/Shared/FeelsApp.swift @@ -0,0 +1,67 @@ +// +// FeelsApp.swift +// Shared +// +// Created by Trey Tartt on 1/5/22. +// + +import SwiftUI +import BackgroundTasks +import WidgetKit + +@main +struct FeelsApp: App { + @Environment(\.scenePhase) private var scenePhase + @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate + + let persistenceController = PersistenceController.shared + @StateObject var iapManager = IAPManager() + @AppStorage(UserDefaultsStore.Keys.firstLaunchDate.rawValue, store: GroupUserDefaults.groupDefaults) private var firstLaunchDate = Date() + @State private var showSubscriptionFromWidget = false + + init() { + BGTaskScheduler.shared.cancelAllTaskRequests() + BGTaskScheduler.shared.register(forTaskWithIdentifier: BGTask.updateDBMissingID, using: nil) { (task) in + BGTask.runFillInMissingDatesTask(task: task as! BGProcessingTask) + } + UIApplication.shared.applicationIconBadgeNumber = 0 +// PersistenceController.shared.clearDB() +// PersistenceController.shared.populateMemory() + } + + var body: some Scene { + WindowGroup { + // build these here so when tints and other things get updated the views / their data dont + // have to get redrawn#imageLiteral(resourceName: "simulator_screenshot_0017B4DC-100B-42A3-A406-9019704AE275.png") + MainTabView(dayView: DayView(viewModel: DayViewViewModel(addMonthStartWeekdayPadding: false)), + monthView: MonthView(viewModel: DayViewViewModel(addMonthStartWeekdayPadding: true)), + yearView: YearView(viewModel: YearViewModel()), + customizeView: CustomizeView()) + .environment(\.managedObjectContext, persistenceController.viewContext) + .environmentObject(iapManager) + .sheet(isPresented: $showSubscriptionFromWidget) { + FeelsSubscriptionStoreView() + .environmentObject(iapManager) + } + .onOpenURL { url in + if url.scheme == "feels" && url.host == "subscribe" { + showSubscriptionFromWidget = true + } + } + }.onChange(of: scenePhase) { phase in + if phase == .background { + //BGTask.scheduleBackgroundProcessing() + WidgetCenter.shared.reloadAllTimelines() + } + + if phase == .active { + UIApplication.shared.applicationIconBadgeNumber = 0 + // Check subscription status on each app launch + Task { + await iapManager.checkSubscriptionStatus() + } + } + } + } + +} diff --git a/Shared/GoogleService-Info.plist b/Shared/GoogleService-Info.plist new file mode 100644 index 0000000..4453b48 --- /dev/null +++ b/Shared/GoogleService-Info.plist @@ -0,0 +1,34 @@ + + + + + CLIENT_ID + 946071058799-ennch6m8d30cpio0lrug5v994rktr8m9.apps.googleusercontent.com + REVERSED_CLIENT_ID + com.googleusercontent.apps.946071058799-ennch6m8d30cpio0lrug5v994rktr8m9 + API_KEY + AIzaSyDRIs9buGGPWtECfyhCgFsNvYzvmQnhDr0 + GCM_SENDER_ID + 946071058799 + PLIST_VERSION + 1 + BUNDLE_ID + com.tt.ifeel + PROJECT_ID + ifeels + STORAGE_BUCKET + ifeels.appspot.com + IS_ADS_ENABLED + + IS_ANALYTICS_ENABLED + + IS_APPINVITE_ENABLED + + IS_GCM_ENABLED + + IS_SIGNIN_ENABLED + + GOOGLE_APP_ID + 1:946071058799:ios:10f66b0b5dfe758ab0509a + + diff --git a/Shared2/IAPManager.swift b/Shared/IAPManager.swift similarity index 100% rename from Shared2/IAPManager.swift rename to Shared/IAPManager.swift diff --git a/Shared/LocalNotification.swift b/Shared/LocalNotification.swift new file mode 100644 index 0000000..6df211d --- /dev/null +++ b/Shared/LocalNotification.swift @@ -0,0 +1,131 @@ +// +// LocalNotification.swift +// Feels +// +// Created by Trey Tartt on 1/8/22. +// + +import Foundation +import UserNotifications + +class LocalNotification { + public enum ActionType: String { + case horrible = "HORRIBLE_ACTION" + case bad = "BAD_ACTION" + case average = "AVERAGE_ACTION" + case good = "GOOD_ACTION" + case great = "GREAT_ACTION" + } + static let categoryName = "MOOD_UPDATE" + + public class func testIfEnabled(completion: @escaping (Result) -> Void) { + UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .badge, .sound]) { success, error in + if success { + EventLogger.log(event: "local_notification_enabled") + completion(.success(true)) + } else if let error = error { + EventLogger.log(event: "local_notification_disabled") + completion(.failure(error)) + } + } + } + + public class func rescheduleNotifiations() { + if let data = GroupUserDefaults.groupDefaults.object(forKey: UserDefaultsStore.Keys.savedOnboardingData.rawValue) as? Data, + let model = try? JSONDecoder().decode(OnboardingData.self, from: data) { + LocalNotification.scheduleReminder(atTime: model.date) + } + } + + public class func scheduleReminder(atTime time: Date) { + self.removeNotificaiton() + + LocalNotification.testIfEnabled(completion: { result in + switch result{ + case .success(_): + let _ = LocalNotification.createNotificationCategory() + + let notificationContent = UNMutableNotificationContent() + let strings = UserDefaultsStore.personalityPackable().randomPushNotificationStrings() + notificationContent.title = strings.title + notificationContent.body = strings.body + + notificationContent.badge = NSNumber(value: 1) + notificationContent.sound = .default + notificationContent.categoryIdentifier = LocalNotification.categoryName + + let calendar = Calendar.current + let time = calendar.dateComponents([.hour,.minute], from: time) + + var datComp = DateComponents() + datComp.hour = time.hour + datComp.minute = time.minute + + let trigger = UNCalendarNotificationTrigger(dateMatching: datComp, repeats: true) + let request = UNNotificationRequest(identifier: UUID().uuidString, content: notificationContent, trigger: trigger) + UNUserNotificationCenter.current().add(request) { (error : Error?) in + if let theError = error { + print(theError.localizedDescription) + } + } + case .failure(let error): + print(error) + // Todo: show enable this + break + } + }) + } + + private class func createNotificationCategory() -> UNNotificationCategory { + let moodCategory = + UNNotificationCategory(identifier: LocalNotification.categoryName, + actions: [horribleAction, badAction, averageAction, goodAction, greatAction], + intentIdentifiers: [], + hiddenPreviewsBodyPlaceholder: "", + options: .customDismissAction) + // Register the notification type. + let notificationCenter = UNUserNotificationCenter.current() + notificationCenter.setNotificationCategories([moodCategory]) + + return moodCategory + } + + private class var horribleAction: UNNotificationAction { + let acceptAction = UNNotificationAction(identifier: ActionType.horrible.rawValue, + title: "Horrible", + options: []) + return acceptAction + } + + private class var badAction: UNNotificationAction { + let acceptAction = UNNotificationAction(identifier: ActionType.bad.rawValue, + title: "Bad", + options: []) + return acceptAction + } + + private class var averageAction: UNNotificationAction { + let acceptAction = UNNotificationAction(identifier: ActionType.average.rawValue, + title: "Average", + options: []) + return acceptAction + } + + private class var goodAction: UNNotificationAction { + let acceptAction = UNNotificationAction(identifier: ActionType.good.rawValue, + title: "Good", + options: []) + return acceptAction + } + + private class var greatAction: UNNotificationAction { + let acceptAction = UNNotificationAction(identifier: ActionType.great.rawValue, + title: "Great", + options: []) + return acceptAction + } + + public class func removeNotificaiton() { + UNUserNotificationCenter.current().removeAllPendingNotificationRequests() + } +} diff --git a/Shared/Models/DaysFilterClass.swift b/Shared/Models/DaysFilterClass.swift new file mode 100644 index 0000000..f7c94c8 --- /dev/null +++ b/Shared/Models/DaysFilterClass.swift @@ -0,0 +1,31 @@ +// +// DaysFilterClass.swift +// Feels +// +// Created by Trey Tartt on 3/31/22. +// + +import SwiftUI + +class DaysFilterClass: ObservableObject { + static let shared = DaysFilterClass() + + @Published public var currentFilters = [Int]() + + init() { + let storedDays = UserDefaultsStore.getDaysFilter() + currentFilters = storedDays + } + + func addFilter(newFilter: Int) { + currentFilters.append(newFilter) + currentFilters = UserDefaultsStore.saveDaysFilter(days: currentFilters) + } + + func removeFilter(filter: Int) { + if let index = currentFilters.firstIndex(of: filter) { + currentFilters.remove(at: index) + } + currentFilters = UserDefaultsStore.saveDaysFilter(days: currentFilters) + } +} diff --git a/Shared/Models/DiamondView.swift b/Shared/Models/DiamondView.swift new file mode 100644 index 0000000..3f642c0 --- /dev/null +++ b/Shared/Models/DiamondView.swift @@ -0,0 +1,31 @@ +// +// DiamondView.swift +// Feels +// +// Created by Trey Tartt on 3/20/22. +// + +import SwiftUI + +struct Diamond:Shape { + + func path(in rect: CGRect) -> Path { + var path = Path() + // get the center of the rect + let center = CGPoint(x: rect.midX, y: rect.midY) + // get the starting of our drawing the right side of our diamond + let startingPoint = CGPoint(x: rect.maxX, y: center.y) + // move our start of drawing to the beggining point + path.move(to: startingPoint) + // distance / 2 is our height + // create all our points + let secondPoint = CGPoint(x: center.x, y: rect.maxY) + let thirdPoint = CGPoint(x: rect.minX , y: center.y) + let fourthPoint = CGPoint(x: center.x, y: rect.minY) + path.addLine(to: secondPoint) + path.addLine(to: thirdPoint) + path.addLine(to: fourthPoint) + path.addLine(to: startingPoint) + return path + } +} diff --git a/Shared/Models/Mood.swift b/Shared/Models/Mood.swift new file mode 100644 index 0000000..470195d --- /dev/null +++ b/Shared/Models/Mood.swift @@ -0,0 +1,87 @@ +// +// Mood.swift +// Feels +// +// Created by Trey Tartt on 1/5/22. +// + +import Foundation +import SwiftUI + +enum Mood: Int { + case horrible + case bad + case average + case good + case great + case missing + case placeholder + + var next: Mood { + var moodValue = self.rawValue + moodValue -= 1 + if moodValue < 0 { + moodValue = 4 + } + return Mood.init(rawValue: moodValue) ?? Mood.horrible + } + + var strValue: String { + switch self { + case .horrible: + return String(localized: "mood_value_horrible") + case .bad: + return String(localized: "mood_value_bad") + case .average: + return String(localized: "mood_value_average") + case .good: + return String(localized: "mood_value_good") + case .great: + return String(localized: "mood_value_great") + case .missing: + return String(localized: "mood_value_missing") + case .placeholder: + return String("placeholder") + } + } + + var color: Color { + let moodTint: MoodTintable.Type = UserDefaultsStore.moodTintable() + return moodTint.color(forMood: self) + } + + static var allValues: [Mood] { + return [Mood.horrible, Mood.bad, Mood.average, Mood.good, Mood.great].reversed() + } + + var icon: Image { + let moodImages: MoodImagable.Type = UserDefaultsStore.moodMoodImagable() + return moodImages.icon(forMood: self) + } + + var graphic: Image { + switch self { + + case .horrible: + return Image("HorribleGraphic", bundle: .main) + case .bad: + return Image("BadGraphic", bundle: .main) + case .average: + return Image("AverageGraphic", bundle: .main) + case .good: + return Image("GoodGraphic", bundle: .main) + case .great: + return Image("GreatGraphic", bundle: .main) + case .missing: + return Image("MissingGraphic", bundle: .main) + case .placeholder: + return Image("MissingGraphic", bundle: .main) + } + } +} + +extension Mood: Identifiable { + var id: Int { + rawValue + } +} diff --git a/Shared/Models/MoodEntryExtension.swift b/Shared/Models/MoodEntryExtension.swift new file mode 100644 index 0000000..584acfd --- /dev/null +++ b/Shared/Models/MoodEntryExtension.swift @@ -0,0 +1,26 @@ +// +// MoodEntryExtension.swift +// Feels +// +// Created by Trey Tartt on 1/5/22. +// + +import Foundation + +enum EntryType: Int { + case notification + case header + case listView + case filledInMissing + case widget +} + +extension MoodEntry { + var moodString: String { + return Mood.init(rawValue: Int(self.moodValue))?.strValue ?? "NA" + } + + var mood: Mood { + return Mood.init(rawValue: Int(self.moodValue))! + } +} diff --git a/Shared/Models/MoodImagable.swift b/Shared/Models/MoodImagable.swift new file mode 100644 index 0000000..398de35 --- /dev/null +++ b/Shared/Models/MoodImagable.swift @@ -0,0 +1,104 @@ +// +// MoodImagable.swift +// Feels (iOS) +// +// Created by Trey Tartt on 2/19/22. +// + +import SwiftUI + +protocol MoodImagable { + static func icon(forMood mood: Mood) -> Image +} + +enum MoodImages: Int, CaseIterable { + case FontAwesome + case Emoji + case HandEmjoi + + func icon(forMood mood: Mood) -> Image { + switch self { + + case .FontAwesome: + return FontAwesomeMoodImages.icon(forMood: mood) + case .Emoji: + return EmojiMoodImages.icon(forMood: mood) + case .HandEmjoi: + return HandEmojiMoodImages.icon(forMood: mood) + } + } + + var moodImages: MoodImagable.Type { + switch self { + case .FontAwesome: + return FontAwesomeMoodImages.self + case .Emoji: + return EmojiMoodImages.self + case .HandEmjoi: + return HandEmojiMoodImages.self + } + } +} + +final class FontAwesomeMoodImages: MoodImagable { + static func icon(forMood mood: Mood) -> Image { + switch mood { + case .horrible: + return Image("horrible", bundle: .main) + case .bad: + return Image("bad", bundle: .main) + case .average: + return Image("average", bundle: .main) + case .good: + return Image("good", bundle: .main) + case .great: + return Image("great", bundle: .main) + case .missing: + return Image("xmark-solid", bundle: .main) + case .placeholder: + return Image("xmark-solid", bundle: .main) + } + } +} + +final class EmojiMoodImages: MoodImagable { + static func icon(forMood mood: Mood) -> Image { + switch mood { + case .horrible: + return Image(uiImage: "💩".textToImage()!) + case .bad: + return Image(uiImage: "😕".textToImage()!) + case .average: + return Image(uiImage: "😑".textToImage()!) + case .good: + return Image(uiImage: "🙂".textToImage()!) + case .great: + return Image(uiImage: "😀".textToImage()!) + case .missing: + return Image("xmark-solid", bundle: .main) + case .placeholder: + return Image("xmark-solid", bundle: .main) + } + } +} + +final class HandEmojiMoodImages: MoodImagable { + static func icon(forMood mood: Mood) -> Image { + switch mood { + case .horrible: + return Image(uiImage: "🖕".textToImage()!) + case .bad: + return Image(uiImage: "👎".textToImage()!) + case .average: + return Image(uiImage: "🖖".textToImage()!) + case .good: + return Image(uiImage: "👍".textToImage()!) + case .great: + return Image(uiImage: "🙏".textToImage()!) + case .missing: + return Image("xmark-solid", bundle: .main) + case .placeholder: + return Image("xmark-solid", bundle: .main) + } + } +} diff --git a/Shared/Models/MoodMetrics.swift b/Shared/Models/MoodMetrics.swift new file mode 100644 index 0000000..a3cead9 --- /dev/null +++ b/Shared/Models/MoodMetrics.swift @@ -0,0 +1,15 @@ +// +// MoodMetrics.swift +// Feels +// +// Created by Trey Tartt on 2/12/22. +// + +import Foundation + +struct MoodMetrics: Identifiable { + let id = UUID() + let mood: Mood + let total: Int + let percent: Float +} diff --git a/Shared/Models/MoodTintable.swift b/Shared/Models/MoodTintable.swift new file mode 100644 index 0000000..d01f621 --- /dev/null +++ b/Shared/Models/MoodTintable.swift @@ -0,0 +1,347 @@ +// +// MoodTintable.swift +// Feels (iOS) +// +// Created by Trey Tartt on 2/19/22. +// + +import SwiftUI + +struct DefaultTextColor { + static var textColor: Color { + Color(UIColor.label) + } +} + +protocol MoodTintable { + static func color(forMood mood: Mood) -> Color + static func secondary(forMood mood: Mood) -> Color +} + +enum MoodTints: Int, CaseIterable { + case Default + case Neon + case Pastel + case Custom + + static var defaultOptions: [MoodTints] { + return [Default, Neon, Pastel] + } + + func color(forMood mood: Mood) -> Color { + switch self { + case .Default: + return DefaultMoodTint.color(forMood: mood) + case .Custom: + return CustomMoodTint.color(forMood: mood) + case .Neon: + return NeonMoodTint.color(forMood: mood) + case .Pastel: + return PastelTint.color(forMood: mood) + } + } + + func secondary(forMood mood: Mood) -> Color { + switch self { + case .Default: + return DefaultMoodTint.secondary(forMood: mood) + case .Custom: + return CustomMoodTint.secondary(forMood: mood) + case .Neon: + return NeonMoodTint.secondary(forMood: mood) + case .Pastel: + return PastelTint.secondary(forMood: mood) + } + } + + var moodTints: MoodTintable.Type { + switch self { + case .Default: + return DefaultMoodTint.self + case .Custom: + return CustomMoodTint.self + case .Neon: + return NeonMoodTint.self + case .Pastel: + return PastelTint.self + } + } +} + +final class SavedMoodTint: NSObject, ObservableObject, Codable { + @Published var colorOne: Color + @Published var colorTwo: Color + @Published var colorThree: Color + @Published var colorFour: Color + @Published var colorFive: Color + + override init() { + colorOne = Color(hex: "a92b26") + colorTwo = Color(hex: "a92b26") + colorThree = Color(hex: "a92b26") + colorFour = Color(hex: "a92b26") + colorFive = Color(hex: "a92b26") + } + + enum CodingKeys: CodingKey { + case colorOne, colorTwo, colorThree, colorFour, colorFive + } + + init(from decoder: Decoder) throws { + let container = try decoder.container(keyedBy: CodingKeys.self) + colorOne = try container.decode(Color.self, forKey: .colorOne) + colorTwo = try container.decode(Color.self, forKey: .colorTwo) + colorThree = try container.decode(Color.self, forKey: .colorThree) + colorFour = try container.decode(Color.self, forKey: .colorFour) + colorFive = try container.decode(Color.self, forKey: .colorFive) + } + + func encode(to encoder: Encoder) throws { + var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(colorOne, forKey: .colorOne) + try container.encode(colorTwo, forKey: .colorTwo) + try container.encode(colorThree, forKey: .colorThree) + try container.encode(colorFour, forKey: .colorFour) + try container.encode(colorFive, forKey: .colorFive) + } +} + +final class CustomMoodTint: MoodTintable { + static func color(forMood mood: Mood) -> Color { + switch mood { + case .horrible: + return UserDefaultsStore.getCustomMoodTint().colorFive + case .bad: + return UserDefaultsStore.getCustomMoodTint().colorFour + case .average: + return UserDefaultsStore.getCustomMoodTint().colorThree + case .good: + return UserDefaultsStore.getCustomMoodTint().colorTwo + case .great: + return UserDefaultsStore.getCustomMoodTint().colorOne + case .missing: + return Color(uiColor: UIColor.lightGray) + case .placeholder: + return Color(uiColor: UIColor.lightGray) + } + } + + static func secondary(forMood mood: Mood) -> Color { + switch mood { + case .horrible: + return UserDefaultsStore.getCustomMoodTint().colorFive.darker(by: 40) + case .bad: + return UserDefaultsStore.getCustomMoodTint().colorFour.darker(by: 40) + case .average: + return UserDefaultsStore.getCustomMoodTint().colorThree.darker(by: 40) + case .good: + return UserDefaultsStore.getCustomMoodTint().colorTwo.darker(by: 40) + case .great: + return UserDefaultsStore.getCustomMoodTint().colorOne.darker(by: 40) + case .missing: + return Color(uiColor: UIColor.lightGray).darker(by: 40) + case .placeholder: + return Color(uiColor: UIColor.lightGray).darker(by: 40) + } + } +} + +final class DefaultMoodTint: MoodTintable { + static func color(forMood mood: Mood) -> Color { + switch mood { + case .horrible: + return Color(hex: "ff453a") + case .bad: + return Color(hex: "ff9e0b") + case .average: + return Color(hex: "0b84ff") + case .good: + return Color(hex: "ffd709") + case .great: + return Color(hex: "31d158") + case .missing: + return Color(uiColor: UIColor.systemGray2) + case .placeholder: + return Color(uiColor: UIColor.systemGray2) + } + } + + static func secondary(forMood mood: Mood) -> Color { + switch mood { + case .horrible: + return Color(hex: "a92b26") + case .bad: + return Color(hex: "a06407") + case .average: + return Color(hex: "074f9a") + case .good: + return Color(hex: "9d8405") + case .great: + return Color(hex: "208939") + case .missing: + return Color(uiColor: UIColor.label) + case .placeholder: + return Color(uiColor: UIColor.label) + } + } +} + +final class AllRedMoodTint: MoodTintable { + static func color(forMood mood: Mood) -> Color { + switch mood { + case .horrible: + return .red + case .bad: + return .red + case .average: + return .red + case .good: + return .red + case .great: + return .red + case .missing: + return Color(uiColor: UIColor.systemGray2) + case .placeholder: + return Color(uiColor: UIColor.systemGray2) + } + } + + static func secondary(forMood mood: Mood) -> Color { + switch mood { + case .horrible: + return .red + case .bad: + return .red + case .average: + return .red + case .good: + return .red + case .great: + return .red + case .missing: + return Color(uiColor: UIColor.label) + case .placeholder: + return Color(uiColor: UIColor.label) + } + } +} + +final class NeonMoodTint: MoodTintable { + static func color(forMood mood: Mood) -> Color { + switch mood { + case .horrible: + return Color(hex: "#ff1818") + case .bad: + return Color(hex: "#FF5F1F") + case .average: + return Color(hex: "#1F51FF") + case .good: + return Color(hex: "#FFF01F") + case .great: + return Color(hex: "#39FF14") + case .missing: + return Color(uiColor: UIColor.systemGray2) + case .placeholder: + return Color(uiColor: UIColor.systemGray2) + } + } + + static func secondary(forMood mood: Mood) -> Color { + switch mood { + case .horrible: + return Color(hex: "#8b1113") + case .bad: + return Color(hex: "#893315") + case .average: + return Color(hex: "#0f2a85") + case .good: + return Color(hex: "#807a18") + case .great: + return Color(hex: "#218116") + case .missing: + return Color(uiColor: UIColor.label) + case .placeholder: + return Color(uiColor: UIColor.label) + } + } +} + +final class MonoChromeTint: MoodTintable { + static func color(forMood mood: Mood) -> Color { + switch mood { + case .horrible: + return Color(hex: "#000000") + case .bad: + return Color(hex: "#47474a") + case .average: + return Color(hex: "#7b7b81") + case .good: + return Color(hex: "#a3a3ab") + case .great: + return Color(hex: "#c2c1cb") + case .missing: + return Color(hex: "#ff0000") + case .placeholder: + return Color(hex: "#efeffb") + } + } + + static func secondary(forMood mood: Mood) -> Color { + switch mood { + case .horrible: + return .black + case .bad: + return Color(uiColor: UIColor.systemGray) + case .average: + return Color(uiColor: UIColor.systemGray) + case .good: + return Color(uiColor: UIColor.systemGray2) + case .great: + return Color(uiColor: UIColor.systemGray3) + case .missing: + return Color(uiColor: UIColor.systemGray2) + case .placeholder: + return Color(uiColor: UIColor.systemGray4) + } + } +} + +final class PastelTint: MoodTintable { + static func color(forMood mood: Mood) -> Color { + switch mood { + case .horrible: + return Color(hex: "#FF6961") + case .bad: + return Color(hex: "#ffb347") + case .average: + return Color(hex: "#A7C7E7") + case .good: + return Color(hex: "#fdfd96") + case .great: + return Color(hex: "#C1E1C1") + case .missing: + return Color(uiColor: UIColor.systemGray2) + case .placeholder: + return Color(uiColor: UIColor.systemGray2) + } + } + + static func secondary(forMood mood: Mood) -> Color { + switch mood { + case .horrible: + return Color(hex: "#893734") + case .bad: + return Color(hex: "#855d28") + case .average: + return Color(hex: "#5d6e83") + case .good: + return Color(hex: "#7f804f") + case .great: + return Color(hex: "#6b7e6d") + case .missing: + return Color(uiColor: UIColor.label) + case .placeholder: + return Color(uiColor: UIColor.label) + } + } +} diff --git a/Shared/Models/OnboardingDataDataManager.swift b/Shared/Models/OnboardingDataDataManager.swift new file mode 100644 index 0000000..94f07fb --- /dev/null +++ b/Shared/Models/OnboardingDataDataManager.swift @@ -0,0 +1,20 @@ +// +// OnboardingDataDataManager.swift +// Feels (iOS) +// +// Created by Trey Tartt on 2/18/22. +// + +import Foundation + +final class OnboardingDataDataManager: ObservableObject { + static let shared = OnboardingDataDataManager() + + @Published public private(set) var savedOnboardingData = UserDefaultsStore.getOnboarding() + + public func updateOnboardingData(onboardingData: OnboardingData) { + let onboardingData = UserDefaultsStore.saveOnboarding(onboardingData: onboardingData) + savedOnboardingData = onboardingData + LocalNotification.scheduleReminder(atTime: onboardingData.date) + } +} diff --git a/Shared/Models/PersonalityPackable.swift b/Shared/Models/PersonalityPackable.swift new file mode 100644 index 0000000..4feca3a --- /dev/null +++ b/Shared/Models/PersonalityPackable.swift @@ -0,0 +1,108 @@ +// +// NotificationTitles.swift +// Feels (iOS) +// +// Created by Trey Tartt on 2/19/22. +// + +import Foundation + +protocol PersonalityPackable { + static var notificationTitles: [String] { get } + static var notificationBodyToday: [String] { get } + static var notificationBodyYesterday: [String] { get } + + static var title: String { get } +} + +enum PersonalityPack: Int, CaseIterable { + case Default + case Rude + + func randomPushNotificationStrings() -> (title: String, body: String) { + let onboarding = UserDefaultsStore.getOnboarding() + + switch (self, onboarding.inputDay) { + case (.Default, .Today): + return (DefaultTitles.notificationTitles.randomElement()!, + DefaultTitles.notificationBodyToday.randomElement()!) + case (.Default, .Previous): + return (DefaultTitles.notificationTitles.randomElement()!, + DefaultTitles.notificationBodyYesterday.randomElement()!) + case (.Rude, .Today): + return (RudeTitles.notificationTitles.randomElement()!, + RudeTitles.notificationBodyToday.randomElement()!) + case (.Rude, .Previous): + return (RudeTitles.notificationTitles.randomElement()!, + RudeTitles.notificationBodyYesterday.randomElement()!) + } + } + + func title() -> String { + switch self { + case .Default: + return DefaultTitles.title + case .Rude: + return RudeTitles.title + } + } +} + +final class DefaultTitles: PersonalityPackable { + static var title = String(localized: "nice") + + static var notificationTitles: [String] { + [ + String(localized: "default_notif_title_one"), + String(localized: "default_notif_title_two"), + String(localized: "default_notif_title_three") + ] + } + + static var notificationBodyToday: [String] { + [ + String(localized: "default_notif_body_today_one"), + String(localized: "default_notif_body_today_two"), + String(localized: "default_notif_body_today_three"), + String(localized: "default_notif_body_today_four") + ] + } + + static var notificationBodyYesterday: [String] { + [ + String(localized: "default_notif_body_yesterday_one"), + String(localized: "default_notif_body_yesterday_two"), + String(localized: "default_notif_body_yesterday_three"), + String(localized: "default_notif_body_yesterday_four") + ] + } +} + +final class RudeTitles: PersonalityPackable { + static var title = String(localized: "rude") + + static var notificationTitles: [String] { + [ + String(localized: "rude_notif_title_one"), + String(localized: "rude_notif_title_two"), + String(localized: "rude_notif_title_three"), + String(localized: "rude_notif_title_four") + ] + } + + static var notificationBodyToday: [String] { + [ + String(localized: "rude_notif_body_today_one"), + String(localized: "rude_notif_body_today_two"), + String(localized: "rude_notif_body_today_three") + ] + } + + static var notificationBodyYesterday: [String] { + [ + String(localized: "rude_notif_body_yesterday_one"), + String(localized: "rude_notif_body_yesterday_two"), + String(localized: "rude_notif_body_yesterday_three") + ] + } +} diff --git a/Shared/Models/Shapes.swift b/Shared/Models/Shapes.swift new file mode 100644 index 0000000..16ecd17 --- /dev/null +++ b/Shared/Models/Shapes.swift @@ -0,0 +1,95 @@ +// +// Shapes.swift +// Feels +// +// Created by Trey Tartt on 3/20/22. +// + +import SwiftUI + +enum BGShape: Int, CaseIterable { + case circle + case diamond + case rectangle + case roundedRectangle + + func view(withText text: Text, bgColor: Color, textColor: Color) -> some View{ + return AnyView( + ZStack { + switch self { + case .circle: + Circle() + .fill(bgColor) + .frame(minWidth: 5, + maxWidth: 500, + minHeight: 5, + maxHeight: 500, + alignment: .center) + .overlay( + text + .font(.title2) + .fontWeight(.bold) + .lineLimit(1) + .foregroundColor(textColor) + .minimumScaleFactor(0.2) + .padding(10) + .frame(maxWidth: .infinity, alignment: .center) + ) + case .diamond: + Diamond() + .fill(bgColor) + .frame(minWidth: 5, + maxWidth: 500, + minHeight: 5, + maxHeight: 500) + .aspectRatio(contentMode: .fit) + .overlay( + text + .font(.title2) + .fontWeight(.bold) + .lineLimit(1) + .foregroundColor(textColor) + .minimumScaleFactor(0.2) + .padding(10) + .frame(maxWidth: .infinity, alignment: .center) + ) + case .rectangle: + Rectangle() + .fill(bgColor) + .frame(minWidth: 5, + maxWidth: 500, + minHeight: 5, + maxHeight: 500, + alignment: .center) + .overlay( + text + .font(.title2) + .fontWeight(.bold) + .lineLimit(1) + .foregroundColor(textColor) + .minimumScaleFactor(0.2) + .padding(10) + .frame(maxWidth: .infinity, alignment: .center) + ) + case .roundedRectangle: + RoundedRectangle(cornerRadius: 8, style: .continuous) + .fill(bgColor) + .frame(minWidth: 5, + maxWidth: 500, + minHeight: 5, + maxHeight: 500, + alignment: .center) + .overlay( + text + .font(.title2) + .fontWeight(.bold) + .lineLimit(1) + .foregroundColor(textColor) + .minimumScaleFactor(0.2) + .padding(10) + .frame(maxWidth: .infinity, alignment: .center) + ) + } + }) + } +} diff --git a/Shared/Models/SharingImageModels.swift b/Shared/Models/SharingImageModels.swift new file mode 100644 index 0000000..f048c3e --- /dev/null +++ b/Shared/Models/SharingImageModels.swift @@ -0,0 +1,59 @@ +// +// SharingImageModels.swift +// Feels +// +// Created by Trey Tartt on 2/24/22. +// + +import SwiftUI +import LinkPresentation + +class StupidAssShareObservableObject: ObservableObject { + @Published var fuckingWrappedShrable: UIImage? = nil + @Published var showFuckingSheet = false +} + +class ShareActivityItemSource: NSObject, UIActivityItemSource { + var shareText: String + var shareImage: UIImage + var linkMetaData = LPLinkMetadata() + + init(shareText: String, shareImage: UIImage) { + self.shareText = shareText + self.shareImage = shareImage + linkMetaData.title = shareText + super.init() + } + + func activityViewControllerPlaceholderItem(_ activityViewController: UIActivityViewController) -> Any { + return UIImage(named: "AppIcon") as Any + } + + func activityViewController(_ activityViewController: UIActivityViewController, itemForActivityType activityType: UIActivity.ActivityType?) -> Any? { + return nil + } + + func activityViewControllerLinkMetadata(_ activityViewController: UIActivityViewController) -> LPLinkMetadata? { + return linkMetaData + } +} + +struct ShareSheet: UIViewControllerRepresentable { + let photo: UIImage + + func makeUIViewController(context: Context) -> UIActivityViewController { + let text = "ifeel" + let itemSource = ShareActivityItemSource(shareText: text, shareImage: photo) + + let activityItems: [Any] = [photo, text, itemSource] + + let controller = UIActivityViewController( + activityItems: activityItems, + applicationActivities: nil) + + return controller + } + + func updateUIViewController(_ vc: UIActivityViewController, context: Context) { + } +} diff --git a/Shared/Models/StupidAssCustomWidgetObservableObject.swift b/Shared/Models/StupidAssCustomWidgetObservableObject.swift new file mode 100644 index 0000000..4991e28 --- /dev/null +++ b/Shared/Models/StupidAssCustomWidgetObservableObject.swift @@ -0,0 +1,13 @@ +// +// StupidAssCustomWidgetObservableObject.swift +// Feels +// +// Created by Trey Tartt on 3/31/22. +// + +import Foundation + +class StupidAssCustomWidgetObservableObject: ObservableObject { + @Published var fuckingWrapped: CustomWidgetModel? = nil + @Published var showFuckingSheet = false +} diff --git a/Shared/Models/Theme.swift b/Shared/Models/Theme.swift new file mode 100644 index 0000000..23c5673 --- /dev/null +++ b/Shared/Models/Theme.swift @@ -0,0 +1,203 @@ +// +// theme.currentTheme.swift +// Feels (iOS) +// +// Created by Trey Tartt on 2/4/22. +// + +import SwiftUI + +struct ThemeConstants { + static let iconSize: CGFloat = 50 +} + +enum Theme: Int, CaseIterable { + case system + case iFeel + case dark + case light + + var title: String { + switch self { + case .system: + return SystemTheme.title + case .iFeel: + return IFeelTheme.title + case .dark: + return AlwaysDark.title + case .light: + return AlwaysLight.title + } + } + + var currentTheme: Themeable { + switch self { + + case .system: + return SystemTheme() + case .iFeel: + return IFeelTheme() + case .dark: + return AlwaysDark() + case .light: + return AlwaysLight() + } + } +} + +protocol Themeable { + static var title: String { get } + var secondaryBGColor: Color { get } + var bgColor: Color { get } + var bg: AnyView { get } + var preview: AnyView { get } + var labelColor: Color { get } +} + +struct IFeelTheme: Themeable { + var bgColor: Color { + return Color(uiColor: UIColor.systemBackground) + } + + var labelColor: Color { + return Color(uiColor: UIColor.label) + } + + static var title: String { + return "iFeel" + } + + var secondaryBGColor: Color { + return Color(uiColor: UIColor.secondarySystemBackground) + } + + var bg: AnyView { + return AnyView( + BGView().equatable() + ) + } + + var preview: AnyView { + return AnyView( + ZStack { + BGView().equatable() + .frame(width: ThemeConstants.iconSize, height: ThemeConstants.iconSize) + .clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) + } + ) + } +} + +struct SystemTheme: Themeable { + var bgColor: Color { + return Color(uiColor: UIColor.systemBackground) + } + + var labelColor: Color { + return Color(uiColor: UIColor.label) + } + + static var title: String { + return "System" + } + + var secondaryBGColor: Color { + return Color(uiColor: UIColor.secondarySystemBackground) + } + + var bg: AnyView { + return AnyView( + ZStack { + Rectangle() + .fill(Color(UIColor.systemBackground)) + } + ) + } + + var preview: AnyView { + return AnyView( + ZStack { + Rectangle() + .fill(Color(UIColor.secondarySystemBackground)) + .frame(width: ThemeConstants.iconSize, height: ThemeConstants.iconSize) + .clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) + } + ) + } +} + +struct AlwaysDark: Themeable { + var bgColor: Color { + return Color(uiColor: UIColor.systemBackground.resolvedColor(with: .init(userInterfaceStyle: .dark))) + } + + var labelColor: Color { + return .white + } + + static var title: String { + return "Dark" + } + + var secondaryBGColor: Color { + return Color(uiColor: UIColor.secondarySystemBackground.resolvedColor(with: .init(userInterfaceStyle: .dark))) + } + + var bg: AnyView { + return AnyView( + ZStack { + Rectangle() + .fill(Color(UIColor.systemBackground.resolvedColor(with: .init(userInterfaceStyle: .dark)))) + } + ) + } + + var preview: AnyView { + return AnyView( + ZStack { + Rectangle() + .fill(Color(UIColor.secondarySystemBackground.resolvedColor(with: .init(userInterfaceStyle: .dark)))) + .frame(width: ThemeConstants.iconSize, height: ThemeConstants.iconSize) + .clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) + } + ) + } +} + +struct AlwaysLight: Themeable { + var bgColor: Color { + return Color(uiColor: UIColor.systemBackground) + } + + var labelColor: Color { + return .black + } + + static var title: String { + return "Light" + } + + var secondaryBGColor: Color { + return Color(uiColor: UIColor.secondarySystemBackground.resolvedColor(with: .init(userInterfaceStyle: .light))) + } + + var bg: AnyView { + return AnyView( + ZStack { + Rectangle() + .fill(Color(UIColor.systemBackground.resolvedColor(with: .init(userInterfaceStyle: .light)))) + } + ) + } + + var preview: AnyView { + return AnyView( + ZStack { + Rectangle() + .fill(Color(UIColor.secondarySystemBackground.resolvedColor(with: .init(userInterfaceStyle: .light)))) + .frame(width: ThemeConstants.iconSize, height: ThemeConstants.iconSize) + .clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) + } + ) + } +} diff --git a/Shared/Models/UserDefaultsStore.swift b/Shared/Models/UserDefaultsStore.swift new file mode 100644 index 0000000..030b059 --- /dev/null +++ b/Shared/Models/UserDefaultsStore.swift @@ -0,0 +1,233 @@ +// +// UserDefaultsStore.swift +// Feels (iOS) +// +// Created by Trey Tartt on 1/22/22. +// + +import Foundation + +class UserDefaultsStore { + enum Keys: String { + case savedOnboardingData + case needsOnboarding + case useCloudKit + case deleteEnable + case mainViewTopHeaderIndex + case theme + case moodImages + case moodTint + case personalityPack + case customWidget + case customMoodTint + case customMoodTintUpdateNumber + case textColor + case showNSFW + case shape + case daysFilter + case firstLaunchDate + case hasActiveSubscription + case lastVotedDate + + case contentViewCurrentSelectedHeaderViewBackDays + case contentViewHeaderTag + case contentViewHeaderTagViewOneViewType + case contentViewHeaderTagViewTwoViewType + case currentSelectedHeaderViewViewType + } + + static func getOnboarding() -> OnboardingData { + if let data = GroupUserDefaults.groupDefaults.object(forKey: UserDefaultsStore.Keys.savedOnboardingData.rawValue) as? Data, + let model = try? JSONDecoder().decode(OnboardingData.self, from: data) { + return model + } else { + return OnboardingData() + } + } + + static func saveOnboarding(onboardingData: OnboardingData) -> OnboardingData { + do { + let data = try JSONEncoder().encode(onboardingData) + GroupUserDefaults.groupDefaults.set(data, forKey: UserDefaultsStore.Keys.savedOnboardingData.rawValue) + return UserDefaultsStore.getOnboarding() + } catch { + fatalError("error saving") + } + } + + static func moodMoodImagable() -> MoodImagable.Type { + if let data = GroupUserDefaults.groupDefaults.object(forKey: UserDefaultsStore.Keys.moodImages.rawValue) as? Int, + let model = MoodImages.init(rawValue: data) { + return model.moodImages + } else { + return MoodImages.FontAwesome.moodImages + } + } + + static func moodTintable() -> MoodTintable.Type { + if let data = GroupUserDefaults.groupDefaults.object(forKey: UserDefaultsStore.Keys.moodTint.rawValue) as? Int, + let model = MoodTints.init(rawValue: data) { + return model.moodTints + } else { + return MoodTints.Default.moodTints + } + } + + static func personalityPackable() -> PersonalityPack { + if let data = GroupUserDefaults.groupDefaults.object(forKey: UserDefaultsStore.Keys.personalityPack.rawValue) as? Int, + let model = PersonalityPack.init(rawValue: data) { + return model + } else { + return PersonalityPack.Default + } + } + + static func theme() -> Theme { + if let data = GroupUserDefaults.groupDefaults.object(forKey: UserDefaultsStore.Keys.theme.rawValue) as? Int, + let model = Theme.init(rawValue: data) { + return model + } else { + return Theme.system + } + } + + static func getCustomWidgets() -> [CustomWidgetModel] { + if let data = GroupUserDefaults.groupDefaults.object(forKey: UserDefaultsStore.Keys.customWidget.rawValue) as? Data, + let model = try? JSONDecoder().decode([CustomWidgetModel].self, from: data) { + return model + } else { + GroupUserDefaults.groupDefaults.removeObject(forKey: UserDefaultsStore.Keys.customWidget.rawValue) + + let widget = CustomWidgetModel.randomWidget + widget.isSaved = true + let widgets = [widget] + let data = try! JSONEncoder().encode(widgets) + GroupUserDefaults.groupDefaults.set(data, forKey: UserDefaultsStore.Keys.customWidget.rawValue) + + if let data = GroupUserDefaults.groupDefaults.object(forKey: UserDefaultsStore.Keys.customWidget.rawValue) as? Data, + let models = try? JSONDecoder().decode([CustomWidgetModel].self, from: data) { + let sorted = models.sorted(by: { + $0.createdDate < $1.createdDate + }) + return sorted + } else { + fatalError("error getting widgets") + } + } + } + + @discardableResult + static func saveCustomWidget(widgetModel: CustomWidgetModel, inUse: Bool) -> [CustomWidgetModel] { + do { + var existingWidgets = getCustomWidgets() + + if let exisitingWidget = existingWidgets.firstIndex(where: { + $0.uuid == widgetModel.uuid + }) { + existingWidgets.remove(at: exisitingWidget) + // give it differnet uuid so the view updates + widgetModel.uuid = UUID().uuidString + } + + if inUse { + existingWidgets.forEach({ + $0.inUse = false + }) + + widgetModel.inUse = true + } + + existingWidgets.append(widgetModel) + existingWidgets.forEach({ + $0.isSaved = true + }) + let data = try JSONEncoder().encode(existingWidgets) + GroupUserDefaults.groupDefaults.set(data, forKey: UserDefaultsStore.Keys.customWidget.rawValue) + return UserDefaultsStore.getCustomWidgets() + } catch { + fatalError("error saving") + } + } + + @discardableResult + static func deleteCustomWidget(withUUID uuid: String) -> [CustomWidgetModel] { + do { + var existingWidgets = getCustomWidgets() + + if let exisitingWidget = existingWidgets.firstIndex(where: { + $0.uuid == uuid + }) { + existingWidgets.remove(at: exisitingWidget) + } + + if existingWidgets.count == 0 { + let widget = CustomWidgetModel.randomWidget + widget.isSaved = true + widget.inUse = true + existingWidgets.append(widget) + } + + if let _ = existingWidgets.first(where: { + $0.inUse == true + }) {} else { + if let first = existingWidgets.first { + first.inUse = true + } + } + + let data = try JSONEncoder().encode(existingWidgets) + GroupUserDefaults.groupDefaults.set(data, forKey: UserDefaultsStore.Keys.customWidget.rawValue) + return UserDefaultsStore.getCustomWidgets() + } catch { + fatalError("error saving") + } + } + + static func getCustomMoodTint() -> SavedMoodTint { + if let data = GroupUserDefaults.groupDefaults.object(forKey: UserDefaultsStore.Keys.customMoodTint.rawValue) as? Data{ + do { + let model = try JSONDecoder().decode(SavedMoodTint.self, from: data) + return model + } catch { + print(error) + } + } + return SavedMoodTint() + } + + static func getCustomBGShape() -> BGShape { + if let data = GroupUserDefaults.groupDefaults.object(forKey: UserDefaultsStore.Keys.shape.rawValue) as? Int, + let model = BGShape.init(rawValue: data) { + return model + } else { + return BGShape.circle + } + } + + @discardableResult + static func saveCustomMoodTint(customTint: SavedMoodTint) -> SavedMoodTint { + do { + let data = try JSONEncoder().encode(customTint) + GroupUserDefaults.groupDefaults.set(data, forKey: UserDefaultsStore.Keys.customMoodTint.rawValue) + return UserDefaultsStore.getCustomMoodTint() + } catch { + print(error) + fatalError("error saving") + } + } + + @discardableResult + static func saveDaysFilter(days: [Int]) -> [Int] { + GroupUserDefaults.groupDefaults.set(days, forKey: UserDefaultsStore.Keys.daysFilter.rawValue) + return UserDefaultsStore.getDaysFilter() + } + + static func getDaysFilter() -> [Int] { + if let data = GroupUserDefaults.groupDefaults.object(forKey: UserDefaultsStore.Keys.daysFilter.rawValue) as? [Int] { + return data + } else { + return [1,2,3,4,5,6,7] + } + } +} + diff --git a/Shared2/MoodEntryFunctions.swift b/Shared/MoodEntryFunctions.swift similarity index 100% rename from Shared2/MoodEntryFunctions.swift rename to Shared/MoodEntryFunctions.swift diff --git a/Shared/Onboarding/OnboardingData.swift b/Shared/Onboarding/OnboardingData.swift new file mode 100644 index 0000000..87b815c --- /dev/null +++ b/Shared/Onboarding/OnboardingData.swift @@ -0,0 +1,59 @@ +// +// OnboardingData.swift +// Feels (iOS) +// +// Created by Trey Tartt on 1/22/22. +// + +import Foundation +import UserNotifications + +// this is getting passed around and filled out +// class and vars +final class OnboardingData: NSObject, ObservableObject, Codable { + @Published var date: Date = Date() + @Published var inputDay: DayOptions = .Today + + enum CodingKeys: CodingKey { + case date, inputDay + } + + func encode(to encoder: Encoder) throws { + var container = encoder.container(keyedBy: CodingKeys.self) + + try container.encode(date, forKey: .date) + try container.encode(inputDay, forKey: .inputDay) + } + + required init(from decoder: Decoder) throws { + let container = try decoder.container(keyedBy: CodingKeys.self) + + date = try container.decode(Date.self, forKey: .date) + inputDay = try container.decode(DayOptions.self, forKey: .inputDay) + } + + override init() { } +} + +extension OnboardingData: RawRepresentable { + convenience init?(rawValue: String) { + guard let data = rawValue.data(using: .utf8), + let result = try? JSONDecoder().decode(OnboardingData.self, from: data) + else { + return nil + } + self.init() + + self.date = result.date + self.inputDay = result.inputDay + } + + public var rawValue: String { + guard let data = try? JSONEncoder().encode(self), + let result = String(data: data, encoding: .utf8) + else { + return "[]" + } + return result + } +} diff --git a/Shared/Onboarding/views/OnboardingCustomizeOne.swift b/Shared/Onboarding/views/OnboardingCustomizeOne.swift new file mode 100644 index 0000000..5663011 --- /dev/null +++ b/Shared/Onboarding/views/OnboardingCustomizeOne.swift @@ -0,0 +1,74 @@ +// +// OnboardingCustomizeOne.swift +// Feels (iOS) +// +// Created by Trey Tartt on 4/5/22. +// + +import SwiftUI + +struct OnboardingCustomizeOne: View { + @ObservedObject var onboardingData: OnboardingData + + var formatter: DateFormatter { + let dateFormatter = DateFormatter() + dateFormatter.timeStyle = .short + return dateFormatter + } + + var body: some View { + ZStack { + GeometryReader { geometry in + VStack { + Spacer() + Image("good", bundle: .main) + .foregroundColor(Color(UIColor.darkText)) + .opacity(0.04) + .scaleEffect(1.2, anchor: .trailing) + Spacer() + } + + + ScrollView { + VStack(alignment: .leading) { + Text(String(localized: "onboarding_title_customize_one_title")) + .font(.title) + .padding() + .fixedSize(horizontal: false, vertical: true) + .foregroundColor(.black) + + Text(String(localized: "onboarding_title_customize_one_section_one_title")) + .font(.title3) + .fixedSize(horizontal: false, vertical: true) + .padding() + .foregroundColor(.black) + .multilineTextAlignment(.leading) + IconPickerView() + + Text(String(localized: "onboarding_title_customize_one_section_two_title")) + .font(.title3) + .padding() + .fixedSize(horizontal: false, vertical: true) + .foregroundColor(.black) + + DayFilterPickerView() + + Text(String(localized: "onboarding_title_customize_one_section_two_note")) + .font(.title3) + .padding() + .fixedSize(horizontal: false, vertical: true) + .foregroundColor(.black) + } + } + .padding() + } + } + .background(Color(hex: "ffd709")) + } +} + +struct OnboardingCustomizeOne_Previews: PreviewProvider { + static var previews: some View { + OnboardingCustomizeOne(onboardingData: OnboardingData()) + } +} diff --git a/Shared/Onboarding/views/OnboardingCustomizeTwo.swift b/Shared/Onboarding/views/OnboardingCustomizeTwo.swift new file mode 100644 index 0000000..b369d60 --- /dev/null +++ b/Shared/Onboarding/views/OnboardingCustomizeTwo.swift @@ -0,0 +1,81 @@ +// +// OnboardingCustomizeTwo.swift +// Feels (iOS) +// +// Created by Trey Tartt on 4/5/22. +// + +import SwiftUI + +struct OnboardingCustomizeTwo: View { + @ObservedObject var onboardingData: OnboardingData + + var formatter: DateFormatter { + let dateFormatter = DateFormatter() + dateFormatter.timeStyle = .short + return dateFormatter + } + + var body: some View { + ZStack { + GeometryReader { geometry in + VStack { + Spacer() + Image("average", bundle: .main) + .foregroundColor(Color(UIColor.darkText)) + .opacity(0.04) + .scaleEffect(1.2, anchor: .trailing) + Spacer() + } + + VStack(alignment: .leading) { + Text(String(localized: "onboarding_title_customize_two_title")) + .font(.title) + .padding() + .fixedSize(horizontal: false, vertical: true) + .foregroundColor(.white) + + SampleEntryView() + .padding([.top]) + + ScrollView { + VStack(alignment: .leading) { + Text(String(localized: "onboarding_title_customize_two_section_one_title")) + .font(.title3) + .padding() + .fixedSize(horizontal: false, vertical: true) + .foregroundColor(.white) + ImagePackPickerView() + + Text(String(localized: "onboarding_title_customize_two_section_two_title")) + .font(.title3) + .padding() + .fixedSize(horizontal: false, vertical: true) + .foregroundColor(.white) + + + TintPickerView() + + Text(String(localized: "onboarding_title_customize_two_section_three_title")) + .font(.title3) + .padding() + .fixedSize(horizontal: false, vertical: true) + .foregroundColor(.white) + + + TextColorPickerView() + } + } + } + .padding() + } + } + .background(Color(hex: "0b84ff")) + } +} + +struct OnboardingCustomizeTwo_Previews: PreviewProvider { + static var previews: some View { + OnboardingCustomizeTwo(onboardingData: OnboardingData()) + } +} diff --git a/Shared/Onboarding/views/OnboardingDay.swift b/Shared/Onboarding/views/OnboardingDay.swift new file mode 100644 index 0000000..f9d8a83 --- /dev/null +++ b/Shared/Onboarding/views/OnboardingDay.swift @@ -0,0 +1,93 @@ +// +// OnboardingDay.swift +// Feels (iOS) +// +// Created by Trey Tartt on 1/20/22. +// + +import SwiftUI + +enum DayOptions: Int, CaseIterable, RawRepresentable, Codable { + case Today + case Previous + + var localizedValue: String { + switch self { + + case .Today: + return String(localized: "onboarding_day_options_today") + case .Previous: + return String(localized: "onboarding_day_options_yesterday") + } + } +} + +struct OnboardingDay: View { + @ObservedObject var onboardingData: OnboardingData + + var previewText: String { + switch onboardingData.inputDay { + case .Today: + return String(localized: "onboarding_day_preview_text_today") + case .Previous: + return String(localized: "onboarding_day_preview_text_yesterday") + } + } + + var body: some View { + ZStack { + GeometryReader { geometry in + VStack { + Spacer() + Image("bad", bundle: .main) + .foregroundColor(Color(UIColor.darkText)) + .opacity(0.04) + .scaleEffect(1.2, anchor: .trailing) + Spacer() + } + + ScrollView { + VStack(alignment: .leading) { + Text(String(localized: "onboarding_day_title")) + .font(.title) + .padding() + .fixedSize(horizontal: false, vertical: true) + .foregroundColor(.white) + + + Picker(selection: $onboardingData.inputDay, + label: Text("")) { + ForEach(DayOptions.allCases, id: \.self) { day in + Text(day.localizedValue) + } + } + .labelsHidden() + .frame(minWidth: 0, maxWidth: .infinity) + .padding() + .pickerStyle(SegmentedPickerStyle()) + .colorScheme(.dark) + + Text(previewText) + .font(.title3) + .padding() + .fixedSize(horizontal: false, vertical: true) + .foregroundColor(.white) + } + } + .padding() + } + } + .background(Color(hex: "ff9e0b")) + } +} + +struct OnboardingDay_Previews: PreviewProvider { + static var previews: some View { + Group{ + OnboardingDay(onboardingData: OnboardingData()) + + OnboardingDay(onboardingData: OnboardingData()) + .preferredColorScheme(.dark) + } + } +} diff --git a/Shared/Onboarding/views/OnboardingMain.swift b/Shared/Onboarding/views/OnboardingMain.swift new file mode 100644 index 0000000..05da6b2 --- /dev/null +++ b/Shared/Onboarding/views/OnboardingMain.swift @@ -0,0 +1,54 @@ +// +// OnboardingMain.swift +// Feels (iOS) +// +// Created by Trey Tartt on 1/20/22. +// + +import SwiftUI + +struct OnboardingMain: View { + @Environment(\.presentationMode) var presentationMode + @State var onboardingData: OnboardingData + + let updateBoardingDataClosure: ((OnboardingData) -> Void) + + var body: some View { + TabView { + OnboardingTime(onboardingData: onboardingData) + + OnboardingDay(onboardingData: onboardingData) + + OnboardingCustomizeTwo(onboardingData: onboardingData) + + OnboardingCustomizeOne(onboardingData: onboardingData) + +// OnboardingTitle(onboardingData: onboardingData) + + OnboardingWrapup(onboardingData: onboardingData, + completionClosure: { _ in + updateBoardingDataClosure(onboardingData) + }) + } + .ignoresSafeArea() + .tabViewStyle(.page) + .onAppear { + setupAppearance() + } + .interactiveDismissDisabled() + } + + func setupAppearance() { + UIPageControl.appearance().currentPageIndicatorTintColor = .white + UIPageControl.appearance().pageIndicatorTintColor = UIColor.black.withAlphaComponent(0.2) + } +} + +struct OnboardingMain_Previews: PreviewProvider { + static var previews: some View { + OnboardingMain(onboardingData: OnboardingData(), + updateBoardingDataClosure: { _ in + + }) + } +} diff --git a/Shared/Onboarding/views/OnboardingTime.swift b/Shared/Onboarding/views/OnboardingTime.swift new file mode 100644 index 0000000..8efbc43 --- /dev/null +++ b/Shared/Onboarding/views/OnboardingTime.swift @@ -0,0 +1,71 @@ +// +// OnboardingTime.swift +// Feels (iOS) +// +// Created by Trey Tartt on 1/20/22. +// + +import SwiftUI + +struct OnboardingTime: View { + @ObservedObject var onboardingData: OnboardingData + + var formatter: DateFormatter { + let dateFormatter = DateFormatter() + dateFormatter.timeStyle = .short + return dateFormatter + } + + var body: some View { + ZStack { + GeometryReader { geometry in + VStack(alignment: .leading) { + Spacer() + Image("horrible", bundle: .main) + .foregroundColor(Color(UIColor.darkText)) + .opacity(0.04) + .scaleEffect(1.2, anchor: .trailing) + Spacer() + } + + + ScrollView { + Text(String(localized: "onboarding_time_title")) + .font(.title) + .padding() + .fixedSize(horizontal: false, vertical: true) + .foregroundColor(Color(UIColor.white)) + + DatePicker("", selection: $onboardingData.date, + displayedComponents: .hourAndMinute) + .scaleEffect(2) + .labelsHidden() + .frame(minWidth: 0, maxWidth: .infinity) + .padding() + .padding([.top, .bottom], 25) + .colorScheme(.dark) + + Text(String(format: String(localized: "onboarding_time_body"), + formatter.string(from: onboardingData.date))) + .font(.title3) + .fixedSize(horizontal: false, vertical: true) + .padding() + .foregroundColor(Color(UIColor.white)) + } + .padding() + } + } + .background(Color(hex: "ff453a")) + } +} + +struct OnboardingTime_Previews: PreviewProvider { + static var previews: some View { + Group { + OnboardingTime(onboardingData: OnboardingData()) + + OnboardingTime(onboardingData: OnboardingData()) + .preferredColorScheme(.dark) + } + } +} diff --git a/Shared/Onboarding/views/OnboardingTitle.swift b/Shared/Onboarding/views/OnboardingTitle.swift new file mode 100644 index 0000000..49cecd8 --- /dev/null +++ b/Shared/Onboarding/views/OnboardingTitle.swift @@ -0,0 +1,84 @@ +// +// OnboardingTitle.swift +// Feels (iOS) +// +// Created by Trey Tartt on 1/20/22. +// + +import SwiftUI + +struct OnboardingTitle: View { + static let titleOptions = [ + String(localized: "onboarding_title_title_option_1"), + String(localized: "onboarding_title_title_option_2"), + String(localized: "onboarding_title_title_option_3")] + + @ObservedObject var onboardingData: OnboardingData + + var body: some View { + ZStack { + + Image("average", bundle: .main) + .foregroundColor(Color(UIColor.darkText)) + .opacity(0.04) + .scaleEffect(1.2) + .padding(.bottom, 55) + + ScrollView { + VStack{ + Text(String(localized: "onboarding_title_title")) + .font(.title) + .foregroundColor(Color(UIColor.white)) + .padding([.trailing, .leading], 55) + .padding([.top], 25) + + ForEach(OnboardingTitle.titleOptions, id: \.self) { option in + Button(action: { +// onboardingData.title = option + }, label: { + Text(option) + .font(.system(size: 15)) + .fontWeight(.bold) + .foregroundColor(.white) + .padding(10) + .background(RoundedRectangle(cornerRadius: 10).stroke().foregroundColor(Color.white)) + .cornerRadius(10) + }) + .buttonStyle(PlainButtonStyle()) + .padding([.top], 10) + } + + Text(String(localized: "onboarding_title_type_your_own")) + .font(.body) + .foregroundColor(Color(UIColor.white)) + .padding([.top], 25) + .padding([.trailing, .leading], 55) + +// TextField("Notification", text: $onboardingData.title) +// .frame(height: 44) +// .foregroundColor(Color(UIColor.white)) +// .textFieldStyle(PlainTextFieldStyle()) +// .padding([.leading, .trailing], 4) +// .cornerRadius(16) +// .overlay(RoundedRectangle(cornerRadius: 16).stroke(Color.white)) +// .padding([.leading, .trailing], 75) +// .padding([.top], 45) + + Spacer() + } + } + } + .background(.orange) + } +} + +struct OnboardingTitle_Previews: PreviewProvider { + static var previews: some View { + Group { + OnboardingTitle(onboardingData: OnboardingData()) + + OnboardingTitle(onboardingData: OnboardingData()) + .preferredColorScheme(.dark) + } + } +} diff --git a/Shared/Onboarding/views/OnboardingWrapup.swift b/Shared/Onboarding/views/OnboardingWrapup.swift new file mode 100644 index 0000000..75de41f --- /dev/null +++ b/Shared/Onboarding/views/OnboardingWrapup.swift @@ -0,0 +1,99 @@ +// +// OnboardingWrapup.swift +// Feels (iOS) +// +// Created by Trey Tartt on 1/21/22. +// + +import SwiftUI + +struct OnboardingWrapup: View { + @ObservedObject var onboardingData: OnboardingData + + let completionClosure: ((OnboardingData) -> Void) + + var formatter: DateFormatter { + let dateFormatter = DateFormatter() + dateFormatter.timeStyle = .short + return dateFormatter + } + + var body: some View { + ZStack { + GeometryReader { geometry in + VStack { + Spacer() + Image("great", bundle: .main) + .foregroundColor(Color(UIColor.darkText)) + .opacity(0.04) + .scaleEffect(1.2, anchor: .trailing) + Spacer() + } + + VStack { + ScrollView { + + Spacer() + + Text(String(localized: "onboarding_wrap_up_1")) + .padding(.top) + .padding() + .font(.title) + .foregroundColor(Color(UIColor.white)) + + Text(formatter.string(from: onboardingData.date)) + .font(.title) + .fontWeight(.bold) + .padding() + .foregroundColor(Color(UIColor.white)) + + Text(String(localized: "onboarding_wrap_up_3")) + .font(.title) + .padding() + .foregroundColor(Color(UIColor.white)) + + Text(onboardingData.inputDay.localizedValue) + .font(.title) + .fontWeight(.bold) + .padding() + .foregroundColor(Color(UIColor.white)) + + Button(action: { + EventLogger.log(event: "onboarding_complete") + EventLogger.log(event: "onboarding_complete_day_id", + withData: ["id": onboardingData.inputDay.rawValue]) + completionClosure(onboardingData) + }, label: { + Text(String(localized: "onboarding_wrap_up_complete_button")) + .font(.title) + .fontWeight(.bold) + .foregroundColor(Color(hex: "31d158")) + .padding() + .background(RoundedRectangle(cornerRadius: 10).fill().foregroundColor(Color.white)) + .cornerRadius(10) + }) + .padding([.top], 65) + } + .multilineTextAlignment(.center) + } + .frame(maxWidth: geometry.size.width) + } + } + .background(Color(hex: "31d158")) + } +} + +struct OnboardingWrapup_Previews: PreviewProvider { + static var previews: some View { + Group { + OnboardingWrapup(onboardingData: OnboardingData(), completionClosure: { _ in + + }) + + OnboardingWrapup(onboardingData: OnboardingData(), completionClosure: { _ in + + }) + .preferredColorScheme(.dark) + } + } +} diff --git a/Shared/Persisence/Persistence.swift b/Shared/Persisence/Persistence.swift new file mode 100644 index 0000000..32fe751 --- /dev/null +++ b/Shared/Persisence/Persistence.swift @@ -0,0 +1,137 @@ +// +// Persistence.swift +// Shared +// +// Created by Trey Tartt on 1/5/22. +// + +import CoreData +import SwiftUI + +class PersistenceController { + @AppStorage(UserDefaultsStore.Keys.useCloudKit.rawValue, store: GroupUserDefaults.groupDefaults) + + private var useCloudKit = false + + static let shared = PersistenceController.persistenceController + + private static var persistenceController: PersistenceController { + return PersistenceController(inMemory: true) + } + + public var viewContext: NSManagedObjectContext { + return PersistenceController.shared.container.viewContext + } + + public lazy var childContext: NSManagedObjectContext = { + NSManagedObjectContext(concurrencyType: .mainQueueConcurrencyType) + }() + + public var switchContainerListeners = [(() -> Void)]() + + private var editedDataClosure = [() -> Void]() + + public var earliestEntry: MoodEntry? { + let fetchRequest = NSFetchRequest(entityName: "MoodEntry") + fetchRequest.sortDescriptors = [NSSortDescriptor(key: "forDate", ascending: true)] + let first = try! viewContext.fetch(fetchRequest).first + return first ?? nil + } + + public var latestEntry: MoodEntry? { + let fetchRequest = NSFetchRequest(entityName: "MoodEntry") + fetchRequest.sortDescriptors = [NSSortDescriptor(key: "forDate", ascending: true)] + let last = try! viewContext.fetch(fetchRequest).last + return last ?? nil + } + + lazy var container: NSPersistentContainer = { + setupContainer() + }() + + func switchContainer() { + try? viewContext.save() + container = setupContainer() + for item in switchContainerListeners { + item() + } + } + + public func addNewDataListener(closure: @escaping (() -> Void)) { + editedDataClosure.append(closure) + } + + public func saveAndRunDataListerners() { + do { + try viewContext.save() + + for closure in editedDataClosure { + closure() + } + } catch { + print(error) + } + } + + private func setupContainer() -> NSPersistentContainer { + if useCloudKit { + container = NSPersistentCloudKitContainer(name: "Feels") + } else { + container = NSCustomPersistentContainer(name: "Feels") + } + + for description in container.persistentStoreDescriptions { + description.setOption(true as NSNumber, forKey: NSPersistentStoreRemoteChangeNotificationPostOptionKey) + description.setOption(true as NSNumber, forKey: NSPersistentHistoryTrackingKey) + description.setOption(true as NSNumber, forKey: NSMigratePersistentStoresAutomaticallyOption) + description.setOption(true as NSNumber, forKey: NSInferMappingModelAutomaticallyOption) + } + + container.loadPersistentStores(completionHandler: { (storeDescription, error) in + self.container.viewContext.automaticallyMergesChangesFromParent = true + + if let error = error as NSError? { + fatalError("Unresolved error \(error), \(error.userInfo)") + } + }) + + return container + } + + init(inMemory: Bool = false) { + container = setupContainer() + } +} + +extension NSManagedObjectContext { + /// Executes the given `NSBatchDeleteRequest` and directly merges the changes to bring the given managed object context up to date. + /// + /// - Parameter batchDeleteRequest: The `NSBatchDeleteRequest` to execute. + /// - Throws: An error if anything went wrong executing the batch deletion. + public func executeAndMergeChanges(using batchDeleteRequest: NSBatchDeleteRequest) throws { + batchDeleteRequest.resultType = .resultTypeObjectIDs + let result = try execute(batchDeleteRequest) as? NSBatchDeleteResult + let changes: [AnyHashable: Any] = [NSDeletedObjectsKey: result?.result as? [NSManagedObjectID] ?? []] + NSManagedObjectContext.mergeChanges(fromRemoteContextSave: changes, into: [self]) + } +} + +class NSCustomPersistentContainer: NSPersistentContainer { + override open class func defaultDirectoryURL() -> URL { +#if DEBUG + if let storeURLDebug = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: Constants.groupShareIdDebug) { + return storeURLDebug.appendingPathComponent("Feels-Debug.sqlite") + } + // Fallback to default location if App Group not available + print("⚠️ App Group not available, using default Core Data location") + return super.defaultDirectoryURL() +#else + if let storeURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: Constants.groupShareId) { + return storeURL.appendingPathComponent("Feels.sqlite") + } + // Fallback to default location if App Group not available + print("⚠️ App Group not available, using default Core Data location") + return super.defaultDirectoryURL() +#endif + } +} diff --git a/Shared/Persisence/PersistenceADD.swift b/Shared/Persisence/PersistenceADD.swift new file mode 100644 index 0000000..ea7e0be --- /dev/null +++ b/Shared/Persisence/PersistenceADD.swift @@ -0,0 +1,98 @@ +// +// PersistenceADD.swift +// Feels +// +// Created by Trey Tartt on 2/17/22. +// + +import CoreData + +extension PersistenceController { + public func fixWrongWeekdays() { + let data = PersistenceController.shared.getData(startDate: Date(timeIntervalSince1970: 0), + endDate: Date(), + includedDays: []).sorted(by: { + $0.forDate! < $1.forDate! + }) + + data.forEach({ + $0.weekDay = Int16(Calendar.current.component(.weekday, from: $0.forDate!)) + }) + try? viewContext.save() + } + + public func add(mood: Mood, forDate date: Date, entryType: EntryType) { + if let existingEntry = getEntry(byDate: date) { + viewContext.delete(existingEntry) + try? viewContext.save() + } + + let newItem = MoodEntry(context: viewContext) + newItem.timestamp = Date() + newItem.moodValue = Int16(mood.rawValue) + newItem.forDate = date + newItem.weekDay = Int16(Calendar.current.component(.weekday, from: date)) + newItem.canEdit = true + newItem.canDelete = true + newItem.entryType = Int16(entryType.rawValue) + + EventLogger.log(event: "add_entry", withData: ["entry_type": entryType.rawValue]) + + saveAndRunDataListerners() + } + + func fillInMissingDates() { + let currentOnboarding = UserDefaultsStore.getOnboarding() + var endDate = ShowBasedOnVoteLogics.getCurrentVotingDate(onboardingData: currentOnboarding) + // since its for views take away the last date so vote is enabled + endDate = Calendar.current.date(byAdding: .day, value: -1, to: endDate)! + + let fetchRequest = NSFetchRequest(entityName: "MoodEntry") + fetchRequest.sortDescriptors = [NSSortDescriptor(key: "forDate", ascending: false)] + let entries = try! viewContext.fetch(fetchRequest) + + if let firstEntry = entries.last?.forDate { + let allDates: [Date] = Date.dates(from: firstEntry, toDate: endDate, includingToDate: true).map({ + let zeroDate = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: $0)! + return zeroDate + }) + + let existingEntries: [Date] = entries.compactMap({ + if let date = $0.forDate { + let zeroDate = Calendar.current.date(bySettingHour: 0, minute: 0, second: 0, of: date)! + return zeroDate + } + return nil + }) + + let allDatesSet = Set(allDates) + let existingEntriesSet = Set(existingEntries) + let missing = Array(allDatesSet.subtracting(existingEntriesSet)).sorted(by: >) + for date in missing { + // add 12 hours, if you enter a things right at 12:00.00 it wont show .... mabye + // due to utc offset? + let adjustedDate = Calendar.current.date(byAdding: .hour, value: 12, to: date)! + add(mood: .missing, forDate: adjustedDate, entryType: .filledInMissing) + } + + if !missing.isEmpty { + EventLogger.log(event: "filled_in_missing_entries", withData: ["count": missing.count]) + } + } + } + + func removeNoForDates() { + let fetchRequest = NSFetchRequest(entityName: "MoodEntry") + fetchRequest.sortDescriptors = [NSSortDescriptor(key: "forDate", ascending: false)] + let entries = try! viewContext.fetch(fetchRequest) + + for entry in entries { + guard let _ = entry.forDate else { + viewContext.delete(entry) + try? viewContext.save() + return + } + } + EventLogger.log(event: "removed_entry_no_for_date", withData: ["count": entries.count]) + } +} diff --git a/Shared/Persisence/PersistenceDELETE.swift b/Shared/Persisence/PersistenceDELETE.swift new file mode 100644 index 0000000..dbc5172 --- /dev/null +++ b/Shared/Persisence/PersistenceDELETE.swift @@ -0,0 +1,44 @@ +// +// PersistenceDELETE.swift +// Feels +// +// Created by Trey Tartt on 2/17/22. +// + +import CoreData + +extension PersistenceController { + func clearDB() { + let fetchRequest: NSFetchRequest = NSFetchRequest(entityName: "MoodEntry") + let deleteRequest = NSBatchDeleteRequest(fetchRequest: fetchRequest) + + do { + try viewContext.executeAndMergeChanges(using: deleteRequest) + saveAndRunDataListerners() + } catch let error as NSError { + fatalError("Unresolved error \(error), \(error.userInfo)") + } + } + + func deleteLast(numberOfEntries: Int) { + let entries = PersistenceController.shared.getData(startDate: Calendar.current.date(byAdding: .day, value: -numberOfEntries, to: Date())!, + endDate: Date(), + includedDays: []) + for entry in entries { + viewContext.delete(entry) + } + try! viewContext.save() + } + + func deleteRandomFromLast(numberOfEntries: Int) { + let entries = PersistenceController.shared.getData(startDate: Calendar.current.date(byAdding: .day, value: -numberOfEntries, to: Date())!, + endDate: Date(), + includedDays: []) + for entry in entries { + if Bool.random() { + viewContext.delete(entry) + } + } + try! viewContext.save() + } +} diff --git a/Shared/Persisence/PersistenceGET.swift b/Shared/Persisence/PersistenceGET.swift new file mode 100644 index 0000000..57cfde2 --- /dev/null +++ b/Shared/Persisence/PersistenceGET.swift @@ -0,0 +1,92 @@ +// +// PersistenceGET.swift +// Feels +// +// Created by Trey Tartt on 2/17/22. +// + +import CoreData + +extension PersistenceController { + public func getEntry(byDate date: Date) -> MoodEntry? { + let startDate = Calendar.current.startOfDay(for: date) + let endDate = Calendar.current.date(byAdding: .day, value: 1, to: startDate)! + + let predicate = NSPredicate(format: "forDate >= %@ && forDate <= %@ ", + startDate as NSDate, + endDate as NSDate) + + let fetchRequest = NSFetchRequest(entityName: "MoodEntry") + fetchRequest.predicate = predicate + fetchRequest.sortDescriptors = [NSSortDescriptor(key: "forDate", ascending: true)] + let data = try! viewContext.fetch(fetchRequest) + return data.first + } + + public func getData(startDate: Date, endDate: Date, includedDays: [Int]) -> [MoodEntry] { + try! viewContext.setQueryGenerationFrom(.current) +// viewContext.refreshAllObjects() + + var includedDays16 = [Int16]() + + if includedDays.isEmpty { + includedDays16 = [Int16(1), Int16(2), Int16(3), Int16(4), Int16(5), Int16(6), Int16(7)] + } else { + includedDays16 = includedDays.map({ + Int16($0) + }) + } + let predicate = NSPredicate(format: "forDate >= %@ && forDate <= %@ && weekDay IN %@", + startDate as NSDate, + endDate as NSDate, + includedDays16) + + let fetchRequest = NSFetchRequest(entityName: "MoodEntry") + fetchRequest.predicate = predicate + fetchRequest.sortDescriptors = [NSSortDescriptor(key: "forDate", ascending: true)] + let data = try! viewContext.fetch(fetchRequest) + return data + } + + public func splitIntoYearMonth(includedDays: [Int]) -> [Int: [Int: [MoodEntry]]] { + let data = PersistenceController.shared.getData(startDate: Date(timeIntervalSince1970: 0), + endDate: Date(), + includedDays: includedDays).sorted(by: { + $0.forDate! < $1.forDate! + }) + var returnData = [Int: [Int: [MoodEntry]]]() + + if let earliestEntry = data.first, + let lastEntry = data.last { + + let calendar = Calendar.current + let components = calendar.dateComponents([.year], from: earliestEntry.forDate!) + let earliestYear = components.year! + + let latestComponents = calendar.dateComponents([.year], from: lastEntry.forDate!) + let latestYear = latestComponents.year! + + for year in earliestYear...latestYear { + var allMonths = [Int: [MoodEntry]]() + + for month in (1...12) { + var components = DateComponents() + components.month = month + components.year = year + components.day = 1 + let startDateOfMonth = Calendar.current.date(from: components)! + + let items = PersistenceController.shared.getData(startDate: startDateOfMonth, + endDate: startDateOfMonth.endOfMonth, + includedDays: [1,2,3,4,5,6,7]) + + if !items.isEmpty { + allMonths[month] = items + } + } + returnData[year] = allMonths + } + } + return returnData + } +} diff --git a/Shared/Persisence/PersistenceHelper.swift b/Shared/Persisence/PersistenceHelper.swift new file mode 100644 index 0000000..b55132c --- /dev/null +++ b/Shared/Persisence/PersistenceHelper.swift @@ -0,0 +1,107 @@ +// +// PersistenceHelper.swift +// Feels (iOS) +// +// Created by Trey Tartt on 2/17/22. +// + +import CoreData + +extension PersistenceController { + public func randomEntries(count: Int) -> [MoodEntry] { + var entries = [MoodEntry]() + + for idx in 0.. MoodEntry { + let newItem = MoodEntry(context: childContext) + newItem.timestamp = Date() + newItem.moodValue = Int16.random(in: 2 ... 4) + if Int16.random(in: 0 ... 400) % 5 == 0 { + newItem.moodValue = Int16.random(in: 0 ... 4) + } + newItem.forDate = date + newItem.weekDay = Int16(Calendar.current.component(.weekday, from: Date())) + newItem.canEdit = false + newItem.canDelete = false + return newItem + } + + func populateTestData() { + do { + self.clearDB() + try viewContext.save() + + for idx in 1..<1000 { + let newItem = MoodEntry(context: viewContext) + newItem.timestamp = Date() + newItem.moodValue = Int16.random(in: 3 ... 4) + if Int16.random(in: 0 ... 400) % 5 == 0 { + newItem.moodValue = Int16.random(in: 0 ... 4) + } + newItem.canEdit = true + newItem.canDelete = true + + let date = Calendar.current.date(byAdding: .day, value: -idx, to: Date())! + newItem.forDate = date + newItem.weekDay = Int16(Calendar.current.component(.weekday, from: date)) + } + + saveAndRunDataListerners() + } catch { + // Replace this implementation with code to handle the error appropriately. + // fatalError() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development. + let nsError = error as NSError + fatalError("Unresolved error \(nsError), \(nsError.userInfo)") + } + } + + func longestStreak() -> [MoodEntry] { + // let predicate = NSPredicate(format: "forDate == %@", date as NSDate) + + let fetchRequest = NSFetchRequest(entityName: "MoodEntry") + // fetchRequest.predicate = predicate + fetchRequest.sortDescriptors = [NSSortDescriptor(key: "forDate", ascending: true)] + let data = try! viewContext.fetch(fetchRequest) + return data + } +} diff --git a/Shared/Persisence/PersistenceUPDATE.swift b/Shared/Persisence/PersistenceUPDATE.swift new file mode 100644 index 0000000..1cd401e --- /dev/null +++ b/Shared/Persisence/PersistenceUPDATE.swift @@ -0,0 +1,24 @@ +// +// PersistenceUPDATE.swift +// Feels +// +// Created by Trey Tartt on 2/18/22. +// + +import Foundation + +extension PersistenceController { + @discardableResult + public func update(entryDate: Date, withModd mood: Mood) -> Bool { + guard let existingEntry = getEntry(byDate: entryDate) else { + return false + } + + existingEntry.setValue(mood.rawValue, forKey: "moodValue") + saveAndRunDataListerners() + + EventLogger.log(event: "update_entry") + + return true + } +} diff --git a/Shared/Protocols/ChartDataBuildable.swift b/Shared/Protocols/ChartDataBuildable.swift new file mode 100644 index 0000000..9b4854b --- /dev/null +++ b/Shared/Protocols/ChartDataBuildable.swift @@ -0,0 +1,108 @@ +// +// ChartDataBuildable.swift +// Feels +// +// Created by Trey Tartt on 1/17/22. +// + +import SwiftUI + +typealias Year = Int +typealias Month = Int + +protocol ChartDataBuildable { + associatedtype ChartType: ChartViewItemBuildable + // [Year: [Month: [View]] + func buildGridData(withData data: [MoodEntry]) -> [Year: [Month: [ChartType]]] +} + +extension ChartDataBuildable { + public func buildGridData(withData data: [MoodEntry]) -> [Year: [Month: [ChartType]]] { + var returnData = [Int: [Int: [ChartType]]]() + + if let earliestEntry = data.first, + let lastEntry = data.last { + + let calendar = Calendar.current + let components = calendar.dateComponents([.year], from: earliestEntry.forDate!) + let earliestYear = components.year! + + let latestComponents = calendar.dateComponents([.year], from: lastEntry.forDate!) + let latestYear = latestComponents.year! + + for year in earliestYear...latestYear { + var allMonths = [Int: [ChartType]]() + + // add back in if months header has leading (-1, ""), + // and add back gridItem + // var dayViews = [DayChartView]() + // for day in 0...32 { + // let view = DayChartView(color: Mood.missing.color, + // weekDay: 2, + // viewType: .text(String(day+1))) + // dayViews.append(view) + // } + // allMonths[0] = dayViews + + for month in (1...12) { + var components = DateComponents() + components.month = month + components.year = year + let startDateOfMonth = Calendar.current.date(from: components)! + + let items = data.filter({ entry in + let components = calendar.dateComponents([.month, .year], from: startDateOfMonth) + let entryComponents = calendar.dateComponents([.month, .year], from: entry.forDate!) + return (components.month == entryComponents.month && components.year == entryComponents.year) + }) + + allMonths[month] = createViewFor(monthEntries: items, forMonth: startDateOfMonth) + } + returnData[year] = allMonths + } + } + return returnData + } + + private func createViewFor(monthEntries: [MoodEntry], forMonth month: Date) -> [ChartType] { + var filledOutArray = [ChartType]() + + let calendar = Calendar.current + let range = calendar.range(of: .day, in: .month, for: month)! + let numDays = range.count + + for day in 1...numDays { + if let item = monthEntries.filter({ entry in + let components = calendar.dateComponents([.day], from: entry.forDate!) + let date = components.day + return day == date + }).first { + let moodTint: MoodTintable.Type = UserDefaultsStore.moodTintable() + + let view = ChartType(color: moodTint.color(forMood: item.mood), + weekDay: Int(item.weekDay), + shape: UserDefaultsStore.getCustomBGShape()) + filledOutArray.append(view) + } else { + let thisDate = Calendar.current.date(bySetting: .day, value: day, of: month)! + let view = ChartType(color: Mood.placeholder.color, + weekDay: Calendar.current.component(.weekday, from: thisDate), + shape: UserDefaultsStore.getCustomBGShape()) + filledOutArray.append(view) + } + } + + for _ in filledOutArray.count...32 { + let view = ChartType(color: Mood.placeholder.color, + weekDay: 2, + shape: UserDefaultsStore.getCustomBGShape()) + filledOutArray.append(view) + } + + return filledOutArray + } +} + +struct DayChartViewChartBuilder: ChartDataBuildable { + typealias ChartType = DayChartView +} diff --git a/Shared/Protocols/ChartViewItemBuildable.swift b/Shared/Protocols/ChartViewItemBuildable.swift new file mode 100644 index 0000000..b7e2f8e --- /dev/null +++ b/Shared/Protocols/ChartViewItemBuildable.swift @@ -0,0 +1,16 @@ +// +// ChartViewItemBuildable.swift +// Feels +// +// Created by Trey Tartt on 1/17/22. +// + +import SwiftUI + +protocol ChartViewItemBuildable: View { + var color: Color { get } + var weekDay: Int { get } + var shape: BGShape { get } + + init(color: Color, weekDay: Int, shape: BGShape) +} diff --git a/Shared/Protocols/SharingTemplate.swift b/Shared/Protocols/SharingTemplate.swift new file mode 100644 index 0000000..334954e --- /dev/null +++ b/Shared/Protocols/SharingTemplate.swift @@ -0,0 +1,23 @@ +// +// SharingTemplate.swift +// Feels (iOS) +// +// Created by Trey Tartt on 2/6/22. +// + +import Foundation +import SwiftUI + +protocol SharingTemplate { + associatedtype MainView : View + associatedtype Preview : View + + var startDate: Date { get } + var endDate: Date { get } + var isPreview: Bool { get } + var image: UIImage { get } + static var description: String { get } + + @ViewBuilder var mainView: Self.MainView { get } + @ViewBuilder var preview: Self.Preview { get } +} diff --git a/Shared/Random.swift b/Shared/Random.swift new file mode 100644 index 0000000..55669cf --- /dev/null +++ b/Shared/Random.swift @@ -0,0 +1,224 @@ +// +// Random.swift +// Feels +// +// Created by Trey Tartt on 1/9/22. +// + +import Foundation +import SwiftUI + +struct Constants { + static let groupShareId = "group.com.tt.ifeel" + static let groupShareIdDebug = "group.com.tt.ifeelDebug" + + static let viewsCornerRaidus: CGFloat = 10 +} + +struct GroupUserDefaults { + static var groupDefaults: UserDefaults { +#if DEBUG + return UserDefaults(suiteName: Constants.groupShareIdDebug)! +#else + return UserDefaults(suiteName: Constants.groupShareId)! +#endif + } +} + +class Random { + static var tomorrowMidnightThirty: Date { + let components = DateComponents(hour: 0, minute: 30, second: 0) + var updateTime = Date() + if let tomorrow = Calendar.current.date(byAdding: .day, value: 1, to: Date()), + let tomorrowMorning = Calendar.current.date(byAdding: components, to: tomorrow) { + updateTime = tomorrowMorning + } + return updateTime + } + + static var existingWeekdayName = [Int: String]() + static func weekdayName(fromDate date: Date) -> String { + let weekday = Calendar.current.component(.weekday, from: date) + let calendar = Calendar.current + let dayIndex = ((weekday - 1) + (calendar.firstWeekday - 1)) % 7 + if let value = Random.existingWeekdayName[dayIndex] { + return value + } + let newValue = calendar.weekdaySymbols[dayIndex] + Random.existingWeekdayName[dayIndex] = newValue + return newValue + } + + static func monthName(fromMonthInt: Int) -> String { + let monthName = DateFormatter().monthSymbols[fromMonthInt-1] + return monthName + } + + static var existingDayFormat = [NSNumber: String]() + static func dayFormat(fromDate date: Date) -> String { + let components = Calendar.current.dateComponents([.day], from: date) + let day = components.day! + + let formatter = NumberFormatter() + formatter.numberStyle = .ordinal + let num = NSNumber(integerLiteral: day) + if let value = existingDayFormat[num] { + return value + } + let newValue = formatter.string(from: num) ?? "" + existingDayFormat[num] = newValue + return newValue + } + + static func createTotalPerc(fromEntries entries: [MoodEntry]) -> [MoodMetrics] { + let filteredEntries = entries.filter({ + return ![.missing, .placeholder].contains($0.mood) + }) + var returnData = [MoodMetrics]() + + for (_, mood) in Mood.allValues.enumerated() { + let moodEntries = filteredEntries.filter({ + Int($0.moodValue) == mood.rawValue + }) + let total = moodEntries.count + let perc = (Float(total) / Float(filteredEntries.count)) * 100 + returnData.append(MoodMetrics(mood: mood, total: total, percent: perc)) + } + + returnData = returnData.sorted(by: { + $0.mood.rawValue > $1.mood.rawValue + }) + + return returnData + } +} + +struct RoundedCorner: Shape { + + var radius: CGFloat = .infinity + var corners: UIRectCorner = .allCorners + + func path(in rect: CGRect) -> Path { + let path = UIBezierPath(roundedRect: rect, byRoundingCorners: corners, cornerRadii: CGSize(width: radius, height: radius)) + return Path(path.cgPath) + } +} + +extension View { + func cornerRadius(_ radius: CGFloat, corners: UIRectCorner) -> some View { + clipShape( RoundedCorner(radius: radius, corners: corners) ) + } + + func snapshot() -> UIImage { + let controller = UIHostingController(rootView: self) + let view = controller.view + let targetSize = controller.view.intrinsicContentSize + view?.bounds = CGRect(origin: .zero, size: targetSize) + view?.backgroundColor = .clear + let renderer = UIGraphicsImageRenderer(size: targetSize) + return renderer.image { _ in + view?.drawHierarchy(in: controller.view.bounds, afterScreenUpdates: true) + } + } + + func asImage(size: CGSize) -> UIImage { + let controller = UIHostingController(rootView: self) + controller.view.bounds = CGRect(origin: .zero, size: size) + let image = controller.view.asImage() + return image + } +} + +extension UIView { + func asImage() -> UIImage { + let format = UIGraphicsImageRendererFormat() + format.scale = 1 + return UIGraphicsImageRenderer(size: self.layer.frame.size, format: format).image { context in + self.drawHierarchy(in: self.layer.bounds, afterScreenUpdates: true) + } + } +} + +extension Color { + static func random() -> Self { + Self( + red: .random(in: 0...1), + green: .random(in: 0...1), + blue: .random(in: 0...1) + ) + } + + public func lighter(by amount: CGFloat = 0.2) -> Self { Self(UIColor(self).lighter(by: amount)) } + public func darker(by amount: CGFloat = 0.2) -> Self { Self(UIColor(self).darker(by: amount)) } +} + +extension String { + func textToImage() -> UIImage? { + let nsString = (self as NSString) + let font = UIFont.systemFont(ofSize: 100) // you can change your font size here + let stringAttributes = [NSAttributedString.Key.font: font] + let imageSize = nsString.size(withAttributes: stringAttributes) + + UIGraphicsBeginImageContextWithOptions(imageSize, false, 0) // begin image context + UIColor.clear.set() // clear background + UIRectFill(CGRect(origin: CGPoint(), size: imageSize)) // set rect size + nsString.draw(at: CGPoint.zero, withAttributes: stringAttributes) // draw text within rect + let image = UIGraphicsGetImageFromCurrentImageContext() // create image from context + UIGraphicsEndImageContext() // end image context + + return image ?? UIImage() + } +} + +extension UIColor { + + func lighter(by percentage: CGFloat = 10.0) -> UIColor { + return self.adjust(by: abs(percentage)) + } + + func darker(by percentage: CGFloat = 10.0) -> UIColor { + return self.adjust(by: -abs(percentage)) + } + + func adjust(by percentage: CGFloat) -> UIColor { + var alpha, hue, saturation, brightness, red, green, blue, white : CGFloat + (alpha, hue, saturation, brightness, red, green, blue, white) = (0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) + + let multiplier = percentage / 100.0 + + if self.getHue(&hue, saturation: &saturation, brightness: &brightness, alpha: &alpha) { + let newBrightness: CGFloat = max(min(brightness + multiplier*brightness, 1.0), 0.0) + return UIColor(hue: hue, saturation: saturation, brightness: newBrightness, alpha: alpha) + } + else if self.getRed(&red, green: &green, blue: &blue, alpha: &alpha) { + let newRed: CGFloat = min(max(red + multiplier*red, 0.0), 1.0) + let newGreen: CGFloat = min(max(green + multiplier*green, 0.0), 1.0) + let newBlue: CGFloat = min(max(blue + multiplier*blue, 0.0), 1.0) + return UIColor(red: newRed, green: newGreen, blue: newBlue, alpha: alpha) + } + else if self.getWhite(&white, alpha: &alpha) { + let newWhite: CGFloat = (white + multiplier*white) + return UIColor(white: newWhite, alpha: alpha) + } + + return self + } +} + +extension Bundle { + var appName: String { + return infoDictionary?["CFBundleName"] as! String + } + + var bundleId: String { + return bundleIdentifier! + } + + var versionNumber: String { + return infoDictionary?["CFBundleShortVersionString"] as! String + } + + var buildNumber: String { + return infoDictionary?["CFBundleVersion"] as! String + } +} diff --git a/Shared/ShowBasedOnVoteLogics.swift b/Shared/ShowBasedOnVoteLogics.swift new file mode 100644 index 0000000..eeaaeb0 --- /dev/null +++ b/Shared/ShowBasedOnVoteLogics.swift @@ -0,0 +1,119 @@ +// +// ShowBasedOnVoteLogics.swift +// Feels (iOS) +// +// Created by Trey Tartt on 2/17/22. +// + +import CoreData +import SwiftUI + + +/* + current day 3/5/22 + + ..... before time | after time ..... + + day option = .today + ------- + voting for 3/4 | voting for 3/5 + ------------------------*------------------------- + db should contain 3/3 | db should contain 3/4 + + ---------------------------------------------------------------------------- + + day option = .yesterday + -------- + voting for 3/3 | voting for 3/4 + ------------------------*------------------------- + db should contain 3/2 | db should contain 3/3 + + */ +class ShowBasedOnVoteLogics { + static private func returnCurrentVoteStatus(onboardingData: OnboardingData) -> (passedTimeToVote: Bool, inputDay: DayOptions) { + let passedTimeToVote = ShowBasedOnVoteLogics.passedTodaysVotingUnlock(voteDate: onboardingData.date) + let inputDay: DayOptions = onboardingData.inputDay + + return (passedTimeToVote, inputDay) + } + + static public func passedTodaysVotingUnlock(voteDate: Date) -> Bool { + let currentDateComp = Calendar.current.dateComponents([.hour, .minute], from: Date()) + let savedDateComp = Calendar.current.dateComponents([.hour, .minute], from: voteDate) + + if let currentHour = currentDateComp.hour, + let currentMin = currentDateComp.minute, + let savedHour = savedDateComp.hour, + let savedMin = savedDateComp.minute { + + if currentHour > savedHour { + return true + } + + if currentHour == savedHour { + return currentMin >= savedMin + } + } + + return false + } + + static public func isMissingCurrentVote(onboardingData: OnboardingData) -> Bool { + let startDate = ShowBasedOnVoteLogics.getCurrentVotingDate(onboardingData: onboardingData).startOfDay + let endDate = startDate.endOfDay + + let fetchRequest = NSFetchRequest(entityName: "MoodEntry") + let fromPredicate = NSPredicate(format: "%@ <= %K", startDate + as NSDate, #keyPath(MoodEntry.forDate)) + let toPredicate = NSPredicate(format: "%K < %@", #keyPath(MoodEntry.forDate), endDate as NSDate) + let datePredicate = NSCompoundPredicate(andPredicateWithSubpredicates: [fromPredicate, toPredicate]) + fetchRequest.predicate = datePredicate + let entries = try! PersistenceController.shared.viewContext.count(for: fetchRequest) + + return entries < 1 + } + + static public func getCurrentVotingDate(onboardingData: OnboardingData) -> Date { + var date: Date? + let currentVoteStatus = ShowBasedOnVoteLogics.returnCurrentVoteStatus(onboardingData: onboardingData) + // note to future self, this should account for midnight until next voting unlock + // the vote at 12:03 am will not be passed time, and will be for yesterday + switch (currentVoteStatus.passedTimeToVote, currentVoteStatus.inputDay) { + case (false, .Today): + // if we're passed time to vote and the voting type is previous - last vote should be -1 + date = Calendar.current.date(byAdding: .day, value: -1, to: Date()) + case (true, .Today): + // if we're passed time to vote and the voting type is previous - last vote should be today + date = Date() + + case (false, .Previous): + // if we're passed time to vote and the voting type is previous - last vote should be -2 + date = Calendar.current.date(byAdding: .day, value: -2, to: Date()) + case (true, .Previous): + // if we're passed time to vote and the voting type is previous - last vote should be -1 + date = Calendar.current.date(byAdding: .day, value: -1, to: Date()) + } + + guard let date = date else { + fatalError("missing getCurrentVotingDate") + } + + return date + } + + static public func getVotingTitle(onboardingData: OnboardingData) -> String { + let currentVoteStatus = ShowBasedOnVoteLogics.returnCurrentVoteStatus(onboardingData: onboardingData) + switch (currentVoteStatus.passedTimeToVote, currentVoteStatus.inputDay) { + case (false, .Today): + return String(localized: "add_mood_header_view_title_yesterday") + case (true, .Today): + return String(localized: "add_mood_header_view_title_today") + + case (false, .Previous): + let date = Calendar.current.date(byAdding: .day, value: -2, to: Date())! + return String(format: String(localized: "add_mood_header_view_title"), Random.weekdayName(fromDate: date)) + case (true, .Previous): + return String(localized: "add_mood_header_view_title_yesterday") + } + } +} diff --git a/Shared/Stats.swift b/Shared/Stats.swift new file mode 100644 index 0000000..5cbc2e9 --- /dev/null +++ b/Shared/Stats.swift @@ -0,0 +1,17 @@ +// +// Stats.swift +// Feels +// +// Created by Trey Tartt on 1/14/22. +// + +import Foundation + +class Stats { + static func getCountFor(moodType: Mood, inData data: [MoodEntry]) -> Int { + let num = data.filter({ + $0.moodValue == moodType.rawValue + }).count + return num + } +} diff --git a/Shared2/View+Extensions.swift b/Shared/View+Extensions.swift similarity index 100% rename from Shared2/View+Extensions.swift rename to Shared/View+Extensions.swift diff --git a/Shared2/Views/ActivityViewController.swift b/Shared/Views/ActivityViewController.swift similarity index 100% rename from Shared2/Views/ActivityViewController.swift rename to Shared/Views/ActivityViewController.swift diff --git a/Shared2/Views/AddMoodHeaderView.swift b/Shared/Views/AddMoodHeaderView.swift similarity index 100% rename from Shared2/Views/AddMoodHeaderView.swift rename to Shared/Views/AddMoodHeaderView.swift diff --git a/Shared2/Views/BGView.swift b/Shared/Views/BGView.swift similarity index 100% rename from Shared2/Views/BGView.swift rename to Shared/Views/BGView.swift diff --git a/Shared2/Views/CustomIcon/CreateWidgetView.swift b/Shared/Views/CustomIcon/CreateWidgetView.swift similarity index 100% rename from Shared2/Views/CustomIcon/CreateWidgetView.swift rename to Shared/Views/CustomIcon/CreateWidgetView.swift diff --git a/Shared2/Views/CustomIcon/IconView.swift b/Shared/Views/CustomIcon/IconView.swift similarity index 100% rename from Shared2/Views/CustomIcon/IconView.swift rename to Shared/Views/CustomIcon/IconView.swift diff --git a/Shared2/Views/CustomIcon/IconViewModel.swift b/Shared/Views/CustomIcon/IconViewModel.swift similarity index 100% rename from Shared2/Views/CustomIcon/IconViewModel.swift rename to Shared/Views/CustomIcon/IconViewModel.swift diff --git a/Shared2/Views/CustomWidget/CustomWidgetModel.swift b/Shared/Views/CustomWidget/CustomWidgetModel.swift similarity index 100% rename from Shared2/Views/CustomWidget/CustomWidgetModel.swift rename to Shared/Views/CustomWidget/CustomWidgetModel.swift diff --git a/Shared2/Views/CustomWidget/CustomWidgetView.swift b/Shared/Views/CustomWidget/CustomWidgetView.swift similarity index 100% rename from Shared2/Views/CustomWidget/CustomWidgetView.swift rename to Shared/Views/CustomWidget/CustomWidgetView.swift diff --git a/Shared2/Views/CustomizeView/CustomizeView.swift b/Shared/Views/CustomizeView/CustomizeView.swift similarity index 100% rename from Shared2/Views/CustomizeView/CustomizeView.swift rename to Shared/Views/CustomizeView/CustomizeView.swift diff --git a/Shared2/Views/CustomizeView/SubViews/CustomWigetView.swift b/Shared/Views/CustomizeView/SubViews/CustomWigetView.swift similarity index 100% rename from Shared2/Views/CustomizeView/SubViews/CustomWigetView.swift rename to Shared/Views/CustomizeView/SubViews/CustomWigetView.swift diff --git a/Shared2/Views/CustomizeView/SubViews/DayFilterPickerView.swift b/Shared/Views/CustomizeView/SubViews/DayFilterPickerView.swift similarity index 100% rename from Shared2/Views/CustomizeView/SubViews/DayFilterPickerView.swift rename to Shared/Views/CustomizeView/SubViews/DayFilterPickerView.swift diff --git a/Shared2/Views/CustomizeView/SubViews/IconPickerView.swift b/Shared/Views/CustomizeView/SubViews/IconPickerView.swift similarity index 100% rename from Shared2/Views/CustomizeView/SubViews/IconPickerView.swift rename to Shared/Views/CustomizeView/SubViews/IconPickerView.swift diff --git a/Shared2/Views/CustomizeView/SubViews/ImagePackPickerView.swift b/Shared/Views/CustomizeView/SubViews/ImagePackPickerView.swift similarity index 100% rename from Shared2/Views/CustomizeView/SubViews/ImagePackPickerView.swift rename to Shared/Views/CustomizeView/SubViews/ImagePackPickerView.swift diff --git a/Shared2/Views/CustomizeView/SubViews/PersonalityPackPickerView.swift b/Shared/Views/CustomizeView/SubViews/PersonalityPackPickerView.swift similarity index 100% rename from Shared2/Views/CustomizeView/SubViews/PersonalityPackPickerView.swift rename to Shared/Views/CustomizeView/SubViews/PersonalityPackPickerView.swift diff --git a/Shared2/Views/CustomizeView/SubViews/ShapePickerView.swift b/Shared/Views/CustomizeView/SubViews/ShapePickerView.swift similarity index 100% rename from Shared2/Views/CustomizeView/SubViews/ShapePickerView.swift rename to Shared/Views/CustomizeView/SubViews/ShapePickerView.swift diff --git a/Shared2/Views/CustomizeView/SubViews/TextColorPickerView.swift b/Shared/Views/CustomizeView/SubViews/TextColorPickerView.swift similarity index 100% rename from Shared2/Views/CustomizeView/SubViews/TextColorPickerView.swift rename to Shared/Views/CustomizeView/SubViews/TextColorPickerView.swift diff --git a/Shared2/Views/CustomizeView/SubViews/ThemePickerView.swift b/Shared/Views/CustomizeView/SubViews/ThemePickerView.swift similarity index 100% rename from Shared2/Views/CustomizeView/SubViews/ThemePickerView.swift rename to Shared/Views/CustomizeView/SubViews/ThemePickerView.swift diff --git a/Shared2/Views/CustomizeView/SubViews/TintPickerView.swift b/Shared/Views/CustomizeView/SubViews/TintPickerView.swift similarity index 100% rename from Shared2/Views/CustomizeView/SubViews/TintPickerView.swift rename to Shared/Views/CustomizeView/SubViews/TintPickerView.swift diff --git a/Shared2/Views/DayChartView.swift b/Shared/Views/DayChartView.swift similarity index 100% rename from Shared2/Views/DayChartView.swift rename to Shared/Views/DayChartView.swift diff --git a/Shared2/Views/DayView/DayView.swift b/Shared/Views/DayView/DayView.swift similarity index 100% rename from Shared2/Views/DayView/DayView.swift rename to Shared/Views/DayView/DayView.swift diff --git a/Shared2/Views/DayView/DayViewViewModel.swift b/Shared/Views/DayView/DayViewViewModel.swift similarity index 100% rename from Shared2/Views/DayView/DayViewViewModel.swift rename to Shared/Views/DayView/DayViewViewModel.swift diff --git a/Shared2/Views/EmptyView.swift b/Shared/Views/EmptyView.swift similarity index 100% rename from Shared2/Views/EmptyView.swift rename to Shared/Views/EmptyView.swift diff --git a/Shared2/Views/EntryListView.swift b/Shared/Views/EntryListView.swift similarity index 100% rename from Shared2/Views/EntryListView.swift rename to Shared/Views/EntryListView.swift diff --git a/Shared2/Views/FeelsSubscriptionStoreView.swift b/Shared/Views/FeelsSubscriptionStoreView.swift similarity index 100% rename from Shared2/Views/FeelsSubscriptionStoreView.swift rename to Shared/Views/FeelsSubscriptionStoreView.swift diff --git a/Shared2/Views/GraphView.swift b/Shared/Views/GraphView.swift similarity index 100% rename from Shared2/Views/GraphView.swift rename to Shared/Views/GraphView.swift diff --git a/Shared2/Views/HeaderPercView.swift b/Shared/Views/HeaderPercView.swift similarity index 100% rename from Shared2/Views/HeaderPercView.swift rename to Shared/Views/HeaderPercView.swift diff --git a/Shared2/Views/HeaderStatsView.swift b/Shared/Views/HeaderStatsView.swift similarity index 100% rename from Shared2/Views/HeaderStatsView.swift rename to Shared/Views/HeaderStatsView.swift diff --git a/Shared2/Views/IAPWarningView.swift b/Shared/Views/IAPWarningView.swift similarity index 100% rename from Shared2/Views/IAPWarningView.swift rename to Shared/Views/IAPWarningView.swift diff --git a/Shared2/Views/ImagePickerGridView.swift b/Shared/Views/ImagePickerGridView.swift similarity index 100% rename from Shared2/Views/ImagePickerGridView.swift rename to Shared/Views/ImagePickerGridView.swift diff --git a/Shared2/Views/MainTabView.swift b/Shared/Views/MainTabView.swift similarity index 100% rename from Shared2/Views/MainTabView.swift rename to Shared/Views/MainTabView.swift diff --git a/Shared2/Views/MonthView/MonthDetailView.swift b/Shared/Views/MonthView/MonthDetailView.swift similarity index 100% rename from Shared2/Views/MonthView/MonthDetailView.swift rename to Shared/Views/MonthView/MonthDetailView.swift diff --git a/Shared2/Views/MonthView/MonthView.swift b/Shared/Views/MonthView/MonthView.swift similarity index 100% rename from Shared2/Views/MonthView/MonthView.swift rename to Shared/Views/MonthView/MonthView.swift diff --git a/Shared2/Views/PurchaseButtonView.swift b/Shared/Views/PurchaseButtonView.swift similarity index 100% rename from Shared2/Views/PurchaseButtonView.swift rename to Shared/Views/PurchaseButtonView.swift diff --git a/Shared2/Views/SampleEntryView.swift b/Shared/Views/SampleEntryView.swift similarity index 100% rename from Shared2/Views/SampleEntryView.swift rename to Shared/Views/SampleEntryView.swift diff --git a/Shared2/Views/SettingsView/SettingsView.swift b/Shared/Views/SettingsView/SettingsView.swift similarity index 100% rename from Shared2/Views/SettingsView/SettingsView.swift rename to Shared/Views/SettingsView/SettingsView.swift diff --git a/Shared2/Views/Sharing/SharingListView.swift b/Shared/Views/Sharing/SharingListView.swift similarity index 100% rename from Shared2/Views/Sharing/SharingListView.swift rename to Shared/Views/Sharing/SharingListView.swift diff --git a/Shared2/Views/SharingTemplates/AllMoodsTotalTemplate.swift b/Shared/Views/SharingTemplates/AllMoodsTotalTemplate.swift similarity index 100% rename from Shared2/Views/SharingTemplates/AllMoodsTotalTemplate.swift rename to Shared/Views/SharingTemplates/AllMoodsTotalTemplate.swift diff --git a/Shared2/Views/SharingTemplates/CurrentStreakTemplate.swift b/Shared/Views/SharingTemplates/CurrentStreakTemplate.swift similarity index 100% rename from Shared2/Views/SharingTemplates/CurrentStreakTemplate.swift rename to Shared/Views/SharingTemplates/CurrentStreakTemplate.swift diff --git a/Shared2/Views/SharingTemplates/LongestStreakTemplate.swift b/Shared/Views/SharingTemplates/LongestStreakTemplate.swift similarity index 100% rename from Shared2/Views/SharingTemplates/LongestStreakTemplate.swift rename to Shared/Views/SharingTemplates/LongestStreakTemplate.swift diff --git a/Shared2/Views/SharingTemplates/MonthTotalTemplate.swift b/Shared/Views/SharingTemplates/MonthTotalTemplate.swift similarity index 100% rename from Shared2/Views/SharingTemplates/MonthTotalTemplate.swift rename to Shared/Views/SharingTemplates/MonthTotalTemplate.swift diff --git a/Shared2/Views/SharingTemplates/WeekTotalTemplate.swift b/Shared/Views/SharingTemplates/WeekTotalTemplate.swift similarity index 100% rename from Shared2/Views/SharingTemplates/WeekTotalTemplate.swift rename to Shared/Views/SharingTemplates/WeekTotalTemplate.swift diff --git a/Shared2/Views/SmallRollUpHeaderView.swift b/Shared/Views/SmallRollUpHeaderView.swift similarity index 100% rename from Shared2/Views/SmallRollUpHeaderView.swift rename to Shared/Views/SmallRollUpHeaderView.swift diff --git a/Shared2/Views/SwitchableView.swift b/Shared/Views/SwitchableView.swift similarity index 100% rename from Shared2/Views/SwitchableView.swift rename to Shared/Views/SwitchableView.swift diff --git a/Shared2/Views/YearView/YearView.swift b/Shared/Views/YearView/YearView.swift similarity index 100% rename from Shared2/Views/YearView/YearView.swift rename to Shared/Views/YearView/YearView.swift diff --git a/Shared2/Views/YearView/YearViewModel.swift b/Shared/Views/YearView/YearViewModel.swift similarity index 100% rename from Shared2/Views/YearView/YearViewModel.swift rename to Shared/Views/YearView/YearViewModel.swift