Merge branch 'release/1.4.3'

CONTRIBUTING.md

@@ -0,0 +1,141 @@
+# Contributing to this project
+
+Please take a moment to review this document in order to make the contribution
+process easy and effective for everyone involved.
+
+Following these guidelines helps to communicate that you respect the time of
+the developers managing and developing this open source project. In return,
+they should reciprocate that respect in addressing your issue or assessing
+patches and features.
+
+
+## Using the issue tracker
+
+The issue tracker is the preferred channel for [bug reports](#bugs),
+[features requests](#features) and [submitting pull
+requests](#pull-requests), but please respect the following restrictions:
+
+* Please **do not** use the issue tracker for personal support requests.
+
+* Please **do not** derail or troll issues. Keep the discussion on topic and
+  respect the opinions of others.
+
+
+<a name="bugs"></a>
+## Bug reports
+
+A bug is a _demonstrable problem_ that is caused by the code in the repository.
+Good bug reports are extremely helpful - thank you!
+
+Guidelines for bug reports:
+
+1. **Use the GitHub issue search** &mdash; check if the issue has already been
+   reported.
+
+2. **Check if the issue has been fixed** &mdash; try to reproduce it using the
+   latest `master` or development branch in the repository.
+
+3. **Isolate the problem** &mdash; create a [reduced test
+   case](http://css-tricks.com/reduced-test-cases/) and a live example.
+
+A good bug report shouldn't leave others needing to chase you up for more
+information. Please try to be as detailed as possible in your report. What is
+your environment? What steps will reproduce the issue? What OS experience the
+problem? What would you expect to be the outcome? All these details will help
+people to fix any potential bugs.
+
+Example:
+
+> Short and descriptive example bug report title
+>
+> A summary of the issue and the browser/OS environment in which it occurs. If
+> suitable, include the steps required to reproduce the bug.
+>
+> 1. This is the first step
+> 2. This is the second step
+> 3. Further steps, etc.
+>
+> `<url>` - a link to the reduced test case
+>
+> Any other information you want to share that is relevant to the issue being
+> reported. This might include the lines of code that you have identified as
+> causing the bug, and potential solutions (and your opinions on their
+> merits).
+
+
+<a name="features"></a>
+## Feature requests
+
+Feature requests are welcome. But take a moment to find out whether your idea
+fits with the scope and aims of the project. It's up to *you* to make a strong
+case to convince the project's developers of the merits of this feature. Please
+provide as much detail and context as possible.
+
+
+<a name="pull-requests"></a>
+## Pull requests
+
+Good pull requests - patches, improvements, new features - are a fantastic
+help. They should remain focused in scope and avoid containing unrelated
+commits.
+
+**Please ask first** before embarking on any significant pull request (e.g.
+implementing features, refactoring code, porting to a different language),
+otherwise you risk spending a lot of time working on something that the
+project's developers might not want to merge into the project.
+
+Please adhere to the coding conventions used throughout a project (indentation,
+accurate comments, etc.) and any other requirements (such as test coverage).
+
+Follow this process if you'd like your work considered for inclusion in the
+project:
+
+1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
+   and configure the remotes:
+
+   ```bash
+   # Clone your fork of the repo into the current directory
+   git clone https://github.com/<your-username>/<repo-name>
+   # Navigate to the newly cloned directory
+   cd <repo-name>
+   # Assign the original repo to a remote called "upstream"
+   git remote add upstream https://github.com/<upstream-owner>/<repo-name>
+   ```
+
+2. If you cloned a while ago, get the latest changes from upstream:
+
+   ```bash
+   git checkout <dev-branch>
+   git pull upstream <dev-branch>
+   ```
+
+3. Create a new topic branch (off the main project development branch) to
+   contain your feature, change, or fix:
+
+   ```bash
+   git checkout -b <topic-branch-name>
+   ```
+
+4. Commit your changes in logical chunks. Please adhere to these [git commit
+   message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
+   or your code is unlikely be merged into the main project. Use Git's
+   [interactive rebase](https://help.github.com/articles/interactive-rebase)
+   feature to tidy up your commits before making them public.
+
+5. Locally merge (or rebase) the upstream development branch into your topic branch:
+
+   ```bash
+   git pull [--rebase] upstream <dev-branch>
+   ```
+
+6. Push your topic branch up to your fork:
+
+   ```bash
+   git push origin <topic-branch-name>
+   ```
+
+7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
+    with a clear title and description.
+
+**IMPORTANT**: By submitting a patch, you agree to allow the project owner to
+license your work under the same license as that used by the project.

GitHubContributions.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -661,7 +661,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_ASSET_PATHS = "\"GitHubContributions/Preview Content\"";
 				DEVELOPMENT_TEAM = 75Z728ZJJT;
 				ENABLE_PREVIEWS = YES;
@@ -685,7 +685,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_ASSET_PATHS = "\"GitHubContributions/Preview Content\"";
 				DEVELOPMENT_TEAM = 75Z728ZJJT;
 				ENABLE_PREVIEWS = YES;
@@ -708,7 +708,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = 75Z728ZJJT;
 				INFOPLIST_FILE = GitHubContributionsWidget/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -731,7 +731,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = 75Z728ZJJT;
 				INFOPLIST_FILE = GitHubContributionsWidget/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -786,7 +786,7 @@
 			repositoryURL = "https://github.com/onevcat/Kingfisher";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 7.8.1;
+				minimumVersion = 7.10.2;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

GitHubContributions/Contributions/ContributionsList.swift

@@ -42,7 +42,7 @@ struct ContributionsList: View {
                 .foregroundColor(.secondary)
         }
         .multilineTextAlignment(.center)
-        .padding(EdgeInsets(top: 0, leading: 44, bottom: 0, trailing: 44))
+        .padding(.horizontal, 44)
     }
 
     private var listView: some View {

GitHubContributions/Contributions/ContributionsRow.swift

@@ -9,6 +9,7 @@ import InterfaceKit
 import SwiftUI
 
 struct ContributionsRow: View {
+    @Environment(\.openURL) var openURL
     @ObservedObject var viewModel: ContributionsRowViewModel
 
     var body: some View {
@@ -21,6 +22,13 @@ struct ContributionsRow: View {
         )
         .frame(height: 136)
         .padding(.vertical, 12)
+        .onTapGesture(perform: onTap)
         .onAppear(perform: viewModel.getContributions)
     }
+
+    private func onTap() {
+        if let accountURL = viewModel.gitHubAccountURL {
+            openURL(accountURL)
+        }
+    }
 }

GitHubContributions/Contributions/ContributionsRowViewModel.swift

@@ -20,6 +20,10 @@ final class ContributionsRowViewModel: ObservableObject {
     let username: String
     @Published private(set) var contributions: Contributions = .init()
 
+    var gitHubAccountURL: URL? {
+        URL(string: "https://github.com/\(username)")
+    }
+
     private let queue = DispatchQueue(label: "com.andergoig.GitHubContributions.network")
 
     init(username: String) {

GitHubContributions/Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.2</string>
+	<string>1.4.3</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>13</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

GitHubContributionsWidget/GitHubContributionsGraphWidget.swift

@@ -19,5 +19,6 @@ struct GitHubContributionsGraphWidget: Widget {
         .configurationDisplayName("widget-graph-display-name")
         .description("widget-graph-description")
         .supportedFamilies([.systemSmall, .systemMedium])
+        .contentMarginsDisabled()
     }
 }

GitHubContributionsWidget/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.2</string>
+	<string>1.4.3</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>13</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

InterfaceKit/Package.swift

@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "InterfaceKit",
     platforms: [
-        .iOS(.v14)
+        .iOS(.v14),
     ],
     products: [
         .library(
@@ -17,7 +17,6 @@ let package = Package(
             name: "InterfaceKit",
             dependencies: [],
             resources: [
-                .process("Resources")
+                .process("Resources"),
             ]),
-    ]
-)
+    ])

InterfaceKit/Sources/InterfaceKit/ContributionsView.swift

@@ -53,7 +53,14 @@ public struct ContributionsView: View {
         }
     }
 
-    public init(rowsCount: Int, columnsCount: Int, colors: [[Color]], topLeadingText: String? = nil, topTrailingText: String? = nil, emptyText: String? = nil) {
+    public init(
+        rowsCount: Int,
+        columnsCount: Int,
+        colors: [[Color]],
+        topLeadingText: String? = nil,
+        topTrailingText: String? = nil,
+        emptyText: String? = nil
+    ) {
         self.rowsCount = rowsCount
         self.columnsCount = columnsCount
         self.colors = colors

InterfaceKit/Sources/InterfaceKit/GridStack.swift

@@ -25,7 +25,12 @@ struct GridStack<Content: View>: View {
         }
     }
 
-    init(rows: Int, columns: Int, spacing: CGFloat? = nil, @ViewBuilder content: @escaping (Int, Int) -> Content) {
+    init(
+        rows: Int,
+        columns: Int,
+        spacing: CGFloat? = nil,
+        @ViewBuilder content: @escaping (Int, Int) -> Content
+    ) {
         self.rows = rows
         self.columns = columns
         self.spacing = spacing

NetworkKit/Package.swift

@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "NetworkKit",
     platforms: [
-        .iOS(.v13)
+        .iOS(.v13),
     ],
     products: [
         .library(
@@ -15,11 +15,10 @@ let package = Package(
     dependencies: [
         .package(
             url: "https://github.com/scinfu/SwiftSoup",
-            .upToNextMinor(from: "2.6.1"))
+            .upToNextMinor(from: "2.7.0")),
     ],
     targets: [
         .target(
             name: "NetworkKit",
             dependencies: ["SwiftSoup"]),
-    ]
-)
+    ])

README.md

@@ -22,7 +22,7 @@ Quickly check in on your GitHub contributions from your iOS Home Screen!
 ## Contributing
 
 If you have feature requests or bug reports, feel free to help out by sending pull requests or by [creating new issues](https://github.com/AnderGoig/github-contributions-ios/issues/new). Please take a moment to
-review the [CONTRIBUTING](.github/CONTRIBUTING.md) guidelines.
+review the [CONTRIBUTING](CONTRIBUTING.md) guidelines.
 
 ## Credits