Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Styling: Edit navigation to korean #32

Merged
merged 4 commits into from
Nov 7, 2023
Merged

Styling: Edit navigation to korean #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0af8b6
Fix: fix User Manager
dydghk456 Oct 11, 2023
4d4c6f5
Styling: Edit navigation text english to korean
luke-igaw Nov 7, 2023
34d639a
Fix: Remove hard coded distance
luke-igaw Nov 7, 2023
f222b3e
Merge branch 'main' into edit-navigation-to-korean
SNURO Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions ...Android/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,7 @@ public void onClick(View v) {
View dialogView;
Button confirmButton;
boolean missionCompleted = false;
float wholeDistance = Float.valueOf((String) currentDistanceText.getText().subSequence(0,
currentDistanceText.getText().length() - 2));
float wholeDistance = Float.valueOf((String) currentDistanceText.getText().subSequence(0, currentDistanceText.getText().length() - 2));
float wholeTime = (float) Duration.between(gameStartTime, LocalDateTime.now()).getSeconds() / 60;
if (wholeDistance >= goalDistance && wholeTime / 3600 >= goalTime) {
missionCompleted = true;
Expand Down Expand Up @@ -359,9 +358,9 @@ void saveHistoryDataOnSingleMode() throws JSONException {
String startTimeString = gameStartTime.format(formatter);
String finishTimeString = LocalDateTime.now().format(formatter);
long durationInSeconds = Duration.between(gameStartTime, LocalDateTime.now()).getSeconds();
Log.d("Debug", startTimeString + finishTimeString);
distance = 5.2;
// NOTE: group_history_id에 null을 넣을 수 없어 싱글모드인 경우 -1로 관리

//NOTE: group_history_id에 null을 넣을 수 없어 싱글모드인 경우 -1로 관리

HistoryData requestData = new HistoryData(userId, (float) distance, durationInSeconds,
true, startTimeString, finishTimeString, calories, false, maxSpeed, minSpeed,
calculateMedian(speedList), speedList, -1);
Expand Down
10 changes: 5 additions & 5 deletions android/RunUsAndroid/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<resources>
<string name="app_name">RunUsAndroid</string>
<string name="title_activity_main2">MainActivity2</string>
<string name="title_home">Home</string>
<string name="title_single_mode">SingleMode</string>
<string name="title_multi_mode">MultiMode</string>
<string name="title_home">홈</string>
<string name="title_single_mode">싱글모드</string>
<string name="title_multi_mode">멀티모드</string>
<string name="title_multi_mode_wait">MultiModeWait</string>
<string name="title_multi_mode_play">MultiModePlay</string>
<string name="title_history">History</string>
<string name="title_user_setting">UserSetting</string>
<string name="title_history">히스토리</string>
<string name="title_user_setting">환경설정</string>
<string name="leaveButtonText">떠나기</string>
<string name="title_multi_mode_result" />
</resources>
Loading