Merge branch 'sharing' into develop

# Conflicts:
#	Feels.xcodeproj/project.pbxproj
This commit is contained in:
Trey t
2022-02-13 17:17:27 -06:00
17 changed files with 1150 additions and 7 deletions

View File

@@ -66,9 +66,9 @@ struct ContentView: View {
Label(String(localized: "content_view_tab_filter"), systemImage: "calendar.circle")
}
GraphView()
SharingListView()
.tabItem {
Label(String(localized: "content_view_tab_stats"), systemImage: "chart.line.uptrend.xyaxis")
Label(String(localized: "content_view_tab_share"), systemImage: "square.and.arrow.up")
}
}.sheet(isPresented: $needsOnboarding, onDismiss: {