Merge pull request #110 from iglance/release/v2.0.4

Release/v2.0.4

.github/CONTRIBUTING.md

@@ -15,7 +15,8 @@ pod install
 We have a `master` and a `development` branch in this repository. The `master` branch is responsible for all the releases. We push to this branch only if we release a new version of `iGlance`. The development (as the name suggests) is for developing.
 Therefore the next step is to create a new branch which is based on the `development` branch. Name your branch after the following scheme:
 
-`feature/<short-issue-description>-<github-feature-id>`
+`feature/<short-issue-description>-<github-issue-id>`
+`bug-fix/<short-issue-description>-<github-issue-id>`
 
 This will make it clear which issue is referenced by this branch.
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,14 +1,13 @@
----
-name: Bug report
-about: Create a report to help us improve
-
 ---
 
-**Describe the bug**
+name: Bug report 🐛
+about: Create a report to help us improve
+---**Describe the bug**
 A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -17,12 +16,15 @@ Steps to reproduce the behavior:
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+**Screenshots (Optional)**
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Version of the app: [e.g. 22]
 
-**Additional context**
-Add any other context about the problem here.
+- MacOS Version: [e.g. 10.12]
+- Version of the app: [e.g. 2.0.3]
+
+**Log**
+Please activate `Advanced Logging` in the settings, restart the app and perform the steps to reproduce the bug.
+After the bug occurred, please close the app completely (i.e. by opening the app window and pressing `CMD+Q`).
+Please take the latest log file from `~/Library/Logs/iGlance/` and upload it here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -16,16 +16,4 @@
 <!--- Why is this change required? What problem does it solve? -->
 <!--- If it fixes an open issue, please link to the issue here. -->
 
-## How Has This Been Tested?
-
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc. -->
-
 ## Screenshots (if appropriate):
-
-## Checklist
-
-- [ ] I have read the [Contribution Guide](https://github.com/iglance/iGlance/blob/master/.github/CONTRIBUTING.md) and the [Code of Conduct](https://github.com/iglance/iGlance/blob/master/.github/CODE_OF_CONDUCT.md)
-
-- [ ] All checks and tests run through

README.md

@@ -10,14 +10,19 @@
    <a href="https://github.com/sindresorhus/swiftlint-sindre">
       <img src="https://img.shields.io/badge/SwiftLint-Sindre-hotpink.svg" alt="SwiftLint Sindre"/>
    </a>
+   <a href="https://github.com/iglance/iGlance/blob/master/LICENSE">
+      <img src="https://img.shields.io/github/license/iglance/iGlance?color=lightgrey" alt="License"/>
+   </a>
 </p>
 
 iGlance is a small system monitor that displays current stats about your Mac on the menu bar. It is built to be highly customizable so that everyone can adjust it to his/her needs. A full list of all the features is below. If you encounter any bugs or have suggestions for new features, feel free to write them down in the Issues tab.
 
-<img src="readme_images/Menubar_Preview.png" title="Menubar Preview" alt="Menubar Preview" width="400"/>
-<img src="readme_images/iGlance_Preview.png" title="iGlance Preview" alt="iGlance Preview"/>
+<p align="center">
+<img src="readme_images/Menubar_Preview.jpg" title="Menubar Preview" alt="Menubar Preview" width="400"/>
+<img src="readme_images/iGlance_Preview.jpg" title="iGlance Preview" alt="iGlance Preview"/>
+</p>
 
-## Features
+# Features
 
 - Display CPU utilization as a graph
 - Read CPU temperature
@@ -27,7 +32,7 @@ iGlance is a small system monitor that displays current stats about your Mac on
 - Low and/or high battery notification at custom thresholds
 - App adjusts to light & dark mode
 
-## Installation
+# Installation
 
 There are two possible ways to install iGlance:
 
@@ -36,20 +41,39 @@ There are two possible ways to install iGlance:
 
    `brew cask install iglance`
 
-## Contribute
+# Warning about iStat X
+
+We have nothing to do with an app called "iStats X: CPU & Memory" which is available in the App Store. iStats X is a copy of an old version of our app. The values of the cpu temperature or the fan speeds are just random values since it is technically not possible to read the cpu temperature using an app which is distrubuted over the App Store without downloading a helper which is distributed outside of the App Store. Those values have nothing to do with the real temperature of the cpu or the real fan speeds. If you bought this app and found iGlance through an update popup, you could try to get iStats X refunded over at https://support.apple.com/en-us/HT204084.
+
+# Roadmap
+
+## Version 2.1:
+
+- Import/Export Settings
+- Use database to save all the read information (for displaying graphs and to prevent reading value multiple times when changing e.g. the width of the menu bar items)
+- Add UI tests
+- Use drag and drop to arrange/add the menu bar items
+
+## Version 2.2
+
+- Add disk io menu bar item
+- Display the disk io (read/write speed)
+- Add the public ip address to the menu of the network menu bar item
+
+# Contribute
 
 There are two ways you can contribute to this project:
 
 1. You can star this repository and tell all your friends about our cool app ;)
 2. You can work on one of the open issues. Please read our [Contribution Guide](https://github.com/iglance/iGlance/blob/master/.github/CONTRIBUTING.md) and our [Code of Conduct](https://github.com/iglance/iGlance/blob/master/.github/CODE_OF_CONDUCT.md) before you start.
 
-## Credits
+# Credits
 
 - <a href="https://github.com/beltex">beltex</a> for providing the SMCKit and SystemKit Library
 - <a href="https://github.com/CocoaLumberjack/CocoaLumberjack">CocoaLumberjack</a> for their awesome logging framework
 - <a href="https://github.com/OskarGroth">Oskar Groth</a> for providing his AppMover framework
 - And of course all the other <a href="https://github.com/iglance/iGlance/graphs/contributors">contributors</a>.
 
-## License
+# License
 
 This software is published under the <b>GNU GPLv3</b>.

Sparkle/updates/appcast.xml

@@ -1,15 +1,21 @@
 <?xml version="1.0" standalone="yes"?>
 <rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
     <channel>
-        <title>iGlance_v2_0</title>
+        <title>iGlance</title>
         <item>
-            <title>2.0</title>
+            <title>2.0.0</title>
+            <sparkle:releaseNotesLink>
+                https://iglance.github.io/release-notes.html
+            </sparkle:releaseNotesLink>
             <pubDate>Sat, 28 Mar 2020 20:08:52 +0100</pubDate>
             <sparkle:minimumSystemVersion>10.12</sparkle:minimumSystemVersion>
-            <enclosure url="https://github.com/iglance/iGlance/releases/download/v2.0/iGlance_v2.0.zip" sparkle:version="2.0" sparkle:shortVersionString="2.0" length="10103672" type="application/octet-stream" sparkle:edSignature="OI66IZrSPYaMv7dW2DBTrc/o9mIDHEuP5636TCLG7qh7Ibf85Xg+3d/3p4hC4W9dSEtUPiT2DfI/c2ZmTyrbAw=="/>
+            <enclosure url="https://github.com/iglance/iGlance/releases/download/v2.0/iGlance_v2.0.0.zip" sparkle:version="2.0" sparkle:shortVersionString="2.0" length="10103672" type="application/octet-stream" sparkle:edSignature="OI66IZrSPYaMv7dW2DBTrc/o9mIDHEuP5636TCLG7qh7Ibf85Xg+3d/3p4hC4W9dSEtUPiT2DfI/c2ZmTyrbAw=="/>
         </item>
         <item>
             <title>2.0.1</title>
+            <sparkle:releaseNotesLink>
+                https://iglance.github.io/release-notes.html
+            </sparkle:releaseNotesLink>
             <pubDate>Sun, 29 Mar 2020 09:34:10 +0200</pubDate>
             <sparkle:minimumSystemVersion>10.12</sparkle:minimumSystemVersion>
             <enclosure url="https://github.com/iglance/iGlance/releases/download/v2.0.1/iGlance_v2.0.1.zip" sparkle:version="2.0.1" sparkle:shortVersionString="2.0.1" length="10103514" type="application/octet-stream" sparkle:edSignature="JtSYst9aINF58ZICugtjsNnJI/kC8bW45m4pT2qH4BykkcI5bjibhT6ODzndevtV5mBUhCUT3yf/XiCSU0VoBQ=="/>
@@ -19,6 +25,9 @@
         </item>
         <item>
             <title>2.0.2</title>
+            <sparkle:releaseNotesLink>
+                https://iglance.github.io/release-notes.html
+            </sparkle:releaseNotesLink>
             <pubDate>Sun, 29 Mar 2020 10:46:00 +0200</pubDate>
             <sparkle:minimumSystemVersion>10.12</sparkle:minimumSystemVersion>
             <enclosure url="https://github.com/iglance/iGlance/releases/download/v2.0.2/iGlance_v2.0.2.zip" sparkle:version="2.0.2" sparkle:shortVersionString="2.0.2" length="10108480" type="application/octet-stream" sparkle:edSignature="dnWolfRCHNtHSZuIsaC20kKhDIfj+wL63fK3ulfHvfn4bYorG+NZ7hCAjGWMf5++r637KbtMyxr7/1lqv5JVCg=="/>
@@ -29,13 +38,31 @@
         </item>
         <item>
             <title>2.0.3</title>
+            <sparkle:releaseNotesLink>
+                https://iglance.github.io/release-notes.html
+            </sparkle:releaseNotesLink>
             <pubDate>Sun, 29 Mar 2020 19:27:26 +0200</pubDate>
             <sparkle:minimumSystemVersion>10.12</sparkle:minimumSystemVersion>
             <enclosure url="https://github.com/iglance/iGlance/releases/download/v2.0.3/iGlance_v2.0.3.zip" sparkle:version="2.0.3" sparkle:shortVersionString="2.0.3" length="10109566" type="application/octet-stream" sparkle:edSignature="TzvJIhwa6XdWPNU+tgxn+RH8Zedb0dO3tM3Eb+xuBeMeXh9Rsb33YiJNHXu24S50GBLZ4Fyq3D0O6NJHNoODBA=="/>
             <sparkle:deltas>
-                <enclosure url="https://raw.githubusercontent.com/iglance/iGlance/master/Sparkle/updates/iGlance2.0.3-2.0.2.delta" sparkle:version="2.0.3" sparkle:shortVersionString="2.0.3" sparkle:deltaFrom="2.0.2" length="149668" type="application/octet-stream" sparkle:edSignature="1QP4iaV1kl8YNsu/KgCW840cgJRqs3ckxWBeT5NEAyX1ol1X9Ia4UPq+61+08bbTUvRyD2GFC41j1GMJRL1SAQ=="/>
-                <enclosure url="https://raw.githubusercontent.com/iglance/iGlance/master/Sparkle/updates/iGlance2.0.3-2.0.1.delta" sparkle:version="2.0.3" sparkle:shortVersionString="2.0.3" sparkle:deltaFrom="2.0.1" length="147984" type="application/octet-stream" sparkle:edSignature="tLyDlxT08XKWC3RZEUin0B8Nksv6hdRKMwTVbXC/kS4qoTLxXi9r7lT1krFVS1FMOi29yabDyH8hj9S0rF9hDA=="/>
-                <enclosure url="https://raw.githubusercontent.com/iglance/iGlance/master/Sparkle/updates/iGlance2.0.3-2.0.delta" sparkle:version="2.0.3" sparkle:shortVersionString="2.0.3" sparkle:deltaFrom="2.0" length="166680" type="application/octet-stream" sparkle:edSignature="hkVob2S3VVXZRSbSKMGPxrKdVaJcGDT6fvuDi1WMI4r2f7ExwY7kzqxZTMs37RADod6NqmwdmBcLXa1sd06JBg=="/>
+                <enclosure url="https://raw.githubusercontent.com/iglance/iGlance/master/Sparkle/updates/iGlance2.0.3-2.0.2.delta" sparkle:version="2.0.3" sparkle:shortVersionString="2.0.3" sparkle:deltaFrom="2.0.2" length="149602" type="application/octet-stream" sparkle:edSignature="ZbTbBjU9MRtvddxGOWOPkgdCOdhDtyqC2jFLO1ltvZhrQ78WRDxYfc2hiYqGXzzJmYWWoWesNtuC1lEh8IfRDw=="/>
+                <enclosure url="https://raw.githubusercontent.com/iglance/iGlance/master/Sparkle/updates/iGlance2.0.3-2.0.1.delta" sparkle:version="2.0.3" sparkle:shortVersionString="2.0.3" sparkle:deltaFrom="2.0.1" length="147993" type="application/octet-stream" sparkle:edSignature="gUF77BKz4LLfal9m/B8TK8e6w1eJFKpDLEiyp5WsbDvaE6DrWKYDvvr+EUlNIOkH8nGjJIcFAcsOqfw4PSswBQ=="/>
+                <enclosure url="https://raw.githubusercontent.com/iglance/iGlance/master/Sparkle/updates/iGlance2.0.3-2.0.delta" sparkle:version="2.0.3" sparkle:shortVersionString="2.0.3" sparkle:deltaFrom="2.0" length="165307" type="application/octet-stream" sparkle:edSignature="Ujoa4Xq75Oa8qnvNuwPWVAVXT6J2yfnHMW1RcxsOjt/oADKdy67l3lR64weesE05IiUj0q/XBr0aFznzUp0zBw=="/>
+            </sparkle:deltas>
+        </item>
+        <item>
+            <title>2.0.4</title>
+            <sparkle:releaseNotesLink>
+                https://iglance.github.io/release-notes.html
+            </sparkle:releaseNotesLink>
+            <pubDate>Wed, 01 Apr 2020 19:37:22 +0200</pubDate>
+            <sparkle:minimumSystemVersion>10.12</sparkle:minimumSystemVersion>
+            <enclosure url="https://github.com/iglance/iGlance/releases/download/v2.0.3/iGlance_v2.0.4.zip" sparkle:version="2.0.4" sparkle:shortVersionString="2.0.4" length="10105711" type="application/octet-stream" sparkle:edSignature="74m8D2j62xSrp4OYNjCqmbchhAOZUeo14k96CkU/VYmvPwMoxV7bubnvkYf5725cWNYeCko2yIuz7yJnMV6xBQ=="/>
+            <sparkle:deltas>
+                <enclosure url="https://raw.githubusercontent.com/iglance/iGlance/master/Sparkle/updates/iGlance2.0.4-2.0.3.delta" sparkle:version="2.0.4" sparkle:shortVersionString="2.0.4" sparkle:deltaFrom="2.0.3" length="227329" type="application/octet-stream" sparkle:edSignature="6j1j4HK9Kh/OT4DHFOk2zq4cmF0hJBQEXvBgTbOaQG4e3HnoAX5KkCgiR8wGuRwXEnN91i7uub+jLkQl7PF+CQ=="/>
+                <enclosure url="https://raw.githubusercontent.com/iglance/iGlance/master/Sparkle/updates/iGlance2.0.4-2.0.2.delta" sparkle:version="2.0.4" sparkle:shortVersionString="2.0.4" sparkle:deltaFrom="2.0.2" length="245727" type="application/octet-stream" sparkle:edSignature="r9pBlfBaLkdpp3oVEMHo8yN+66O5KrTQztal+SH1EXzjYMrKHyon4tX32RsSVFeA+5qFMPVCnvSzuoqf7Q+SCg=="/>
+                <enclosure url="https://raw.githubusercontent.com/iglance/iGlance/master/Sparkle/updates/iGlance2.0.4-2.0.1.delta" sparkle:version="2.0.4" sparkle:shortVersionString="2.0.4" sparkle:deltaFrom="2.0.1" length="259897" type="application/octet-stream" sparkle:edSignature="N2JGnzJxr++6NKj3gcrdj9jNd6sMScpLx0B8zjWqqsik4bqLsedBxZoaUqowLzkRlARbOaGXL5uRmhBIgQDSCA=="/>
+                <enclosure url="https://raw.githubusercontent.com/iglance/iGlance/master/Sparkle/updates/iGlance2.0.4-2.0.delta" sparkle:version="2.0.4" sparkle:shortVersionString="2.0.4" sparkle:deltaFrom="2.0" length="275213" type="application/octet-stream" sparkle:edSignature="V7rKHQP5sGN0OgOLv+AGI7PMWbm8nla2dBxnMREk0o4z8Kpw1cB/FZn7XqwWjIi0/vO7Y+cAsws653lJYF6UCg=="/>
             </sparkle:deltas>
         </item>
     </channel>

iGlance/iGlance/iGlance.xcodeproj/project.pbxproj

@@ -908,7 +908,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2.0.3;
+				CURRENT_PROJECT_VERSION = 2.0.4;
 				DEVELOPMENT_TEAM = J6GXEPK4NG;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = iGlance/Info.plist;
@@ -917,7 +917,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.iglance.iGlance;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -935,7 +935,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2.0.3;
+				CURRENT_PROJECT_VERSION = 2.0.4;
 				DEVELOPMENT_TEAM = J6GXEPK4NG;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = iGlance/Info.plist;
@@ -944,7 +944,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 2.0.3;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.iglance.iGlance;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

iGlance/iGlance/iGlance/Assets.xcassets/iGlance_logo_black.imageset/Contents.json

@@ -1,8 +1,8 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "iGlance_logo_black.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
@@ -15,7 +15,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

iGlance/iGlance/iGlance/Assets.xcassets/iGlance_logo_white.imageset/Contents.json

@@ -1,8 +1,8 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "iGlance_logo_white.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
@@ -15,7 +15,7 @@
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

iGlance/iGlance/iGlance/Base.lproj/Main.storyboard

@@ -115,13 +115,10 @@
                             </menuItem>
                             <menuItem title="Diagnostics" id="Fuq-kV-Ubk">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Diagnostics" systemMenu="window" id="pZ0-xF-28n">
+                                <menu key="submenu" title="Diagnostics" id="eFn-sS-dLd">
                                     <items>
-                                        <menuItem title="Save Log Files..." id="RWa-DA-MeM">
+                                        <menuItem title="Save Logfile..." id="41S-gD-t7E">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="performMiniaturize:" target="Ady-hI-5gd" id="uId-bG-tOu"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>

iGlance/iGlance/iGlance/MenuBarItems/BatteryMenuBarItem.swift

@@ -110,7 +110,12 @@ class BatteryMenuBarItem: MenuBarItem {
 
         // create the menu bar image
         let marginBetweenIconAndString = CGFloat(5)
-        let image = NSImage(size: NSSize(width: buttonString.size().width + batteryIcon!.size.width + marginBetweenIconAndString, height: 18))
+        let image = NSImage(
+            size: NSSize(
+                width: buttonString.size().width + batteryIcon!.size.width + marginBetweenIconAndString,
+                height: CGFloat(self.menuBarHeight)
+            )
+        )
 
         // lock the image to render the string
         image.lockFocus()
@@ -188,7 +193,7 @@ class BatteryMenuBarItem: MenuBarItem {
 
         // define the attributes
         let attributes = [
-            NSAttributedString.Key.font: NSFont(name: "Apple SD Gothic Neo", size: 14)!,
+            NSAttributedString.Key.font: NSFont.systemFont(ofSize: 13),
             NSAttributedString.Key.foregroundColor: ThemeManager.isDarkTheme() ? NSColor.white : NSColor.black
         ]
 
@@ -221,7 +226,7 @@ class BatteryMenuBarItem: MenuBarItem {
 
         // define the attributes
         let attributes = [
-            NSAttributedString.Key.font: NSFont(name: "Apple SD Gothic Neo", size: 14)!,
+            NSAttributedString.Key.font: NSFont.systemFont(ofSize: 13),
             NSAttributedString.Key.foregroundColor: ThemeManager.isDarkTheme() ? NSColor.white : NSColor.black
         ]
 
@@ -239,7 +244,7 @@ class BatteryMenuBarItem: MenuBarItem {
 
         // define the attributes
         let attributes = [
-            NSAttributedString.Key.font: NSFont(name: "Apple SD Gothic Neo", size: 14)!,
+            NSAttributedString.Key.font: NSFont.systemFont(ofSize: 13),
             NSAttributedString.Key.foregroundColor: ThemeManager.isDarkTheme() ? NSColor.white : NSColor.black
         ]
 
@@ -266,7 +271,7 @@ class BatteryMenuBarItem: MenuBarItem {
     private func getPercentageString(currentCharge: Int) -> NSAttributedString {
         // define the attributes
         let attributes = [
-            NSAttributedString.Key.font: NSFont(name: "Apple SD Gothic Neo", size: 14)!,
+            NSAttributedString.Key.font: NSFont.systemFont(ofSize: 13),
             NSAttributedString.Key.foregroundColor: ThemeManager.isDarkTheme() ? NSColor.white : NSColor.black
         ]