Skip to content

Commit 95a5ff8

Browse files
authored
Merge pull request #85 from naipaka/release/1.0.1
Release/1.0.1
2 parents fc1702c + 3983031 commit 95a5ff8

File tree

7 files changed

+60
-13
lines changed

7 files changed

+60
-13
lines changed

.github/workflows/main.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ env:
1717
jobs:
1818
build:
1919
runs-on: macOS-latest
20+
env:
21+
MINT_PATH: mint/lib
22+
MINT_LINK_PATH: mint/bin
2023

2124
steps:
2225
- uses: actions/checkout@v2
@@ -35,6 +38,14 @@ jobs:
3538
- name: Mint bootstrap
3639
run: mint bootstrap
3740

41+
- name: Cache Swift Package Manager packages
42+
uses: actions/cache@v2
43+
with:
44+
path: .build
45+
key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
46+
restore-keys: |
47+
${{ runner.os }}-spm-
48+
3849
- name: Inject Access Token
3950
run: echo "let OPEN_WEATHER_API_KEY = \"${{ secrets.OPEN_WEATHER_API_KEY }}\"" > ./NextSunnyDay/API/AccessTokens.swift
4051

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2020 Ryota Kobayashi
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

NextSunnyDay.xcodeproj/project.pbxproj

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -809,13 +809,15 @@
809809
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
810810
CODE_SIGN_ENTITLEMENTS = NextSunnyDayWidget/NextSunnyDayWidgetExtension.entitlements;
811811
CODE_SIGN_STYLE = Automatic;
812+
CURRENT_PROJECT_VERSION = 2;
812813
DEVELOPMENT_TEAM = NA4GG5YL9W;
813814
INFOPLIST_FILE = NextSunnyDayWidget/Info.plist;
814815
LD_RUNPATH_SEARCH_PATHS = (
815816
"$(inherited)",
816817
"@executable_path/Frameworks",
817818
"@executable_path/../../Frameworks",
818819
);
820+
MARKETING_VERSION = 1.0.1;
819821
PRODUCT_BUNDLE_IDENTIFIER = com.naipaka.NextSunnyDay.NextSunnyDayWidget;
820822
PRODUCT_NAME = "$(TARGET_NAME)";
821823
SKIP_INSTALL = YES;
@@ -831,13 +833,15 @@
831833
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
832834
CODE_SIGN_ENTITLEMENTS = NextSunnyDayWidget/NextSunnyDayWidgetExtension.entitlements;
833835
CODE_SIGN_STYLE = Automatic;
836+
CURRENT_PROJECT_VERSION = 2;
834837
DEVELOPMENT_TEAM = NA4GG5YL9W;
835838
INFOPLIST_FILE = NextSunnyDayWidget/Info.plist;
836839
LD_RUNPATH_SEARCH_PATHS = (
837840
"$(inherited)",
838841
"@executable_path/Frameworks",
839842
"@executable_path/../../Frameworks",
840843
);
844+
MARKETING_VERSION = 1.0.1;
841845
PRODUCT_BUNDLE_IDENTIFIER = com.naipaka.NextSunnyDay.NextSunnyDayWidget;
842846
PRODUCT_NAME = "$(TARGET_NAME)";
843847
SKIP_INSTALL = YES;
@@ -970,6 +974,7 @@
970974
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
971975
CODE_SIGN_ENTITLEMENTS = NextSunnyDay/NextSunnyDay.entitlements;
972976
CODE_SIGN_STYLE = Automatic;
977+
CURRENT_PROJECT_VERSION = 2;
973978
DEVELOPMENT_ASSET_PATHS = "\"NextSunnyDay/Preview Content\"";
974979
DEVELOPMENT_TEAM = NA4GG5YL9W;
975980
ENABLE_PREVIEWS = YES;
@@ -979,7 +984,7 @@
979984
"$(inherited)",
980985
"@executable_path/Frameworks",
981986
);
982-
MARKETING_VERSION = 1.0.0;
987+
MARKETING_VERSION = 1.0.1;
983988
PRODUCT_BUNDLE_IDENTIFIER = com.naipaka.NextSunnyDay;
984989
PRODUCT_NAME = "$(TARGET_NAME)";
985990
SWIFT_VERSION = 5.0;
@@ -995,6 +1000,7 @@
9951000
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
9961001
CODE_SIGN_ENTITLEMENTS = NextSunnyDay/NextSunnyDay.entitlements;
9971002
CODE_SIGN_STYLE = Automatic;
1003+
CURRENT_PROJECT_VERSION = 2;
9981004
DEVELOPMENT_ASSET_PATHS = "\"NextSunnyDay/Preview Content\"";
9991005
DEVELOPMENT_TEAM = NA4GG5YL9W;
10001006
ENABLE_PREVIEWS = YES;
@@ -1004,7 +1010,7 @@
10041010
"$(inherited)",
10051011
"@executable_path/Frameworks",
10061012
);
1007-
MARKETING_VERSION = 1.0.0;
1013+
MARKETING_VERSION = 1.0.1;
10081014
PRODUCT_BUNDLE_IDENTIFIER = com.naipaka.NextSunnyDay;
10091015
PRODUCT_NAME = "$(TARGET_NAME)";
10101016
SWIFT_VERSION = 5.0;

NextSunnyDay/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundleShortVersionString</key>
1818
<string>$(MARKETING_VERSION)</string>
1919
<key>CFBundleVersion</key>
20-
<string>1</string>
20+
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>LSRequiresIPhoneOS</key>
2222
<true/>
2323
<key>UIApplicationSceneManifest</key>

NextSunnyDayWidget/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.0</string>
20+
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
22-
<string>1</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>NSExtension</key>
2424
<dict>
2525
<key>NSExtensionPointIdentifier</key>

NextSunnyDayWidget/NextSunnyDayWidget.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct Provider: TimelineProvider {
3434
let timeline = Timeline(entries: [SimpleEntry(date: currentDate, entity: entity)], policy: .after(entryDate))
3535

3636
let latestDate = entity.daily.min(by: { $0.date < $1.date })?.date ?? 0
37-
if !entity.cityName.isEmpty && latestDate + 60 * 60 * 24 < Int(currentDate.timeIntervalSince1970) {
37+
if !entity.cityName.isEmpty && latestDate + 60 * 60 * 20 < Int(currentDate.timeIntervalSince1970) {
3838
weatherFetcher.weeklyWeatherForecast(forLat: entity.lat, forLon: entity.lon)
3939
.receive(on: RunLoop.main)
4040
.sink(

README.md

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
# NextSunnyDay-iOS
22

3-
次いつ晴れる?
3+
## 次いつ晴れる?
44

5-
次いつ晴れるのかが一目でわかるアプリ
5+
<img src="https://user-images.githubusercontent.com/45661924/97105071-d28d2580-16fb-11eb-8f8d-7ec79940db41.png" width="300">
6+
7+
<img src="https://user-images.githubusercontent.com/45661924/97104876-7544a480-16fa-11eb-9bad-e1334d5ab2f8.png" height="300">
8+
9+
次いつ晴れるのかが一目でわかるアプリです。
10+
11+
<a href="https://apps.apple.com/us/app/%E6%AC%A1%E3%81%84%E3%81%A4%E6%99%B4%E3%82%8C%E3%82%8B/id1537055268?itsct=apps_box&amp;itscg=30200" style="display: inline-block; overflow: hidden; border-radius: 13px; width: 250px; height: 83px;"><img src="https://tools.applemediaservices.com/api/badges/download-on-the-app-store/black/en-US?size=250x83&amp;releaseDate=1603584000&h=dd86e3942b5c6abc5ce1781972220b17" alt="Download on the App Store" style="border-radius: 13px; width: 250px; height: 83px;"></a>
612

713
## Development
814

@@ -83,8 +89,11 @@ Build & Run !!
8389

8490
## Screenshots
8591

86-
Comming Soon...
87-
88-
## AppStore
89-
90-
Comming Soon...
92+
| - | Light | Dark |
93+
| -------------- | ---------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- |
94+
| Widget | <img src="https://user-images.githubusercontent.com/45661924/97104984-4f6bcf80-16fb-11eb-8e4f-13f0b694cd4b.png" width="300"> | <img src="https://user-images.githubusercontent.com/45661924/97105017-8e018a00-16fb-11eb-92ad-20fd0c67c0e0.png" width="300"> |
95+
| Home | <img src="https://user-images.githubusercontent.com/45661924/97104990-54c91a00-16fb-11eb-9408-40ac76eb52ea.png" width="300"> | <img src="https://user-images.githubusercontent.com/45661924/97105024-98bc1f00-16fb-11eb-8149-fbffd415dd3e.png" width="300"> |
96+
| Setting | <img src="https://user-images.githubusercontent.com/45661924/97104994-585ca100-16fb-11eb-9bcb-c57bc9009f55.png" width="300"> | <img src="https://user-images.githubusercontent.com/45661924/97105027-9c4fa600-16fb-11eb-9d8c-41614202eddb.png" width="300"> |
97+
| Region Search | <img src="https://user-images.githubusercontent.com/45661924/97105000-66122680-16fb-11eb-9286-2bf512212082.png" width="300"> | <img src="https://user-images.githubusercontent.com/45661924/97105031-9fe32d00-16fb-11eb-841f-8b9753442253.png" width="300"> |
98+
| Search results | <img src="https://user-images.githubusercontent.com/45661924/97105005-6d393480-16fb-11eb-8be8-06fbf7204ec0.png" width="300"> | <img src="https://user-images.githubusercontent.com/45661924/97105039-a671a480-16fb-11eb-873b-77fec5736546.png" width="300"> |
99+
| About weather | <img src="https://user-images.githubusercontent.com/45661924/97105009-7fb36e00-16fb-11eb-849e-a4b6c5bffdb8.png" width="300"> | <img src="https://user-images.githubusercontent.com/45661924/97105042-aa052b80-16fb-11eb-9feb-f18031116f02.png" width="300"> |

0 commit comments

Comments
 (0)