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

Delete codeine folder from project

Browse source
This commit is contained in:
Garth Vander Houwen 2021-11-24 10:25:13 -08:00
parent 69efa420c8
commit 5ae2da2651
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Meshtastic Client.xcodeproj/project.pbxproj
View file

@ -48,7 +48,6 @@
DDC2E17A26CE248F0042C5E4 /* MeshtasticClientUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E17926CE248F0042C5E4 /* MeshtasticClientUITests.swift */; };
DDC2E18F26CE25FE0042C5E4 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E18E26CE25FE0042C5E4 /* ContentView.swift */; };
DDC2E1A726CEB3400042C5E4 /* LocationHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E1A626CEB3400042C5E4 /* LocationHelper.swift */; };
DDD2B1562749422E00E42118 /* CodeGen in Resources */ = {isa = PBXBuildFile; fileRef = DDD2B1552749422E00E42118 /* CodeGen */; };
DDD8976E2745E08F000258DB /* Mesh.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DDD8976C2745E08F000258DB /* Mesh.xcdatamodeld */; };
DDF924C626FA2375009FE055 /* MessageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDF924C526FA2375009FE055 /* MessageModel.swift */; };
DDF924CA26FBB953009FE055 /* ConnectedDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDF924C926FBB953009FE055 /* ConnectedDevice.swift */; };
@ -119,7 +118,6 @@
DDC2E17B26CE248F0042C5E4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
DDC2E18E26CE25FE0042C5E4 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
DDC2E1A626CEB3400042C5E4 /* LocationHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationHelper.swift; sourceTree = "<group>"; };
DDD2B1552749422E00E42118 /* CodeGen */ = {isa = PBXFileReference; lastKnownFileType = folder; path = CodeGen; sourceTree = "<group>"; };
DDD8976D2745E08F000258DB /* Mesh.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Mesh.xcdatamodel; sourceTree = "<group>"; };
DDF924C526FA2375009FE055 /* MessageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageModel.swift; sourceTree = "<group>"; };
DDF924C926FBB953009FE055 /* ConnectedDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectedDevice.swift; sourceTree = "<group>"; };
@ -207,7 +205,6 @@
DDB0209E272B0C5700F8DBAE /* Data */ = {
isa = PBXGroup;
children = (
DDD2B1552749422E00E42118 /* CodeGen */,
DDD8976C2745E08F000258DB /* Mesh.xcdatamodeld */,
);
path = Data;
@ -454,7 +451,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
DDD2B1562749422E00E42118 /* CodeGen in Resources */,
DDC2E15F26CE248F0042C5E4 /* Preview Assets.xcassets in Resources */,
DDC2E15C26CE248F0042C5E4 /* Assets.xcassets in Resources */,
);
@ -696,7 +692,7 @@
SUPPORTS_MACCATALYST = YES;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,6";
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
@ -723,7 +719,7 @@
SUPPORTS_MACCATALYST = YES;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,6";
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};

2
MeshtasticClient/Model/Data/Mesh.xcdatamodeld/Mesh.xcdatamodel/contents
View file

@ -14,7 +14,7 @@
<attribute name="num" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="snr" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES"/>
<relationship name="position" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="PositionEntity"/>
<relationship name="user" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="UserEntity"/>
<relationship name="user" maxCount="1" deletionRule="Nullify" destinationEntity="UserEntity"/>
</entity>
<entity name="PositionEntity" representedClassName="PositionEntity" syncable="YES" codeGenerationType="class">
<attribute name="altitude" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>

5
MeshtasticClient/Views/Messages/Messages.swift
View file

@ -12,6 +12,7 @@ struct Messages: View {
// Keyboard State
@State var typingMessage: String = ""
@State private var totalBytes = 0
private var maxbytes = 228
@State private var lastTypingMessage = ""
@FocusState private var focusedField: Field?
@ -126,7 +127,7 @@ struct Messages: View {
let size = value.utf8.count
totalBytes = size
if totalBytes <= 200 {
if totalBytes <= maxbytes {
// Allow the user to type
lastTypingMessage = typingMessage
}
@ -147,7 +148,7 @@ struct Messages: View {
Spacer()
ProgressView("Bytes: \(totalBytes) / 200", value: Double(totalBytes), total: 200)
ProgressView("Bytes: \(totalBytes) / \(maxbytes)", value: Double(totalBytes), total: Double(maxbytes))
.frame(width: 130)
.padding(5)
.font(.subheadline)