starred/AlDente-Battery_Care_and_Monitoring
1
0
Fork 0
mirror of https://github.com/AppHouseKitchen/AlDente-Battery_Care_and_Monitoring.git synced 2026-05-22 15:47:26 +02:00
Code Issues 8 Packages Projects Releases 2 Wiki Activity

launchatlogin fix, b/w icon, osx battery scale

Browse Source
This commit is contained in:
David Wernhart
2020-06-04 15:24:05 +02:00
parent 5185014922
commit ffdf09b135
24 changed files with 131 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.DS_Store
Vendored
BIN
View File
Binary file not shown.
AlDente.xcodeproj/project.pbxproj
+11 -5
View File
@@ -221,9 +221,9 @@
92981ED423F08D9B00C05424 /* Frameworks */,
92981ED523F08D9B00C05424 /* Resources */,
9224A08623F1F6E300961AC4 /* CopyFiles */,
9240BF2F23FD3547005A710B /* Embed Frameworks */,
9286FB4B23F84C2B00BEB15B /* Embed Frameworks */,
92E24B4423F847B500BE41ED /* ShellScript */,
9240BF2F23FD3547005A710B /* Embed Frameworks */,
);
buildRules = (
);
@@ -367,6 +367,7 @@
PRODUCT_MODULE_NAME = AlDenteHelper;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks";
};
@@ -397,6 +398,7 @@
PRODUCT_MODULE_NAME = AlDenteHelper;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks";
};
@@ -457,6 +459,7 @@
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SKIP_INSTALL = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
@@ -510,6 +513,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = macosx;
SKIP_INSTALL = NO;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
};
@@ -523,7 +527,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_ASSET_PATHS = "\"AlDente/Preview Content\"";
DEVELOPMENT_TEAM = 56C2L92EKW;
ENABLE_HARDENED_RUNTIME = YES;
@@ -538,10 +542,11 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.davidwernhart.AlDente;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = NO;
SWIFT_VERSION = 5.0;
};
name = Debug;
@@ -554,7 +559,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_ASSET_PATHS = "\"AlDente/Preview Content\"";
DEVELOPMENT_TEAM = 56C2L92EKW;
ENABLE_HARDENED_RUNTIME = YES;
@@ -569,10 +574,11 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.davidwernhart.AlDente;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = NO;
SWIFT_VERSION = 5.0;
};
name = Release;
AlDente.xcodeproj/project.xcworkspace/xcuserdata/davidwernhart.xcuserdatad/UserInterfaceState.xcuserstate
Generated
BIN
View File
Binary file not shown.
AlDente/.DS_Store
Vendored
BIN
View File
Binary file not shown.
AlDente/AppDelegate.swift
+5 -2
View File
@@ -10,6 +10,7 @@ import Cocoa
import SwiftUI
import ServiceManagement
import Foundation
import LaunchAtLogin
@NSApplicationMain
class AppDelegate: NSObject, NSApplicationDelegate {
@@ -33,14 +34,16 @@ class AppDelegate: NSObject, NSApplicationDelegate {
let statusBar = NSStatusBar.system
statusBarItem = statusBar.statusItem(
withLength: NSStatusItem.squareLength)
statusBarItem.button?.title = "🍝"
statusBarItem.button?.image = NSImage(named: "menubaricon")!
//statusBarItem.button?.title = "🍝"
if let button = self.statusBarItem.button {
button.action = #selector(togglePopover(_:))
}
Helper.instance.checkHelperVersion()
LaunchAtLogin.isEnabled = true
}
@objc func togglePopover(_ sender: AnyObject?) {
AlDente/Assets.xcassets/menubaricon.imageset/Contents.json
Vendored
+54
View File
@@ -0,0 +1,54 @@
{
"images" : [
{
"filename" : "aldentelighticon1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "aldentedarkicon1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "aldentelighticon2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "aldentedarkicon2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
AlDente/Assets.xcassets/menubaricon.imageset/aldentedarkicon1x.png
Vendored
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

AlDente/Assets.xcassets/menubaricon.imageset/aldentedarkicon2x.png
Vendored
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

AlDente/Assets.xcassets/menubaricon.imageset/aldentelighticon1x.png
Vendored
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

AlDente/Assets.xcassets/menubaricon.imageset/aldentelighticon2x.png
Vendored
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

AlDente/ContentView.swift
+42 -8
View File
@@ -32,11 +32,16 @@ struct RedButtonStyle: ButtonStyle {
}
}
var osxScale:Bool = true
struct settings<Content: View>: View {
var content: () -> Content
@State var launchOnLogin = LaunchAtLogin.isEnabled
@State var osxScaleToggle = osxScale
@ObservedObject var presenter = SMCPresenter.shared
init(@ViewBuilder _ content: @escaping () -> Content) {
self.content = content
@@ -66,6 +71,19 @@ struct settings<Content: View>: View {
Text("Launch on Login")
}.padding()
Toggle(isOn: Binding(
get: {
self.osxScaleToggle
},
set: {(newValue) in
self.osxScaleToggle = newValue
osxScale = newValue
self.presenter.setValue(value: Float(self.presenter.value))
}
)) {
Text("Use MacOS battery scale")
}.padding()
Spacer()
Button( action: {
Helper.instance.installHelper()
@@ -80,7 +98,7 @@ struct settings<Content: View>: View {
HStack(alignment: .center) {
Spacer()
VStack(alignment: .leading){
Text("AlDente 🍝").font(.subheadline)
Text("AlDente 1.2 🍝").font(.subheadline)
Button(action:{
let url = URL(string: "https://www.github.com/davidwernhart/AlDente")!
if NSWorkspace.shared.open(url) {
@@ -114,7 +132,7 @@ struct ContentView: View{
@State var adaptableHeight = CGFloat(100)
@State var showSettings = false
@ObservedObject var presenter = SMCPresenter()
@ObservedObject var presenter = SMCPresenter.shared
init() {
Helper.instance.delegate = presenter
@@ -182,7 +200,8 @@ struct ContentView: View{
Spacer()
if(self.showSettings){
settings{Text("")}
//settings{Text("")}
settings({Text("")})
}
}.frame(width: 400, height: adaptableHeight)
@@ -195,12 +214,19 @@ struct ContentView: View{
class SMCPresenter: ObservableObject, HelperDelegate{
static let shared = SMCPresenter()
@Published var value: UInt8 = 0
private var timer: Timer?
func OnMaxBatRead(value: UInt8){
DispatchQueue.main.async {
self.value = value
if(osxScale){
self.value = value + 3
}
else{
self.value = value
}
}
}
@@ -209,11 +235,19 @@ class SMCPresenter: ObservableObject, HelperDelegate{
self.value = UInt8(value)
}
self.timer?.invalidate()
self.timer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: false, block: { timer in
print("Setting Max Battery To: ",value)
Helper.instance.writeMaxBatteryCharge(setVal: UInt8(value))
Helper.instance.readMaxBatteryCharge()
self.timer = nil
var setval = value
if(osxScale){
setval -= 3
}
if(setval >= 20 && setval <= 100){
print("Setting Max Battery To: ",setval)
Helper.instance.writeMaxBatteryCharge(setVal: UInt8(setval))
Helper.instance.readMaxBatteryCharge()
self.timer = nil
}
})
}
Carthage/.DS_Store
Vendored
BIN
View File
Binary file not shown.
Carthage/Build/.DS_Store
Generated Vendored
BIN
View File
Binary file not shown.
Carthage/Build/.LaunchAtLogin.version
Generated Vendored
+3 -12
View File
@@ -1,19 +1,10 @@
{
"commitish" : "v3.0.0",
"Mac" : [
{
"name" : "LaunchAtLogin",
"hash" : "2e9388c5a92a57f855ee3fd4af35f7bd9ca52e5b9b45da92d64104cf31cb017d",
"swiftToolchainVersion" : "5.1.3 (swiftlang-1100.0.282.1 clang-1100.0.33.15)"
"hash" : "3e5f8a12d3371e2e67b1cb69491ac112af892603ed2ceb6af78d9727577f3371",
"swiftToolchainVersion" : "5.2.4 (swiftlang-1103.0.32.9 clang-1103.0.32.53)"
}
],
"watchOS" : [
],
"tvOS" : [
],
"commitish" : "v3.0.0",
"iOS" : [
]
}
Carthage/Build/Mac/LaunchAtLogin.framework.dSYM/Contents/Resources/DWARF/LaunchAtLogin
Generated Vendored
BIN
View File
Binary file not shown.
Carthage/Build/Mac/LaunchAtLogin.framework/Versions/A/Headers/LaunchAtLogin-Swift.h
Generated Vendored
+6 -1
View File
@@ -1,4 +1,4 @@
// Generated by Apple Swift version 5.1.3 (swiftlang-1100.0.282.1 clang-1100.0.33.15)
// Generated by Apple Swift version 5.2.4 (swiftlang-1103.0.32.9 clang-1103.0.32.53)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wgcc-compat"
@@ -82,6 +82,11 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
#else
# define SWIFT_NOESCAPE
#endif
#if __has_attribute(ns_consumed)
# define SWIFT_RELEASES_ARGUMENT __attribute__((ns_consumed))
#else
# define SWIFT_RELEASES_ARGUMENT
#endif
#if __has_attribute(warn_unused_result)
# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
#else
Carthage/Build/Mac/LaunchAtLogin.framework/Versions/A/LaunchAtLogin
Generated Vendored
BIN
View File
Binary file not shown.
Carthage/Build/Mac/LaunchAtLogin.framework/Versions/A/Modules/LaunchAtLogin.swiftmodule/x86_64-apple-macos.swiftdoc
Generated Vendored
BIN
View File
Binary file not shown.
Carthage/Build/Mac/LaunchAtLogin.framework/Versions/A/Modules/LaunchAtLogin.swiftmodule/x86_64-apple-macos.swiftmodule
Generated Vendored
BIN
View File
Binary file not shown.
Carthage/Build/Mac/LaunchAtLogin.framework/Versions/A/Modules/LaunchAtLogin.swiftmodule/x86_64.swiftdoc
Generated Vendored
BIN
View File
Binary file not shown.
Carthage/Build/Mac/LaunchAtLogin.framework/Versions/A/Modules/LaunchAtLogin.swiftmodule/x86_64.swiftmodule
Generated Vendored
BIN
View File
Binary file not shown.
Carthage/Build/Mac/LaunchAtLogin.framework/Versions/A/Resources/Info.plist
Generated Vendored
+5 -5
View File
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>19D76</string>
<string>19F101</string>
<key>CFBundleExecutable</key>
<string>LaunchAtLogin</string>
<key>CFBundleIdentifier</key>
@@ -25,17 +25,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>11C504</string>
<string>11E608c</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>19B90</string>
<string>19E258</string>
<key>DTSDKName</key>
<string>macosx10.15</string>
<key>DTXcode</key>
<string>1130</string>
<string>1150</string>
<key>DTXcodeBuild</key>
<string>11C504</string>
<string>11E608c</string>
<key>LSMinimumSystemVersion</key>
<string>10.12</string>
<key>NSHumanReadableCopyright</key>
Carthage/Build/Mac/LaunchAtLogin.framework/Versions/A/Resources/LaunchAtLoginHelper.app/Contents/Info.plist
Generated Vendored
+5 -5
View File
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>19D76</string>
<string>19F101</string>
<key>CFBundleExecutable</key>
<string>LaunchAtLoginHelper</string>
<key>CFBundleIdentifier</key>
@@ -25,17 +25,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>11C504</string>
<string>11E608c</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>19B90</string>
<string>19E258</string>
<key>DTSDKName</key>
<string>macosx10.15</string>
<key>DTXcode</key>
<string>1130</string>
<string>1150</string>
<key>DTXcodeBuild</key>
<string>11C504</string>
<string>11E608c</string>
<key>LSBackgroundOnly</key>
<true/>
<key>LSMinimumSystemVersion</key>
Carthage/Build/Mac/LaunchAtLogin.framework/Versions/A/Resources/LaunchAtLoginHelper.app/Contents/MacOS/LaunchAtLoginHelper
Generated Vendored
BIN
View File
Binary file not shown.