Skip to content

Commit

Permalink
App Icon
Browse files Browse the repository at this point in the history
  • Loading branch information
@hitenkmr
hitenkmr committed Aug 9, 2018
1 parent 5582cb9 commit 13bef13
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 107 deletions.
Binary file modified Actifit/.DS_Store
View file
Binary file not shown.
Binary file modified ...t/Actifit.xcworkspace/xcuserdata/hitenderkumar.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
82 changes: 0 additions & 82 deletions ...fit.xcworkspace/xcuserdata/hitenderkumar.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,86 +2,4 @@
<Bucket
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Actifit/Controllers/ActivityTrackingVC.swift"
timestampString = "555481590.723784"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "53"
endingLineNumber = "53"
landmarkName = "viewWillDisappear(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Actifit/Controllers/ActivityTrackingVC.swift"
timestampString = "555481590.724347"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "46"
endingLineNumber = "46"
landmarkName = "viewWillAppear(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Actifit/Controllers/ActivityTrackingVC.swift"
timestampString = "555481590.724736"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "141"
endingLineNumber = "141"
landmarkName = "setTotalStepsCountsUpFromMidnight()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Actifit/Controllers/ActivityTrackingVC.swift"
timestampString = "555481590.7251019"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "181"
endingLineNumber = "181"
landmarkName = "startCountingSteps()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Actifit/Controllers/ActivityTrackingVC.swift"
timestampString = "555481590.725454"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "192"
endingLineNumber = "192"
landmarkName = "showStepsCount(count:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Binary file added Actifit/Actifit/Assets.xcassets/AppIcon.appiconset/AppIcon20@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Actifit/Actifit/Assets.xcassets/AppIcon.appiconset/AppIcon20@3x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Actifit/Actifit/Assets.xcassets/AppIcon.appiconset/AppIcon29@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Actifit/Actifit/Assets.xcassets/AppIcon.appiconset/AppIcon29@3x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Actifit/Actifit/Assets.xcassets/AppIcon.appiconset/AppIcon40@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Actifit/Actifit/Assets.xcassets/AppIcon.appiconset/AppIcon40@3x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Actifit/Actifit/Assets.xcassets/AppIcon.appiconset/AppIcon60@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Actifit/Actifit/Assets.xcassets/AppIcon.appiconset/AppIcon60@3x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 16 additions & 8 deletions Actifit/Actifit/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,51 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"idiom" : "iphone",
"filename" : "AppIcon20@2x.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"idiom" : "iphone",
"filename" : "AppIcon20@3x.png",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"idiom" : "iphone",
"filename" : "AppIcon29@2x.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"idiom" : "iphone",
"filename" : "AppIcon29@3x.png",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"idiom" : "iphone",
"filename" : "AppIcon40@2x.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"idiom" : "iphone",
"filename" : "AppIcon40@3x.png",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"idiom" : "iphone",
"filename" : "AppIcon60@2x.png",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"idiom" : "iphone",
"filename" : "AppIcon60@3x.png",
"scale" : "3x"
},
{
Expand Down
12 changes: 5 additions & 7 deletions Actifit/Actifit/Controllers/ActivityTrackingVC.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ class ActivityTrackingVC: UIViewController {

//MARK: OUTLETS

@IBOutlet weak var activityStateLabel : UILabel!
@IBOutlet weak var stepsCountLabel : UILabel!
@IBOutlet weak var postToSteemitBtn : UIButton!
@IBOutlet weak var viewTrackingHistoryBtn : UIButton!
Expand Down Expand Up @@ -115,7 +114,6 @@ extension ActivityTrackingVC {
switch CMMotionActivityManager.authorizationStatus() {
case CMAuthorizationStatus.denied:
onStop()
activityStateLabel.text = "Not available"
stepsCountLabel.text = "Not available"
default:break
}
Expand All @@ -126,7 +124,7 @@ extension ActivityTrackingVC {
if CMMotionActivityManager.isActivityAvailable() {
startTrackingActivityType()
} else {
activityStateLabel.text = "Not available"
print("Not available")
}

if CMPedometer.isStepCountingAvailable() {
Expand Down Expand Up @@ -161,13 +159,13 @@ extension ActivityTrackingVC {
guard let activity = activity else { return }
DispatchQueue.main.async {
if activity.walking {
self?.activityStateLabel.text = "Walking"
print("Walking")
} else if activity.stationary {
self?.activityStateLabel.text = "Stationary"
print("Stationary")
} else if activity.running {
self?.activityStateLabel.text = "Running"
print("Running")
} else if activity.automotive {
self?.activityStateLabel.text = "Automotive"
print("Automotive")
}
}
}
Expand Down
10 changes: 0 additions & 10 deletions Actifit/Actifit/Controllers/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,24 +84,15 @@
</button>
</subviews>
</stackView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Activity State" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vrs-TM-hAx">
<rect key="frame" x="20" y="544.5" width="335" height="19.5"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="Vrs-TM-hAx" firstAttribute="top" secondItem="mfV-kE-clG" secondAttribute="bottom" constant="20" id="7gC-6Q-E3g"/>
<constraint firstItem="hSy-ZB-wJo" firstAttribute="top" secondItem="cxL-Ia-eyH" secondAttribute="top" id="NBX-6c-o2s"/>
<constraint firstItem="YxB-yw-Aiv" firstAttribute="leading" secondItem="r8C-ak-wxx" secondAttribute="leading" constant="20" id="TnR-h2-xcx"/>
<constraint firstItem="r8C-ak-wxx" firstAttribute="trailing" secondItem="YxB-yw-Aiv" secondAttribute="trailing" constant="20" id="Trs-oB-0vM"/>
<constraint firstItem="mfV-kE-clG" firstAttribute="top" secondItem="YxB-yw-Aiv" secondAttribute="bottom" constant="20" id="W2m-7n-evE"/>
<constraint firstItem="r8C-ak-wxx" firstAttribute="trailing" secondItem="Vrs-TM-hAx" secondAttribute="trailing" constant="20" id="Wha-ld-7eI"/>
<constraint firstItem="EkX-Uf-0oF" firstAttribute="centerY" secondItem="cxL-Ia-eyH" secondAttribute="centerY" id="YKK-2B-P1B"/>
<constraint firstItem="r8C-ak-wxx" firstAttribute="trailing" secondItem="mfV-kE-clG" secondAttribute="trailing" id="ilF-TI-0sm"/>
<constraint firstItem="Vrs-TM-hAx" firstAttribute="leading" secondItem="r8C-ak-wxx" secondAttribute="leading" constant="20" id="oea-QG-PRT"/>
<constraint firstItem="EkX-Uf-0oF" firstAttribute="centerX" secondItem="cxL-Ia-eyH" secondAttribute="centerX" id="qJC-ZF-dhO"/>
<constraint firstItem="YxB-yw-Aiv" firstAttribute="top" secondItem="EkX-Uf-0oF" secondAttribute="bottom" constant="20" id="tKa-og-0c0"/>
<constraint firstItem="hSy-ZB-wJo" firstAttribute="trailing" secondItem="r8C-ak-wxx" secondAttribute="trailing" id="v2j-Dx-Scf"/>
Expand All @@ -112,7 +103,6 @@
</view>
<navigationItem key="navigationItem" id="W6N-6k-g0H"/>
<connections>
<outlet property="activityStateLabel" destination="Vrs-TM-hAx" id="Ynu-8E-SxM"/>
<outlet property="postToSteemitBtn" destination="ibL-xk-mDF" id="XqP-6M-CCf"/>
<outlet property="stepsCountLabel" destination="YxB-yw-Aiv" id="ID8-Fd-IKe"/>
<outlet property="viewDailyLeaderboardBtn" destination="V4O-6A-5Vw" id="q3z-FH-48b"/>
Expand Down

0 comments on commit 13bef13

Please sign in to comment.