meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into hotfix/tapback_and_reply_bug

Browse source
This commit is contained in:
Garth Vander Houwen 2022-01-16 09:47:44 -08:00 • committed by GitHub
commit 2c569ec364
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Meshtastic Client.xcodeproj/project.pbxproj
View file

@ -718,7 +718,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CODE_SIGN_ENTITLEMENTS = MeshtasticClient/MeshtasticClient.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 16;
CURRENT_PROJECT_VERSION = 17;
DEVELOPMENT_ASSET_PATHS = "\"MeshtasticClient/Preview Content\"";
DEVELOPMENT_TEAM = GCH7VS5Y9R;
ENABLE_PREVIEWS = YES;
@ -746,7 +746,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
CODE_SIGN_ENTITLEMENTS = MeshtasticClient/MeshtasticClient.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 16;
CURRENT_PROJECT_VERSION = 17;
DEVELOPMENT_ASSET_PATHS = "\"MeshtasticClient/Preview Content\"";
DEVELOPMENT_TEAM = GCH7VS5Y9R;
ENABLE_PREVIEWS = YES;

2
MeshtasticClient/Views/Messages/UserMessageList.swift
View file

@ -34,7 +34,7 @@ struct UserMessageList: View {
var body: some View {
let firmwareVersion = bleManager.lastConnnectionVersion
let minimumVersion = "1.2.50"
let minimumVersion = "1.2.55"
let hasTapbackSupport = minimumVersion.compare(firmwareVersion, options: .numeric) == .orderedAscending || minimumVersion.compare(firmwareVersion, options: .numeric) == .orderedSame
VStack {

12
MeshtasticClient/Views/Settings/MeshLog.swift
View file

@ -56,10 +56,12 @@ struct MeshLog: View {
}
}) {
Image(systemName: "trash").imageScale(.large).foregroundColor(.gray)
Image(systemName: "trash.circle.fill")
.symbolRenderingMode(.hierarchical)
.imageScale(.large).foregroundColor(.accentColor)
Text("Clear Log").font(.caption)
.font(.caption)
.foregroundColor(.gray)
.foregroundColor(.accentColor)
}
.padding()
.background(Color(.systemGray6))
@ -70,10 +72,12 @@ struct MeshLog: View {
Button(action: {
isExporting = true
}) {
Image(systemName: "arrow.down.circle.fill").imageScale(.large).foregroundColor(.gray)
Image(systemName: "arrow.down.circle.fill")
.symbolRenderingMode(.hierarchical)
.imageScale(.large).foregroundColor(.accentColor)
Text("Download Log")
.font(.caption)
.foregroundColor(.gray)
.foregroundColor(.accentColor)
}
.padding()
.background(Color(.systemGray6))