Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  Information view improvements
  • Loading branch information
pawelmilek committed Dec 30, 2023
2 parents 88bef9e + 3221119 commit ff33b13
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 22 deletions.
12 changes: 8 additions & 4 deletions SwiftyForecast.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
E25EF00B20F97CE200E4C115 /* Style.swift in Sources */ = {isa = PBXBuildFile; fileRef = E25EF00A20F97CE200E4C115 /* Style.swift */; };
E266227E2B0A110D0010B567 /* LocationSearchResultList.swift in Sources */ = {isa = PBXBuildFile; fileRef = E266227D2B0A110D0010B567 /* LocationSearchResultList.swift */; };
E26ACD1B24FF204000AC15A6 /* ForecastWeatherModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E26ACD1A24FF204000AC15A6 /* ForecastWeatherModel.swift */; };
E26CDFAF2B408B8B0018B5D2 /* InfromationFrameworkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E26CDFAE2B408B8B0018B5D2 /* InfromationFrameworkView.swift */; };
E270891A24CE5ADA003F7587 /* MainCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = E270891924CE5ADA003F7587 /* MainCoordinator.swift */; };
E270891C24CE5AEC003F7587 /* Coordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = E270891B24CE5AEC003F7587 /* Coordinator.swift */; };
E2768B552B30ED14004C4994 /* HourlyEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2768B542B30ED14004C4994 /* HourlyEntry.swift */; };
Expand Down Expand Up @@ -311,6 +312,7 @@
E25EF00A20F97CE200E4C115 /* Style.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Style.swift; sourceTree = "<group>"; };
E266227D2B0A110D0010B567 /* LocationSearchResultList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationSearchResultList.swift; sourceTree = "<group>"; };
E26ACD1A24FF204000AC15A6 /* ForecastWeatherModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForecastWeatherModel.swift; sourceTree = "<group>"; };
E26CDFAE2B408B8B0018B5D2 /* InfromationFrameworkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfromationFrameworkView.swift; sourceTree = "<group>"; };
E270891924CE5ADA003F7587 /* MainCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainCoordinator.swift; sourceTree = "<group>"; };
E270891B24CE5AEC003F7587 /* Coordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Coordinator.swift; sourceTree = "<group>"; };
E2768B542B30ED14004C4994 /* HourlyEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HourlyEntry.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -495,6 +497,7 @@
isa = PBXGroup;
children = (
E2DC1464248D492200D1A329 /* DataLoader */,
E20DA45A214348AD0047491B /* NetworkReachabilityManager.swift */,
E296A7E62AD6F49D001BFADB /* ConfigurationSettingsAccessor.swift */,
E28550092292303C00CD7554 /* DailyDateRenderer.swift */,
E2D960802120F34800AE0B6E /* Geocoder.swift */,
Expand Down Expand Up @@ -695,6 +698,7 @@
E28179202B387D0200D06917 /* License */,
E281790D2B3856AC00D06917 /* SupportEmail.swift */,
E249ABBB2B3476220020B88D /* InformationView.swift */,
E26CDFAE2B408B8B0018B5D2 /* InfromationFrameworkView.swift */,
E249ABBD2B3484980020B88D /* InformationViewController.swift */,
E21E386D2B37576A00513B26 /* InfoRow.swift */,
);
Expand Down Expand Up @@ -870,8 +874,6 @@
E270891824CE5904003F7587 /* Coordinator */,
E23997D720E84094007D8CE4 /* Storyboards */,
E23997DF20E84371007D8CE4 /* Network */,
E25EF00A20F97CE200E4C115 /* Style.swift */,
E20DA45A214348AD0047491B /* NetworkReachabilityManager.swift */,
E283573B2B2728AA00E3807A /* RealmManager */,
E28357342B27168400E3807A /* LocationManager */,
E2A32F25254459DF000ACEFE /* AppStoreReview */,
Expand All @@ -882,6 +884,7 @@
E28CEC0B2B3EB74C003DB3A6 /* Tips */,
E21A0B9420EE88F5006AC409 /* Utilities */,
E23997D820E840C1007D8CE4 /* Resources */,
E25EF00A20F97CE200E4C115 /* Style.swift */,
);
path = SwiftyForecast;
sourceTree = "<group>";
Expand Down Expand Up @@ -1327,6 +1330,7 @@
E2B1D65C211FB26C00F0002A /* MainViewController.swift in Sources */,
E2D960812120F34800AE0B6E /* Geocoder.swift in Sources */,
E2854FFE2290F24800CD7554 /* TemperatureNotation.swift in Sources */,
E26CDFAF2B408B8B0018B5D2 /* InfromationFrameworkView.swift in Sources */,
E28179182B38768A00D06917 /* LicenseView.swift in Sources */,
E2ABE7E42B0E427700E4EC4F /* LocationWeatherView.swift in Sources */,
E296A7F22AD7EA46001BFADB /* Condition.swift in Sources */,
Expand Down Expand Up @@ -1595,7 +1599,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.4.1;
MARKETING_VERSION = 3.4.2;
PRODUCT_BUNDLE_IDENTIFIER = "com.pawelmilek.Swifty-Forecast";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -1628,7 +1632,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.4.1;
MARKETING_VERSION = 3.4.2;
PRODUCT_BUNDLE_IDENTIFIER = "com.pawelmilek.Swifty-Forecast";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
19 changes: 1 addition & 18 deletions SwiftyForecast/Screens/Info/InformationView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,7 @@ struct InformationView: View {
link: nil,
action: nil
)
DisclosureGroup {
Text("UIKit, SwiftUI, Combine, Charts, WidgetKit, MapKit, StoreKit, WebKit, TipKit")
.font(.footnote)
.fontWeight(.heavy)
.fontDesign(.monospaced)
.foregroundStyle(.primary)
.padding(.leading, 15)
.padding(.vertical, 10)
} label: {
InfoRow(
tintColor: .orange,
symbol: "swift",
title: "Frameworks",
content: nil,
link: nil,
action: nil
)
}
InfromationFrameworkView()
InfoRow(
tintColor: .green,
symbol: "ellipsis.curlybraces",
Expand Down
55 changes: 55 additions & 0 deletions SwiftyForecast/Screens/Info/InfromationFrameworkView.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
//
// InfromationFrameworkView.swift
// Swifty Forecast
//
// Created by Pawel Milek on 12/30/23.
// Copyright © 2023 Pawel Milek. All rights reserved.
//

import SwiftUI

struct InfromationFrameworkView: View {
private let frameworks = [
"UIKit",
"SwiftUI",
"Combine",
"Charts",
"WidgetKit",
"MapKit",
"StoreKit",
"WebKit",
"TipKit"
]
var body: some View {
DisclosureGroup {
ForEach(frameworks, id: \.self) { item in
HStack {
Text(item)
.fontDesign(.monospaced)
.foregroundStyle(.primary)
Spacer()
Image(systemName: "books.vertical.fill")
.foregroundStyle(.orange)

}
.font(.caption)
.fontWeight(.heavy)
.padding(.leading, 15)
}
} label: {
InfoRow(
tintColor: .orange,
symbol: "swift",
title: "Frameworks",
content: nil,
link: nil,
action: nil
)
}
}
}

#Preview(traits: .sizeThatFitsLayout) {
InfromationFrameworkView()
.padding()
}

0 comments on commit ff33b13

Please sign in to comment.