Skip to content
This repository has been archived by the owner on Oct 10, 2024. It is now read-only.

Commit

Permalink
Merge pull request #69 from OsMo-lab/dev
Browse files Browse the repository at this point in the history 
Build 2.2.214
  • Loading branch information
@SirAlexey
SirAlexey authored Sep 26, 2021
2 parents f1e099d + 9e829e6 commit 7b36740
Show file tree
Hide file tree
Showing 17 changed files with 239 additions and 279 deletions.
8 changes: 4 additions & 4 deletions iOsMo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 208;
CURRENT_PROJECT_VERSION = 214;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = SF5DP65BZ4;
ENABLE_BITCODE = NO;
Expand All @@ -742,7 +742,7 @@
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 2.1;
MARKETING_VERSION = 2.2;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = alexey.sirotkin.iosmo;
PRODUCT_NAME = OsMo;
Expand All @@ -767,7 +767,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 208;
CURRENT_PROJECT_VERSION = 214;
DEFINES_MODULE = NO;
DEVELOPMENT_TEAM = SF5DP65BZ4;
ENABLE_BITCODE = NO;
Expand All @@ -783,7 +783,7 @@
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 2.1;
MARKETING_VERSION = 2.2;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = alexey.sirotkin.iosmo;
PRODUCT_NAME = OsMo;
Expand Down
Binary file modified .../project.xcworkspace/xcuserdata/alexeysirotkin.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
190 changes: 63 additions & 127 deletions iOsMo.xcodeproj/xcuserdata/alexeysirotkin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
timestampString = "583696383.1095949"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "393"
endingLineNumber = "393"
landmarkName = "AppDelegate"
landmarkType = "21">
startingLineNumber = "432"
endingLineNumber = "432"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand Down Expand Up @@ -56,55 +56,7 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "419"
endingLineNumber = "419"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "FDB0E122-DD89-4640-BE38-9972B74F3905"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iOsmo/ConnectionManager.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "200"
endingLineNumber = "200"
landmarkName = "Authenticate()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "F3D001B9-692D-46B0-8422-9E1932A46BFA"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iOsmo/ConnectionManager.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "207"
endingLineNumber = "207"
landmarkName = "Authenticate()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "8C2F884C-4E82-4C96-968A-4E6F908114AE"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iOsmo/AccountViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "248"
endingLineNumber = "248"
landmarkName = "shouldPerformSegue(withIdentifier:sender:)"
landmarkName = "updateGroupsOnMap(groups:GP:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
Expand All @@ -118,10 +70,10 @@
filePath = "iOsmo/MapViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "790"
endingLineNumber = "790"
landmarkName = "unknown"
landmarkType = "0">
startingLineNumber = "794"
endingLineNumber = "794"
landmarkName = "SelectMapStyle(sender:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -134,10 +86,10 @@
filePath = "iOsmo/MapViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "827"
endingLineNumber = "827"
landmarkName = "unknown"
landmarkType = "0">
startingLineNumber = "831"
endingLineNumber = "831"
landmarkName = "SelectMapStyle(sender:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -156,22 +108,6 @@
landmarkType = "24">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B957F303-1B01-4F95-8633-6BDE36A51D83"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iOsmo/AuthViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "171"
endingLineNumber = "171"
landmarkName = "textFieldShouldReturn(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
Expand Down Expand Up @@ -204,54 +140,6 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "7B773A80-BD7E-47AD-87C5-36462BB7C872"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iOsmo/MonitoringViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "253"
endingLineNumber = "253"
landmarkName = "viewDidLoad()"
landmarkType = "7">
<Locations>
<Location
uuid = "7B773A80-BD7E-47AD-87C5-36462BB7C872 - 550e04733cee3916"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #5 ((Swift.Int, Swift.String)) -&gt; () in OsMo.MonitoringViewController.viewDidLoad() -&gt; ()"
moduleName = "OsMo"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/alexeysirotkin/Documents/iOsMo/iOsmo/MonitoringViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "254"
endingLineNumber = "254"
offsetFromSymbolStart = "344">
</Location>
<Location
uuid = "7B773A80-BD7E-47AD-87C5-36462BB7C872 - 4dac0ac1cc5cadd6"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #1 (Swift.Int, Swift.String) -&gt; () in closure #5 ((Swift.Int, Swift.String)) -&gt; () in OsMo.MonitoringViewController.viewDidLoad() -&gt; ()"
moduleName = "OsMo"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/alexeysirotkin/Documents/iOsMo/iOsmo/MonitoringViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "255"
endingLineNumber = "255"
offsetFromSymbolStart = "88">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
Expand All @@ -262,8 +150,8 @@
filePath = "iOsmo/ConnectionManager.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "265"
endingLineNumber = "265"
startingLineNumber = "263"
endingLineNumber = "263"
landmarkName = "completed(result:token:)"
landmarkType = "7">
<Locations>
Expand Down Expand Up @@ -316,5 +204,53 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C82FDBDC-733B-4F64-BB66-30C9198A1428"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iOsmo/MonitoringViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "326"
endingLineNumber = "326"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "F8E72B6E-3B9B-44EE-8522-09E7DF4F40B1"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iOsmo/MonitoringViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "337"
endingLineNumber = "337"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "229E8FF7-5AEE-46E9-9541-1A4B8FA9A5B7"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iOsmo/SendingManager.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "110"
endingLineNumber = "110"
landmarkName = "stopSendingCoordinates()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
65 changes: 40 additions & 25 deletions iOsmo/AccountViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,6 @@ class AccountViewController: UIViewController, AuthResultProtocol, UITableViewDa
if let user = SettingsManager.getKey(SettingKeys.user) {
if user.length > 0 {
userName.text = String(user)


return;
}
}
Expand Down Expand Up @@ -379,15 +377,24 @@ class AccountViewController: UIViewController, AuthResultProtocol, UITableViewDa
}

func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
let row = (indexPath as NSIndexPath).row
let section = (indexPath as NSIndexPath).section

var height:CGFloat = 85.0;
if indexPath.section == 0 {
let uid = SettingsManager.getKey(SettingKeys.uid);
if (section == 0 && row == 0) { /* Строка создания новой группы */
if groupAction == GroupActions.new {
if let user = SettingsManager.getKey(SettingKeys.user) {
if user.length == 0 {
height = 124
}
} else {
if (uid == "0" || uid == "") {
height = 124
} else {
height = 50
}
}
}
if (section == 1 && row == 0) { /* Строка вступления в группу */
if groupAction == GroupActions.enter {
if (uid != "0" && uid != "") {
height = 50
}
}
}
Expand All @@ -414,15 +421,20 @@ class AccountViewController: UIViewController, AuthResultProtocol, UITableViewDa
gName.isEnabled = true
nick.isHidden = false;
nickLabel.isHidden = false;
if let user = SettingsManager.getKey(SettingKeys.user) {
if user.length > 0 {
nick.text = user as String;
nick.isHidden = true;
nickLabel.isHidden = true;
} else {
nick.text = "";
if let uid = SettingsManager.getKey(SettingKeys.uid){
if (uid != "0" && uid != "") {
if let user = SettingsManager.getKey(SettingKeys.user) {
if user.length > 0 {
nick.text = user as String;
nick.isHidden = true;
nickLabel.isHidden = true;
} else {
nick.text = "";
}
}
}
}

btn.isHidden = false
}
} else if (section == 0 && row == 0) { /* Строка создания новой группы */
Expand All @@ -441,16 +453,19 @@ class AccountViewController: UIViewController, AuthResultProtocol, UITableViewDa
email.isHidden = false;
emailLabel.isHidden = false;

if let user = SettingsManager.getKey(SettingKeys.user) {
if user.length > 0 {
nick.text = user as String;
nick.isHidden = true;
nickLabel.isHidden = true;
email.isHidden = true;
emailLabel.isHidden = true;

} else {
nick.text = "";
if let uid = SettingsManager.getKey(SettingKeys.uid){
if (uid != "0" && uid != "") {
if let user = SettingsManager.getKey(SettingKeys.user) {
if user.length > 0 {
nick.text = user as String;
nick.isHidden = true;
nickLabel.isHidden = true;
email.isHidden = true;
emailLabel.isHidden = true;
} else {
nick.text = "";
}
}
}
}
}
Expand Down
Loading

0 comments on commit 7b36740

Please sign in to comment.