Skip to content

Commit

Permalink
[Fix] 앱설치 후 log 창 터지는 오류 수정, 기록시작 문구 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@minsangKang
minsangKang committed May 18, 2022
1 parent 5fe6283 commit 834a152
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Project_Timer.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 6.4.1;
MARKETING_VERSION = 6.5;
PRODUCT_BUNDLE_IDENTIFIER = com.FDEE.TiTi;
PRODUCT_NAME = TiTi;
SUPPORTS_MACCATALYST = YES;
Expand All @@ -688,7 +688,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 6.4.1;
MARKETING_VERSION = 6.5;
PRODUCT_BUNDLE_IDENTIFIER = com.FDEE.TiTi;
PRODUCT_NAME = TiTi;
SUPPORTS_MACCATALYST = YES;
Expand Down
14 changes: 7 additions & 7 deletions Project_Timer/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,13 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NPQ-Xe-8up">
<rect key="frame" x="106.66666666666669" y="156" width="162" height="40"/>
<rect key="frame" x="162.66666666666666" y="156" width="50" height="40"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="sX4-Hx-fkH"/>
</constraints>
<fontDescription key="fontDescription" name="HGGGothicssiP60g" family="HGGGothicssi_Pro" pointSize="18"/>
<inset key="contentEdgeInsets" minX="25" minY="0.0" maxX="25" maxY="0.0"/>
<state key="normal" title="Enter New Task">
<state key="normal">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<userDefinedRuntimeAttributes>
Expand Down Expand Up @@ -519,13 +519,13 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gEt-rS-lNf">
<rect key="frame" x="106.66666666666669" y="156" width="162" height="40"/>
<rect key="frame" x="162.66666666666666" y="156" width="50" height="40"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="kaO-n4-ewZ"/>
</constraints>
<fontDescription key="fontDescription" name="HGGGothicssiP60g" family="HGGGothicssi_Pro" pointSize="18"/>
<inset key="contentEdgeInsets" minX="25" minY="0.0" maxX="25" maxY="0.0"/>
<state key="normal" title="Enter New Task">
<state key="normal">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<userDefinedRuntimeAttributes>
Expand Down Expand Up @@ -2169,18 +2169,18 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wmi-uK-Eee">
<rect key="frame" x="31.666666666666671" y="0.0" width="127.00000000000001" height="20"/>
<subviews>
<view alpha="0.5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ssj-HI-VEv">
<view alpha="0.5" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ssj-HI-VEv">
<rect key="frame" x="2.3333333333333286" y="1.6666666666666661" width="76" height="17"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Swift 프로그래밍" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qk5-hC-CrC">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Swift 프로그래밍" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qk5-hC-CrC">
<rect key="frame" x="5" y="3.333333333333333" width="71" height="13.333333333333336"/>
<constraints>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="95" id="AL5-WL-sbA"/>
</constraints>
<fontDescription key="fontDescription" name="HGGGothicssiP60g" family="HGGGothicssi_Pro" pointSize="10.5"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12:59:59" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TZj-4u-8my">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="12:59:59" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TZj-4u-8my">
<rect key="frame" x="81" y="2.666666666666667" width="41" height="14.666666666666664"/>
<fontDescription key="fontDescription" name="HGGGothicssiP80g" family="HGGGothicssi_Pro" pointSize="12"/>
<color key="textColor" name="CCC1"/>
Expand Down
8 changes: 6 additions & 2 deletions Project_Timer/Logs/SwiftUI/ContentView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,11 @@ struct ContentView: View {
}

func height(value: Int) -> CGFloat {
return (CGFloat(value) / CGFloat(self.maxTime)) * 120
if self.maxTime == 0 {
return 0
} else {
return (CGFloat(value) / CGFloat(self.maxTime)) * 120
}
}

var maxTime: Int {
Expand All @@ -103,7 +107,7 @@ struct ContentView: View {

var averageTime: Int {
let realCount = self.DailyDatas.filter { $0.studyTime != 0 }.count
return self.weeksStudyTime / realCount
return realCount == 0 ? 0 : self.weeksStudyTime / realCount
}
}

Expand Down
4 changes: 2 additions & 2 deletions Project_Timer/Stopwatch/SetTimerViewController2.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ class SetTimerViewController2: UIViewController {

@IBAction func Button_set(_ sender: UIButton) {
//경고창 추가
let alert = UIAlertController(title:"Do you want to set it up?".localized(),message: "The Target, Sum Time will be reset and a new record starts!".localized(),preferredStyle: UIAlertController.Style.alert)
let alert = UIAlertController(title:"New Record".localized(),message: "The recording of the new date begins.".localized(),preferredStyle: UIAlertController.Style.alert)
let cancel = UIAlertAction(title: "CANCEL", style: .destructive, handler: nil)
let okAction = UIAlertAction(title: "SET", style: .default, handler: { action in
let okAction = UIAlertAction(title: "OK", style: .default, handler: { action in
self.SET_action()
})

Expand Down
1 change: 1 addition & 0 deletions Project_Timer/Stopwatch/StopwatchViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ final class StopwatchViewController: UIViewController {
self.setButtonsEnabledTrue()
self.configureViewModel()
self.bindAll()
self.viewModel?.updateTask()
}

override func viewWillAppear(_ animated: Bool) {
Expand Down
4 changes: 2 additions & 2 deletions Project_Timer/Timer/SetViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ class SetViewController: UIViewController {
}

@IBAction func SetButton(_ sender: UIButton) {
let alert = UIAlertController(title:"Do you want to set it up?".localized(),message: "The Target, Sum Time will be reset and a new record starts!".localized(),preferredStyle: UIAlertController.Style.alert)
let alert = UIAlertController(title:"New Record".localized(),message: "The recording of the new date begins.".localized(),preferredStyle: UIAlertController.Style.alert)
let cancel = UIAlertAction(title: "CANCEL", style: .destructive, handler: nil)
let okAction = UIAlertAction(title: "SET", style: .default, handler: { action in
let okAction = UIAlertAction(title: "OK", style: .default, handler: { action in
self.SET_action()
})
alert.addAction(cancel)
Expand Down
1 change: 1 addition & 0 deletions Project_Timer/Timer/TimerViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class TimerViewController: UIViewController {
self.setButtonsEnabledTrue()
self.configureViewModel()
self.bindAll()
self.viewModel?.updateTask()
}

override func viewWillAppear(_ animated: Bool) {
Expand Down
4 changes: 2 additions & 2 deletions Project_Timer/en.lproj/Localizable.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@

"Hide" = "Hide";

"Do you want to set it up?" = "Do you want to set it up?";
"New Record" = "New Record";

"The Target, Sum Time will be reset and a new record starts!" = "The Target, Sum Time will be reset and a new record starts!";
"The recording of the new date begins." = "The recording of the new date begins.";

"Study Records" = "Study Records";

Expand Down
4 changes: 2 additions & 2 deletions Project_Timer/ko.lproj/Localizable.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@

"Hide" = "숨기기";

"Do you want to set it up?" = "SET 하시겠습니까?";
"New Record" = "새로운 기록";

"The Target, Sum Time will be reset and a new record starts!" = "누적시간이 초기화되며 새로운 기록이 시작됩니다!";
"The recording of the new date begins." = "새로운 날짜의 기록이 시작됩니다.";

"Study Records" = "공부기록";

Expand Down

0 comments on commit 834a152

Please sign in to comment.