rename HomeViewTwo to MonthView
This commit is contained in:
@@ -43,7 +43,7 @@
|
|||||||
1C358FBE27B4D1F2002C83A6 /* CurrentStreakTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FBD27B4D1F2002C83A6 /* CurrentStreakTemplate.swift */; };
|
1C358FBE27B4D1F2002C83A6 /* CurrentStreakTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FBD27B4D1F2002C83A6 /* CurrentStreakTemplate.swift */; };
|
||||||
1C358FC027B4D20C002C83A6 /* MonthTotalTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FBF27B4D20C002C83A6 /* MonthTotalTemplate.swift */; };
|
1C358FC027B4D20C002C83A6 /* MonthTotalTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FBF27B4D20C002C83A6 /* MonthTotalTemplate.swift */; };
|
||||||
1C358FC227B4D227002C83A6 /* WeekTotalTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FC127B4D227002C83A6 /* WeekTotalTemplate.swift */; };
|
1C358FC227B4D227002C83A6 /* WeekTotalTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FC127B4D227002C83A6 /* WeekTotalTemplate.swift */; };
|
||||||
1C361F0A27C0356000E832FC /* HomeViewTwo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C361F0927C0356000E832FC /* HomeViewTwo.swift */; };
|
1C361F0A27C0356000E832FC /* MonthView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C361F0927C0356000E832FC /* MonthView.swift */; };
|
||||||
1C361F0C27C0356B00E832FC /* MainTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C361F0B27C0356B00E832FC /* MainTabView.swift */; };
|
1C361F0C27C0356B00E832FC /* MainTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C361F0B27C0356B00E832FC /* MainTabView.swift */; };
|
||||||
1C361F0D27C03BDF00E832FC /* OnboardingData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C5F4975279C84090092F1B4 /* OnboardingData.swift */; };
|
1C361F0D27C03BDF00E832FC /* OnboardingData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C5F4975279C84090092F1B4 /* OnboardingData.swift */; };
|
||||||
1C361F0F27C03C0E00E832FC /* LocalNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B75278C8119001C4FEA /* LocalNotification.swift */; };
|
1C361F0F27C03C0E00E832FC /* LocalNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD90B75278C8119001C4FEA /* LocalNotification.swift */; };
|
||||||
@@ -192,7 +192,7 @@
|
|||||||
1C358FBD27B4D1F2002C83A6 /* CurrentStreakTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrentStreakTemplate.swift; sourceTree = "<group>"; };
|
1C358FBD27B4D1F2002C83A6 /* CurrentStreakTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrentStreakTemplate.swift; sourceTree = "<group>"; };
|
||||||
1C358FBF27B4D20C002C83A6 /* MonthTotalTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonthTotalTemplate.swift; sourceTree = "<group>"; };
|
1C358FBF27B4D20C002C83A6 /* MonthTotalTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonthTotalTemplate.swift; sourceTree = "<group>"; };
|
||||||
1C358FC127B4D227002C83A6 /* WeekTotalTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeekTotalTemplate.swift; sourceTree = "<group>"; };
|
1C358FC127B4D227002C83A6 /* WeekTotalTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeekTotalTemplate.swift; sourceTree = "<group>"; };
|
||||||
1C361F0927C0356000E832FC /* HomeViewTwo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewTwo.swift; sourceTree = "<group>"; };
|
1C361F0927C0356000E832FC /* MonthView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonthView.swift; sourceTree = "<group>"; };
|
||||||
1C361F0B27C0356B00E832FC /* MainTabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabView.swift; sourceTree = "<group>"; };
|
1C361F0B27C0356B00E832FC /* MainTabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabView.swift; sourceTree = "<group>"; };
|
||||||
1C361F1327C03C8600E832FC /* OnboardingDataDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingDataDataManager.swift; sourceTree = "<group>"; };
|
1C361F1327C03C8600E832FC /* OnboardingDataDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingDataDataManager.swift; sourceTree = "<group>"; };
|
||||||
1C361F1627C046D800E832FC /* MonthDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonthDetailView.swift; sourceTree = "<group>"; };
|
1C361F1627C046D800E832FC /* MonthDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonthDetailView.swift; sourceTree = "<group>"; };
|
||||||
@@ -312,7 +312,6 @@
|
|||||||
children = (
|
children = (
|
||||||
1CAD603227A5C1C800C520BD /* HomeView.swift */,
|
1CAD603227A5C1C800C520BD /* HomeView.swift */,
|
||||||
1CA0376F2799FFA600D26164 /* HomeViewViewModel.swift */,
|
1CA0376F2799FFA600D26164 /* HomeViewViewModel.swift */,
|
||||||
1C361F1827C046E400E832FC /* HomeViewTwo */,
|
|
||||||
);
|
);
|
||||||
path = HomeView;
|
path = HomeView;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
@@ -391,13 +390,13 @@
|
|||||||
path = SharingTemplates;
|
path = SharingTemplates;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
1C361F1827C046E400E832FC /* HomeViewTwo */ = {
|
1C4DAA7327CC263F00C25D2B /* MonthView */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
1C361F0927C0356000E832FC /* HomeViewTwo.swift */,
|
1C361F0927C0356000E832FC /* MonthView.swift */,
|
||||||
1C361F1627C046D800E832FC /* MonthDetailView.swift */,
|
1C361F1627C046D800E832FC /* MonthDetailView.swift */,
|
||||||
);
|
);
|
||||||
path = HomeViewTwo;
|
path = MonthView;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
1C4FF3C527BEE07800BE8F34 /* Persisence */ = {
|
1C4FF3C527BEE07800BE8F34 /* Persisence */ = {
|
||||||
@@ -451,6 +450,7 @@
|
|||||||
1CAD603327A5C1C800C520BD /* HeaderStatsView.swift */,
|
1CAD603327A5C1C800C520BD /* HeaderStatsView.swift */,
|
||||||
1C04488F27C2CA9C00D22444 /* HomeView */,
|
1C04488F27C2CA9C00D22444 /* HomeView */,
|
||||||
1C361F0B27C0356B00E832FC /* MainTabView.swift */,
|
1C361F0B27C0356B00E832FC /* MainTabView.swift */,
|
||||||
|
1C4DAA7327CC263F00C25D2B /* MonthView */,
|
||||||
1C04489327C2CABF00D22444 /* SettingsView */,
|
1C04489327C2CABF00D22444 /* SettingsView */,
|
||||||
1C04489527C2CB1A00D22444 /* Sharing */,
|
1C04489527C2CB1A00D22444 /* Sharing */,
|
||||||
1C358FB427B0ADF3002C83A6 /* SharingTemplates */,
|
1C358FB427B0ADF3002C83A6 /* SharingTemplates */,
|
||||||
@@ -838,7 +838,7 @@
|
|||||||
1C361F0C27C0356B00E832FC /* MainTabView.swift in Sources */,
|
1C361F0C27C0356B00E832FC /* MainTabView.swift in Sources */,
|
||||||
1CEC967127B9C2BB00CC8688 /* CustomWidgetModel.swift in Sources */,
|
1CEC967127B9C2BB00CC8688 /* CustomWidgetModel.swift in Sources */,
|
||||||
1C2162EE27C15191004353D1 /* MoodEntryFunctions.swift in Sources */,
|
1C2162EE27C15191004353D1 /* MoodEntryFunctions.swift in Sources */,
|
||||||
1C361F0A27C0356000E832FC /* HomeViewTwo.swift in Sources */,
|
1C361F0A27C0356000E832FC /* MonthView.swift in Sources */,
|
||||||
1C361F1427C03C8600E832FC /* OnboardingDataDataManager.swift in Sources */,
|
1C361F1427C03C8600E832FC /* OnboardingDataDataManager.swift in Sources */,
|
||||||
1C358FAD27ADD0C3002C83A6 /* Theme.swift in Sources */,
|
1C358FAD27ADD0C3002C83A6 /* Theme.swift in Sources */,
|
||||||
1C2162EB27C14EFA004353D1 /* Date+Extensions.swift in Sources */,
|
1C2162EB27C14EFA004353D1 /* Date+Extensions.swift in Sources */,
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ struct MainTabView: View {
|
|||||||
Label(String(localized: "content_view_tab_main"), systemImage: "list.dash")
|
Label(String(localized: "content_view_tab_main"), systemImage: "list.dash")
|
||||||
}
|
}
|
||||||
|
|
||||||
HomeViewTwo()
|
MonthView()
|
||||||
.tabItem {
|
.tabItem {
|
||||||
Label(String(localized: "content_view_tab_month"), systemImage: "calendar")
|
Label(String(localized: "content_view_tab_month"), systemImage: "calendar")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct HomeViewTwo: View {
|
struct MonthView: View {
|
||||||
@AppStorage(UserDefaultsStore.Keys.needsOnboarding.rawValue, store: GroupUserDefaults.groupDefaults) private var needsOnboarding = true
|
@AppStorage(UserDefaultsStore.Keys.needsOnboarding.rawValue, store: GroupUserDefaults.groupDefaults) private var needsOnboarding = true
|
||||||
|
|
||||||
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
|
@AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
|
||||||
@@ -86,7 +86,7 @@ struct HomeViewTwo: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
extension HomeViewTwo {
|
extension MonthView {
|
||||||
private var topView: some View {
|
private var topView: some View {
|
||||||
VStack {
|
VStack {
|
||||||
if ShowBasedOnVoteLogics.isMissingCurrentVote(onboardingData: onboardingData.savedOnboardingData) {
|
if ShowBasedOnVoteLogics.isMissingCurrentVote(onboardingData: onboardingData.savedOnboardingData) {
|
||||||
@@ -123,7 +123,7 @@ extension HomeViewTwo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// view that make up the list body
|
// view that make up the list body
|
||||||
extension HomeViewTwo {
|
extension MonthView {
|
||||||
private func homeViewTwoSectionHeaderView(month: Int, year: Int) -> some View {
|
private func homeViewTwoSectionHeaderView(month: Int, year: Int) -> some View {
|
||||||
Text("\(Random.monthName(fromMonthInt: month)) \(String(year))")
|
Text("\(Random.monthName(fromMonthInt: month)) \(String(year))")
|
||||||
.font(.body)
|
.font(.body)
|
||||||
@@ -158,6 +158,6 @@ extension HomeViewTwo {
|
|||||||
|
|
||||||
struct HomeViewTwo_Previews: PreviewProvider {
|
struct HomeViewTwo_Previews: PreviewProvider {
|
||||||
static var previews: some View {
|
static var previews: some View {
|
||||||
HomeViewTwo()
|
MonthView()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user