From 11f40cd1a4da6c68a1227d7355550597a584ca3b Mon Sep 17 00:00:00 2001 From: GeunuKim <101039305+Gwo-O9@users.noreply.github.com> Date: Sun, 10 Dec 2023 22:08:18 +0900 Subject: [PATCH] Revert "Edit package name" --- android/RunUsAndroid/app/build.gradle | 4 +- .../runusandroid/ExampleInstrumentedTest.java | 10 +- .../runusandroid/GenderRadioButtonUiTest.java | 2 +- .../runusandroid/LoginTests.java | 9 +- .../runusandroid/MultiModeTests.java | 111 +++++++++++------- .../runusandroid/SingleModeTests.java | 92 +++++++++------ .../app/src/main/AndroidManifest.xml | 22 ++-- .../runusandroid/AccountAPIFactory.java | 11 +- .../runusandroid/AccountApi.java | 2 +- .../runusandroid/AccountData.java | 4 +- .../ActivityRecognition/RunningState.java | 2 +- .../UserActivityBroadcastReceiver.java | 3 +- .../UserActivityTransitionManager.java | 15 +-- .../runusandroid/CodeResponse.java | 3 +- .../runusandroid/EmailData.java | 2 +- .../runusandroid/ExpSystem.java | 2 +- .../runusandroid/FindIdActivity.java | 6 +- .../runusandroid/GroupHistoryData.java | 2 +- .../runusandroid/HistoryApi.java | 2 +- .../runusandroid/HistoryData.java | 2 +- .../runusandroid/HistoryDataforRendering.java | 4 +- .../runusandroid/IdValidationData.java | 2 +- .../runusandroid/ImageResponse.java | 4 +- .../runusandroid/JsonPlaceHolderAPI.java | 2 +- .../runusandroid/LoginActivity.java | 13 +- .../runusandroid/MainActivity.java | 2 +- .../runusandroid/MainActivity2.java | 19 +-- .../runusandroid/PermissionSupport.java | 37 +++--- .../{runus => example}/runusandroid/Post.java | 7 +- .../runusandroid/RefreshTokenData.java | 4 +- .../runusandroid/ResetPasswordActivity1.java | 6 +- .../runusandroid/ResetPasswordActivity2.java | 6 +- .../runusandroid/ResetPasswordData.java | 2 +- .../runusandroid/RetrofitClient.java | 2 +- .../runusandroid/SendMailData.java | 2 +- .../runusandroid/SignUpData.java | 2 +- .../runusandroid/SignUpStep1Activity.java | 14 +-- .../runusandroid/SignUpStep2Activity.java | 10 +- .../runusandroid/SignUpStep3Activity.java | 6 +- .../runusandroid/UserProfileResponse.java | 2 +- .../ui/history/HistoryFragment.java | 12 +- .../ui/history/HistoryViewModel.java | 2 +- .../runusandroid/ui/home/HomeFragment.java | 12 +- .../runusandroid/ui/home/HomePageAdapter.java | 4 +- .../runusandroid/ui/home/HomeViewModel.java | 2 +- .../multi_mode/BackGroundSocketService.java | 11 +- .../ui/multi_mode/MultiModeAdapter.java | 4 +- .../ui/multi_mode/MultiModeFragment.java | 14 ++- .../ui/multi_mode/MultiModePlayFragment.java | 22 ++-- .../ui/multi_mode/MultiModeRecordAdapter.java | 4 +- .../multi_mode/MultiModeResultFragment.java | 14 +-- .../ui/multi_mode/MultiModeViewModel.java | 2 +- .../ui/multi_mode/MultiModeWaitFragment.java | 12 +- .../ui/multi_mode/RecordDialog.java | 4 +- .../ui/multi_mode/RecordItem.java | 2 +- .../multi_mode/RoomCreateModalFragment.java | 2 +- .../ui/multi_mode/SocketListenerThread.java | 4 +- .../ui/multi_mode/SocketManager.java | 2 +- .../BackGroundLocationService.java | 2 +- .../ui/single_mode/SingleModeFragment.java | 32 ++--- .../ui/single_mode/SingleModeMainUI.java | 2 +- .../single_mode/SingleModeResultFragment.java | 14 +-- .../ui/single_mode/SingleModeUiState.java | 2 +- .../ui/single_mode/SingleModeViewModel.java | 2 +- .../ui/user_setting/CreditDialog.java | 4 +- .../ui/user_setting/UserSettingFragment.java | 26 ++-- .../ui/user_setting/UserSettingViewModel.java | 2 +- .../src/main/res/layout/activity_find_id.xml | 2 +- .../src/main/res/layout/activity_login.xml | 10 +- .../app/src/main/res/layout/activity_main.xml | 11 +- .../res/layout/activity_sign_up_step1.xml | 12 +- .../res/layout/activity_sign_up_step2.xml | 10 +- .../res/layout/activity_sign_up_step3.xml | 11 +- .../src/main/res/layout/fragment_history.xml | 2 +- .../app/src/main/res/layout/fragment_home.xml | 2 +- .../main/res/layout/fragment_multi_mode.xml | 2 +- .../res/layout/fragment_multi_room_wait.xml | 2 +- .../main/res/layout/fragment_single_mode.xml | 2 +- .../layout/fragment_single_mode_result.xml | 2 +- .../main/res/layout/fragment_user_setting.xml | 2 +- .../main/res/navigation/mobile_navigation.xml | 18 +-- .../runusandroid/ExampleUnitTest.java | 2 +- .../runusandroid/ExpSystemUnitTest.java | 2 +- .../MultiModePlayFragmentUnitTest.java | 6 +- .../MultiModeResultFragmentUnitTest.java | 0 .../MultiModeWaitFragmentUnitTest.java | 4 +- .../single_mode/SingleModeFragmentTest.java | 18 +-- 87 files changed, 423 insertions(+), 364 deletions(-) rename android/RunUsAndroid/app/src/androidTest/java/com/{runus => example}/runusandroid/ExampleInstrumentedTest.java (79%) rename android/RunUsAndroid/app/src/androidTest/java/com/{runus => example}/runusandroid/GenderRadioButtonUiTest.java (97%) rename android/RunUsAndroid/app/src/androidTest/java/com/{runus => example}/runusandroid/LoginTests.java (95%) rename android/RunUsAndroid/app/src/androidTest/java/com/{runus => example}/runusandroid/MultiModeTests.java (86%) rename android/RunUsAndroid/app/src/androidTest/java/com/{runus => example}/runusandroid/SingleModeTests.java (91%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/AccountAPIFactory.java (91%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/AccountApi.java (97%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/AccountData.java (76%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ActivityRecognition/RunningState.java (93%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ActivityRecognition/UserActivityBroadcastReceiver.java (95%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ActivityRecognition/UserActivityTransitionManager.java (92%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/CodeResponse.java (84%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/EmailData.java (79%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ExpSystem.java (99%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/FindIdActivity.java (95%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/GroupHistoryData.java (98%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/HistoryApi.java (96%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/HistoryData.java (98%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/HistoryDataforRendering.java (97%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/IdValidationData.java (87%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ImageResponse.java (90%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/JsonPlaceHolderAPI.java (83%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/LoginActivity.java (95%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/MainActivity.java (96%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/MainActivity2.java (95%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/PermissionSupport.java (80%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/Post.java (57%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/RefreshTokenData.java (70%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ResetPasswordActivity1.java (96%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ResetPasswordActivity2.java (96%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ResetPasswordData.java (95%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/RetrofitClient.java (98%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/SendMailData.java (93%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/SignUpData.java (97%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/SignUpStep1Activity.java (94%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/SignUpStep2Activity.java (93%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/SignUpStep3Activity.java (97%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/UserProfileResponse.java (92%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/history/HistoryFragment.java (96%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/history/HistoryViewModel.java (83%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/home/HomeFragment.java (95%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/home/HomePageAdapter.java (93%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/home/HomeViewModel.java (90%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/multi_mode/BackGroundSocketService.java (86%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/multi_mode/MultiModeAdapter.java (98%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/multi_mode/MultiModeFragment.java (97%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/multi_mode/MultiModePlayFragment.java (98%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/multi_mode/MultiModeRecordAdapter.java (96%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/multi_mode/MultiModeResultFragment.java (98%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/multi_mode/MultiModeViewModel.java (89%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/multi_mode/MultiModeWaitFragment.java (98%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/multi_mode/RecordDialog.java (95%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/multi_mode/RecordItem.java (88%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/multi_mode/RoomCreateModalFragment.java (95%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/multi_mode/SocketListenerThread.java (99%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/multi_mode/SocketManager.java (97%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/single_mode/BackGroundLocationService.java (98%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/single_mode/SingleModeFragment.java (98%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/single_mode/SingleModeMainUI.java (96%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/single_mode/SingleModeResultFragment.java (97%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/single_mode/SingleModeUiState.java (91%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/single_mode/SingleModeViewModel.java (89%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/user_setting/CreditDialog.java (97%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/user_setting/UserSettingFragment.java (95%) rename android/RunUsAndroid/app/src/main/java/com/{runus => example}/runusandroid/ui/user_setting/UserSettingViewModel.java (91%) rename android/RunUsAndroid/app/src/test/java/com/{runus => example}/runusandroid/ExampleUnitTest.java (91%) rename android/RunUsAndroid/app/src/test/java/com/{runus => example}/runusandroid/ExpSystemUnitTest.java (96%) rename android/RunUsAndroid/app/src/test/java/com/{runus => example}/runusandroid/MultiModePlayFragmentUnitTest.java (97%) rename android/RunUsAndroid/app/src/test/java/com/{runus => example}/runusandroid/MultiModeResultFragmentUnitTest.java (100%) rename android/RunUsAndroid/app/src/test/java/com/{runus => example}/runusandroid/MultiModeWaitFragmentUnitTest.java (95%) rename android/RunUsAndroid/app/src/test/java/com/{runus => example}/runusandroid/ui/single_mode/SingleModeFragmentTest.java (92%) diff --git a/android/RunUsAndroid/app/build.gradle b/android/RunUsAndroid/app/build.gradle index 439d6380..63c17a5d 100644 --- a/android/RunUsAndroid/app/build.gradle +++ b/android/RunUsAndroid/app/build.gradle @@ -12,11 +12,11 @@ apply plugin: 'checkstyle' android { - namespace 'com.runus.runusandroid' + namespace 'com.example.runusandroid' compileSdk 34 defaultConfig { - applicationId "com.runus.runusandroid" + applicationId "com.example.runusandroid" minSdk 26 targetSdk 33 versionCode 1 diff --git a/android/RunUsAndroid/app/src/androidTest/java/com/runus/runusandroid/ExampleInstrumentedTest.java b/android/RunUsAndroid/app/src/androidTest/java/com/example/runusandroid/ExampleInstrumentedTest.java similarity index 79% rename from android/RunUsAndroid/app/src/androidTest/java/com/runus/runusandroid/ExampleInstrumentedTest.java rename to android/RunUsAndroid/app/src/androidTest/java/com/example/runusandroid/ExampleInstrumentedTest.java index 68d86082..0ef054b3 100644 --- a/android/RunUsAndroid/app/src/androidTest/java/com/runus/runusandroid/ExampleInstrumentedTest.java +++ b/android/RunUsAndroid/app/src/androidTest/java/com/example/runusandroid/ExampleInstrumentedTest.java @@ -1,15 +1,15 @@ -package com.runus.runusandroid; - -import static org.junit.Assert.assertEquals; +package com.example.runusandroid; import android.content.Context; -import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; +import static org.junit.Assert.*; + /** * Instrumented test, which will execute on an Android device. * @@ -21,6 +21,6 @@ public class ExampleInstrumentedTest { public void useAppContext() { // Context of the app under test. Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("com.runus.runusandroid", appContext.getPackageName()); + assertEquals("com.example.runusandroid", appContext.getPackageName()); } } \ No newline at end of file diff --git a/android/RunUsAndroid/app/src/androidTest/java/com/runus/runusandroid/GenderRadioButtonUiTest.java b/android/RunUsAndroid/app/src/androidTest/java/com/example/runusandroid/GenderRadioButtonUiTest.java similarity index 97% rename from android/RunUsAndroid/app/src/androidTest/java/com/runus/runusandroid/GenderRadioButtonUiTest.java rename to android/RunUsAndroid/app/src/androidTest/java/com/example/runusandroid/GenderRadioButtonUiTest.java index 5f137cc0..133d1d63 100644 --- a/android/RunUsAndroid/app/src/androidTest/java/com/runus/runusandroid/GenderRadioButtonUiTest.java +++ b/android/RunUsAndroid/app/src/androidTest/java/com/example/runusandroid/GenderRadioButtonUiTest.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import static org.junit.Assert.assertEquals; diff --git a/android/RunUsAndroid/app/src/androidTest/java/com/runus/runusandroid/LoginTests.java b/android/RunUsAndroid/app/src/androidTest/java/com/example/runusandroid/LoginTests.java similarity index 95% rename from android/RunUsAndroid/app/src/androidTest/java/com/runus/runusandroid/LoginTests.java rename to android/RunUsAndroid/app/src/androidTest/java/com/example/runusandroid/LoginTests.java index 9dc384e8..b4096360 100644 --- a/android/RunUsAndroid/app/src/androidTest/java/com/runus/runusandroid/LoginTests.java +++ b/android/RunUsAndroid/app/src/androidTest/java/com/example/runusandroid/LoginTests.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.action.ViewActions.click; @@ -9,11 +9,12 @@ import static androidx.test.espresso.matcher.ViewMatchers.withId; import androidx.test.core.app.ActivityScenario; -import androidx.test.espresso.matcher.ViewMatchers; +import androidx.test.espresso.contrib.NavigationViewActions; import androidx.test.ext.junit.rules.ActivityScenarioRule; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.rule.GrantPermissionRule; +import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; @@ -45,10 +46,10 @@ public class LoginTests { public GrantPermissionRule permissionPostNotification = GrantPermissionRule.grant(android.Manifest.permission.POST_NOTIFICATIONS); @BeforeClass - public static void beforeClass() throws InterruptedException { + public static void beforeClass() throws InterruptedException{ Thread.sleep(1000); loginActivityScenario = ActivityScenario.launch(LoginActivity.class); - onView(ViewMatchers.withId(R.id.IdInput)) + onView(withId(R.id.IdInput)) .perform(typeText("test"), closeSoftKeyboard()); onView(withId(R.id.PasswordInput)) .perform(typeText("test"), closeSoftKeyboard()); diff --git a/android/RunUsAndroid/app/src/androidTest/java/com/runus/runusandroid/MultiModeTests.java b/android/RunUsAndroid/app/src/androidTest/java/com/example/runusandroid/MultiModeTests.java similarity index 86% rename from android/RunUsAndroid/app/src/androidTest/java/com/runus/runusandroid/MultiModeTests.java rename to android/RunUsAndroid/app/src/androidTest/java/com/example/runusandroid/MultiModeTests.java index 9f11cbb8..aa8399a4 100644 --- a/android/RunUsAndroid/app/src/androidTest/java/com/runus/runusandroid/MultiModeTests.java +++ b/android/RunUsAndroid/app/src/androidTest/java/com/example/runusandroid/MultiModeTests.java @@ -1,44 +1,64 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.action.ViewActions.actionWithAssertions; import static androidx.test.espresso.action.ViewActions.clearText; import static androidx.test.espresso.action.ViewActions.click; import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard; +import static androidx.test.espresso.action.ViewActions.pressBack; import static androidx.test.espresso.action.ViewActions.replaceText; import static androidx.test.espresso.action.ViewActions.typeText; import static androidx.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.contrib.PickerActions.setTime; import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom; import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.isRoot; import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withParent; import static androidx.test.espresso.matcher.ViewMatchers.withText; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.not; + +import static org.hamcrest.Matchers.allOf; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; +import android.app.PendingIntent; +import android.content.Intent; import android.icu.util.Calendar; import android.util.Log; import android.view.InputDevice; import android.view.MotionEvent; import android.view.View; +import android.widget.NumberPicker; import android.widget.TextView; import android.widget.TimePicker; import androidx.test.core.app.ActivityScenario; import androidx.test.espresso.UiController; import androidx.test.espresso.ViewAction; +import androidx.test.espresso.ViewInteraction; import androidx.test.espresso.action.GeneralClickAction; import androidx.test.espresso.action.GeneralLocation; import androidx.test.espresso.action.GeneralSwipeAction; import androidx.test.espresso.action.Press; import androidx.test.espresso.action.Swipe; import androidx.test.espresso.action.Tap; -import androidx.test.espresso.matcher.ViewMatchers; +import androidx.test.espresso.action.ViewActions; +import androidx.test.espresso.contrib.NavigationViewActions; +import androidx.test.espresso.contrib.PickerActions; +import androidx.test.ext.junit.rules.ActivityScenarioRule; import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.rule.ActivityTestRule; import androidx.test.rule.GrantPermissionRule; +import com.example.runusandroid.ActivityRecognition.UserActivityBroadcastReceiver; +import com.example.runusandroid.ActivityRecognition.UserActivityTransitionManager; +import com.google.android.gms.location.LocationServices; + import org.hamcrest.Matcher; import org.junit.After; import org.junit.Before; @@ -50,12 +70,6 @@ @RunWith(AndroidJUnit4.class) public class MultiModeTests { public static ActivityScenario loginActivityScenario; - private final ViewAction clickTopCentre = actionWithAssertions(new GeneralClickAction( - Tap.SINGLE, GeneralLocation.TOP_CENTER, Press.FINGER, InputDevice.SOURCE_UNKNOWN, MotionEvent.BUTTON_PRIMARY)); - private final ViewAction clickBottomCentre = actionWithAssertions(new GeneralClickAction( - Tap.SINGLE, GeneralLocation.BOTTOM_CENTER, Press.FINGER, InputDevice.SOURCE_UNKNOWN, MotionEvent.BUTTON_PRIMARY)); - private final ViewAction swipeDown = actionWithAssertions(new GeneralSwipeAction( - Swipe.FAST, GeneralLocation.VISIBLE_CENTER, GeneralLocation.BOTTOM_CENTER, Press.FINGER)); public ActivityScenario mainActivityScenario; @Rule public GrantPermissionRule permissionInternet = GrantPermissionRule.grant(android.Manifest.permission.INTERNET); @@ -69,20 +83,28 @@ public class MultiModeTests { public GrantPermissionRule permissionFineLocation = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION); @Rule public GrantPermissionRule permissionBackgroundLocation = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_BACKGROUND_LOCATION); -// @Rule -// public ActivityScenarioRule mActivityRule = -// new ActivityScenarioRule<>(MainActivity2.class); @Rule public GrantPermissionRule permissionReadStorage = GrantPermissionRule.grant(android.Manifest.permission.READ_EXTERNAL_STORAGE); @Rule public GrantPermissionRule permissionWriteStorage = GrantPermissionRule.grant(android.Manifest.permission.WRITE_EXTERNAL_STORAGE); @Rule public GrantPermissionRule permissionPostNotification = GrantPermissionRule.grant(android.Manifest.permission.POST_NOTIFICATIONS); +// @Rule +// public ActivityScenarioRule mActivityRule = +// new ActivityScenarioRule<>(MainActivity2.class); + + private ViewAction clickTopCentre = actionWithAssertions(new GeneralClickAction( + Tap.SINGLE, GeneralLocation.TOP_CENTER, Press.FINGER, InputDevice.SOURCE_UNKNOWN, MotionEvent.BUTTON_PRIMARY)); + private ViewAction clickBottomCentre = actionWithAssertions(new GeneralClickAction( + Tap.SINGLE, GeneralLocation.BOTTOM_CENTER, Press.FINGER, InputDevice.SOURCE_UNKNOWN, MotionEvent.BUTTON_PRIMARY)); + private ViewAction swipeDown = actionWithAssertions(new GeneralSwipeAction( + Swipe.FAST, GeneralLocation.VISIBLE_CENTER, GeneralLocation.BOTTOM_CENTER, Press.FINGER)); + @BeforeClass - public static void beforeClass() throws InterruptedException { + public static void beforeClass() throws InterruptedException{ loginActivityScenario = ActivityScenario.launch(LoginActivity.class); - onView(ViewMatchers.withId(R.id.IdInput)) + onView(withId(R.id.IdInput)) .perform(typeText("test"), closeSoftKeyboard()); onView(withId(R.id.PasswordInput)) .perform(typeText("test"), closeSoftKeyboard()); @@ -91,36 +113,6 @@ public static void beforeClass() throws InterruptedException { Thread.sleep(1000); } - public static String getText(final Matcher matcher) { - try { - final String[] stringHolder = {null}; - onView(matcher).perform(new ViewAction() { - @Override - public Matcher getConstraints() { - return isAssignableFrom(TextView.class); - } - - @Override - public String getDescription() { - return "get text"; - } - - @Override - public void perform(UiController uiController, View view) { - TextView tv = (TextView) view; - stringHolder[0] = tv.getText().toString(); - } - }); - if (stringHolder[0] == null || stringHolder[0] == "") { - fail("no text found"); - } - return stringHolder[0]; - } catch (Exception e) { - fail("null found"); - return null; - } - - } @Before public void before() { @@ -151,7 +143,7 @@ public void roomCreation_play() throws InterruptedException { Thread.sleep(1000); onView(withId(R.id.dailyTime)).check(matches(not(withText("")))); firstHistoryTime = getText(withId(R.id.dailyTime)); - Log.d("History_log_test", "firstHistoryTime: " + firstHistoryTime); + Log.d("History_log_test","firstHistoryTime: " + firstHistoryTime); assertNotNull(firstHistoryTime); mainActivityScenario.onActivity(activity -> { activity.navController.navigate(R.id.navigation_multi_mode); @@ -196,6 +188,37 @@ public void roomCreation_play() throws InterruptedException { } + public static String getText(final Matcher matcher) { + try { + final String[] stringHolder = {null}; + onView(matcher).perform(new ViewAction() { + @Override + public Matcher getConstraints() { + return isAssignableFrom(TextView.class); + } + + @Override + public String getDescription() { + return "get text"; + } + + @Override + public void perform(UiController uiController, View view) { + TextView tv = (TextView) view; + stringHolder[0] = tv.getText().toString(); + } + }); + if (stringHolder[0] == null || stringHolder[0] == "") { + fail("no text found"); + } + return stringHolder[0]; + } catch (Exception e) { + fail("null found"); + return null; + } + + } + } diff --git a/android/RunUsAndroid/app/src/androidTest/java/com/runus/runusandroid/SingleModeTests.java b/android/RunUsAndroid/app/src/androidTest/java/com/example/runusandroid/SingleModeTests.java similarity index 91% rename from android/RunUsAndroid/app/src/androidTest/java/com/runus/runusandroid/SingleModeTests.java rename to android/RunUsAndroid/app/src/androidTest/java/com/example/runusandroid/SingleModeTests.java index db8911e8..bc9ea3b0 100644 --- a/android/RunUsAndroid/app/src/androidTest/java/com/runus/runusandroid/SingleModeTests.java +++ b/android/RunUsAndroid/app/src/androidTest/java/com/example/runusandroid/SingleModeTests.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.action.ViewActions.click; @@ -7,18 +7,26 @@ import static androidx.test.espresso.action.ViewActions.typeText; import static androidx.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom; +import static org.hamcrest.Matchers.allOf; import static androidx.test.espresso.matcher.ViewMatchers.isClickable; import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; import static androidx.test.espresso.matcher.ViewMatchers.isEnabled; import static androidx.test.espresso.matcher.ViewMatchers.isRoot; import static androidx.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withText; -import static org.hamcrest.Matchers.allOf; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static java.util.EnumSet.allOf; + +import android.app.PendingIntent; +import android.content.Intent; import android.util.Log; import android.view.View; import android.widget.TextView; @@ -26,10 +34,17 @@ import androidx.test.core.app.ActivityScenario; import androidx.test.espresso.UiController; import androidx.test.espresso.ViewAction; +import androidx.test.espresso.contrib.NavigationViewActions; import androidx.test.espresso.matcher.ViewMatchers; +import androidx.test.ext.junit.rules.ActivityScenarioRule; import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.rule.ActivityTestRule; import androidx.test.rule.GrantPermissionRule; +import com.example.runusandroid.ActivityRecognition.UserActivityBroadcastReceiver; +import com.example.runusandroid.ActivityRecognition.UserActivityTransitionManager; +import com.google.android.gms.location.LocationServices; + import org.hamcrest.Matcher; import org.junit.After; import org.junit.Before; @@ -66,9 +81,9 @@ public class SingleModeTests { @BeforeClass - public static void beforeClass() throws InterruptedException { + public static void beforeClass() throws InterruptedException{ loginActivityScenario = ActivityScenario.launch(LoginActivity.class); - onView(ViewMatchers.withId(R.id.IdInput)) + onView(withId(R.id.IdInput)) .perform(typeText("test"), closeSoftKeyboard()); onView(withId(R.id.PasswordInput)) .perform(typeText("test"), closeSoftKeyboard()); @@ -77,37 +92,6 @@ public static void beforeClass() throws InterruptedException { Thread.sleep(1000); } - // helper function to extract text content from viewInteraction - public static String getText(final Matcher matcher) { - try { - final String[] stringHolder = {null}; - onView(matcher).perform(new ViewAction() { - @Override - public Matcher getConstraints() { - return isAssignableFrom(TextView.class); - } - - @Override - public String getDescription() { - return "get text"; - } - - @Override - public void perform(UiController uiController, View view) { - TextView tv = (TextView) view; - stringHolder[0] = tv.getText().toString(); - } - }); - if (stringHolder[0] == null || stringHolder[0] == "") { - fail("no text found"); - } - return stringHolder[0]; - } catch (Exception e) { - fail("null found"); - return null; - } - - } @Before public void before() { @@ -172,7 +156,7 @@ public void playing() throws InterruptedException { Thread.sleep(20000); onView(withId(R.id.dailyTime)).check(matches(not(withText("")))); firstHistoryTime = getText(withId(R.id.dailyTime)); - Log.d("History_log_test", "firstHistoryTime: " + firstHistoryTime); + Log.d("History_log_test","firstHistoryTime: " + firstHistoryTime); assertNotNull(firstHistoryTime); mainActivityScenario.onActivity(activity -> { activity.navController.navigate(R.id.navigation_single_mode); @@ -197,11 +181,11 @@ public void playing() throws InterruptedException { onView(withId(R.id.buttonConfirmClose)).check(matches(isDisplayed())); onView(withId(R.id.buttonConfirmClose)).perform(click()); Thread.sleep(1000); - onView(anyOf(withId(R.id.buttonConfirmFailure), withId(R.id.buttonConfirm))).perform(click()); + onView(anyOf(withId(R.id.buttonConfirmFailure),withId(R.id.buttonConfirm))).perform(click()); Thread.sleep(1000); // 종료시 레벨업할수도 있음 - try { + try{ onView(withText("레벨 업!")).check(matches(isDisplayed())); onView(withId(R.id.buttonConfirm)).perform(click()); } catch (Exception e) { @@ -222,4 +206,36 @@ public void playing() throws InterruptedException { onView(withId(R.id.dailyTime)).check(matches(not(withText(firstHistoryTime)))); } + // helper function to extract text content from viewInteraction + public static String getText(final Matcher matcher) { + try { + final String[] stringHolder = {null}; + onView(matcher).perform(new ViewAction() { + @Override + public Matcher getConstraints() { + return isAssignableFrom(TextView.class); + } + + @Override + public String getDescription() { + return "get text"; + } + + @Override + public void perform(UiController uiController, View view) { + TextView tv = (TextView) view; + stringHolder[0] = tv.getText().toString(); + } + }); + if (stringHolder[0] == null || stringHolder[0] == "") { + fail("no text found"); + } + return stringHolder[0]; + } catch (Exception e) { + fail("null found"); + return null; + } + + } + } diff --git a/android/RunUsAndroid/app/src/main/AndroidManifest.xml b/android/RunUsAndroid/app/src/main/AndroidManifest.xml index 744e39c9..2d16e71f 100644 --- a/android/RunUsAndroid/app/src/main/AndroidManifest.xml +++ b/android/RunUsAndroid/app/src/main/AndroidManifest.xml @@ -29,7 +29,7 @@ android:usesCleartextTraffic="true" tools:targetApi="31"> @@ -39,40 +39,40 @@ = Build.VERSION_CODES.Q) { + if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { if (ActivityCompat.checkSelfPermission(context, android.Manifest.permission.ACTIVITY_RECOGNITION) != PackageManager.PERMISSION_GRANTED) { //Toast.makeText(context, "permission not granted", Toast.LENGTH_LONG).show(); @@ -79,7 +80,7 @@ public void registerActivityTransitions(PendingIntent pendingIntent) { } public void removeActivityTransitions(PendingIntent pendingIntent) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { if (ActivityCompat.checkSelfPermission(context, android.Manifest.permission.ACTIVITY_RECOGNITION) != PackageManager.PERMISSION_GRANTED) { //Toast.makeText(context, "permission not granted", Toast.LENGTH_LONG).show(); @@ -88,10 +89,10 @@ public void removeActivityTransitions(PendingIntent pendingIntent) { } Task task = activityClient.removeActivityTransitionUpdates(pendingIntent); task.addOnSuccessListener( - result -> Log.d("ActivityTransition", "remove success") + result -> Log.d("ActivityTransition","remove success") ); task.addOnFailureListener( - e -> Log.d("ActivityTransition", "remove failed") + e -> Log.d("ActivityTransition","remove failed") ); } } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/CodeResponse.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/CodeResponse.java similarity index 84% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/CodeResponse.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/CodeResponse.java index 5b906292..0a96ec78 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/CodeResponse.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/CodeResponse.java @@ -1,11 +1,10 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import com.google.gson.annotations.SerializedName; public class CodeResponse { @SerializedName("code") private int code; - public int getCode() { return code; } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/EmailData.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/EmailData.java similarity index 79% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/EmailData.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/EmailData.java index c40e81dd..d677e742 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/EmailData.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/EmailData.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; public class EmailData { private final String email; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ExpSystem.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ExpSystem.java similarity index 99% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ExpSystem.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ExpSystem.java index 2acefda3..c650e90e 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ExpSystem.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ExpSystem.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import android.util.Log; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/FindIdActivity.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/FindIdActivity.java similarity index 95% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/FindIdActivity.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/FindIdActivity.java index b3f273ff..7abddc2e 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/FindIdActivity.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/FindIdActivity.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import android.app.AlertDialog; import android.content.Context; @@ -110,12 +110,12 @@ public void onFailure(Call call, Throwable t) { public boolean dispatchTouchEvent(MotionEvent ev) { View view = getCurrentFocus(); if (view != null && (ev.getAction() == MotionEvent.ACTION_UP || ev.getAction() == MotionEvent.ACTION_MOVE) && view instanceof EditText && !view.getClass().getName().startsWith("android.webkit.")) { - int[] scrcoords = new int[2]; + int scrcoords[] = new int[2]; view.getLocationOnScreen(scrcoords); float x = ev.getRawX() + view.getLeft() - scrcoords[0]; float y = ev.getRawY() + view.getTop() - scrcoords[1]; if (x < view.getLeft() || x > view.getRight() || y < view.getTop() || y > view.getBottom()) - ((InputMethodManager) this.getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow((this.getWindow().getDecorView().getApplicationWindowToken()), 0); + ((InputMethodManager)this.getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow((this.getWindow().getDecorView().getApplicationWindowToken()), 0); } return super.dispatchTouchEvent(ev); } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/GroupHistoryData.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/GroupHistoryData.java similarity index 98% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/GroupHistoryData.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/GroupHistoryData.java index 53522c1c..318d147b 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/GroupHistoryData.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/GroupHistoryData.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import com.google.gson.annotations.SerializedName; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/HistoryApi.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/HistoryApi.java similarity index 96% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/HistoryApi.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/HistoryApi.java index 4166df26..16577bdd 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/HistoryApi.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/HistoryApi.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import okhttp3.ResponseBody; import retrofit2.Call; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/HistoryData.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/HistoryData.java similarity index 98% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/HistoryData.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/HistoryData.java index 37239020..cdd50128 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/HistoryData.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/HistoryData.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import com.google.gson.Gson; import com.google.gson.annotations.SerializedName; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/HistoryDataforRendering.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/HistoryDataforRendering.java similarity index 97% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/HistoryDataforRendering.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/HistoryDataforRendering.java index 483b8b76..c2944bb8 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/HistoryDataforRendering.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/HistoryDataforRendering.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import com.google.gson.annotations.SerializedName; @@ -45,7 +45,7 @@ public static class DailyData { private float distance; private String time; private float calories; - + public String getDate() { return date; } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/IdValidationData.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/IdValidationData.java similarity index 87% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/IdValidationData.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/IdValidationData.java index 66a74ff2..7cbacd63 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/IdValidationData.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/IdValidationData.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import com.google.gson.annotations.SerializedName; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ImageResponse.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ImageResponse.java similarity index 90% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ImageResponse.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ImageResponse.java index 5039a63e..eb71d0e8 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ImageResponse.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ImageResponse.java @@ -1,9 +1,9 @@ -package com.runus.runusandroid; +package com.example.runusandroid; public class ImageResponse { private String message; private String imageUrl; - + public String getMessage() { return message; } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/JsonPlaceHolderAPI.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/JsonPlaceHolderAPI.java similarity index 83% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/JsonPlaceHolderAPI.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/JsonPlaceHolderAPI.java index 97f0ebcd..066ccbba 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/JsonPlaceHolderAPI.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/JsonPlaceHolderAPI.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import java.util.List; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/LoginActivity.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/LoginActivity.java similarity index 95% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/LoginActivity.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/LoginActivity.java index 7cc16a05..9817c1c9 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/LoginActivity.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/LoginActivity.java @@ -1,4 +1,7 @@ -package com.runus.runusandroid; +package com.example.runusandroid; + +import static com.example.runusandroid.RetrofitClient.resetAuthToken; +import static com.example.runusandroid.RetrofitClient.setAuthToken; import android.content.Context; import android.content.Intent; @@ -120,7 +123,7 @@ public void updateDrawState(TextPaint ds) { } }; - RetrofitClient.resetAuthToken(); + resetAuthToken(); // '비밀번호 찾기' 부분에 클릭 이벤트 추가 String linkText = "비밀번호 찾기"; @@ -173,7 +176,7 @@ public void onResponse(Call call, Response response) String refreshToken = responseBody.getJSONObject("jwt_token") .getString("refresh_token"); - RetrofitClient.setAuthToken(token); + setAuthToken(token); // 로그인 성공 시 SharePreferences에 유저 정보 및 토큰 저장 SharedPreferences sharedPreferences = getSharedPreferences("user_prefs", MODE_PRIVATE); SharedPreferences.Editor editor = sharedPreferences.edit(); @@ -220,12 +223,12 @@ public void onFailure(Call call, Throwable t) { public boolean dispatchTouchEvent(MotionEvent ev) { View view = getCurrentFocus(); if (view != null && (ev.getAction() == MotionEvent.ACTION_UP || ev.getAction() == MotionEvent.ACTION_MOVE) && view instanceof EditText && !view.getClass().getName().startsWith("android.webkit.")) { - int[] scrcoords = new int[2]; + int scrcoords[] = new int[2]; view.getLocationOnScreen(scrcoords); float x = ev.getRawX() + view.getLeft() - scrcoords[0]; float y = ev.getRawY() + view.getTop() - scrcoords[1]; if (x < view.getLeft() || x > view.getRight() || y < view.getTop() || y > view.getBottom()) - ((InputMethodManager) this.getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow((this.getWindow().getDecorView().getApplicationWindowToken()), 0); + ((InputMethodManager)this.getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow((this.getWindow().getDecorView().getApplicationWindowToken()), 0); } return super.dispatchTouchEvent(ev); } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/MainActivity.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/MainActivity.java similarity index 96% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/MainActivity.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/MainActivity.java index af010c7c..348c0850 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/MainActivity.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/MainActivity.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import android.content.Intent; import android.os.Bundle; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/MainActivity2.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/MainActivity2.java similarity index 95% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/MainActivity2.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/MainActivity2.java index d850ce05..ea9c270f 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/MainActivity2.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/MainActivity2.java @@ -1,10 +1,11 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import android.Manifest; import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; +import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; @@ -14,6 +15,10 @@ import android.os.Build; import android.os.Bundle; import android.util.Log; +import android.view.MotionEvent; +import android.view.View; +import android.view.inputmethod.InputMethodManager; +import android.widget.EditText; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; @@ -23,14 +28,14 @@ import androidx.navigation.Navigation; import androidx.navigation.ui.NavigationUI; +import com.example.runusandroid.ActivityRecognition.UserActivityBroadcastReceiver; +import com.example.runusandroid.ActivityRecognition.UserActivityTransitionManager; +import com.example.runusandroid.databinding.ActivityMain2Binding; +import com.example.runusandroid.ui.multi_mode.BackGroundSocketService; +import com.example.runusandroid.ui.multi_mode.SocketManager; import com.google.android.gms.location.FusedLocationProviderClient; import com.google.android.gms.location.LocationServices; import com.google.android.material.bottomnavigation.BottomNavigationView; -import com.runus.runusandroid.ActivityRecognition.UserActivityBroadcastReceiver; -import com.runus.runusandroid.ActivityRecognition.UserActivityTransitionManager; -import com.runus.runusandroid.databinding.ActivityMain2Binding; -import com.runus.runusandroid.ui.multi_mode.BackGroundSocketService; -import com.runus.runusandroid.ui.multi_mode.SocketManager; import java.io.IOException; @@ -42,7 +47,6 @@ public class MainActivity2 extends AppCompatActivity { private final SocketManager socketManager = SocketManager.getInstance(); public UserActivityBroadcastReceiver activityReceiver; public NavController navController; - public Location initialLocation; UserActivityTransitionManager activityManager; PendingIntent pendingIntent; IntentFilter filter; @@ -50,6 +54,7 @@ public class MainActivity2 extends AppCompatActivity { private ActivityMain2Binding binding; private FusedLocationProviderClient fusedLocationClient; private PermissionSupport permission; + public Location initialLocation; @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/PermissionSupport.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/PermissionSupport.java similarity index 80% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/PermissionSupport.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/PermissionSupport.java index db555a89..606f1dab 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/PermissionSupport.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/PermissionSupport.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import android.Manifest; import android.app.Activity; @@ -14,13 +14,11 @@ public class PermissionSupport { - //권한 요청시 발생하는 창에 대한 결과값을 받기 위해 지정해주는 int 형 - //원하는 임의의 숫자 지정 - private final int MULTIPLE_PERMISSIONS = 1023; //요청에 대한 결과값 확인을 위해 RequestCode를 final로 정의 - private final Context context; - private final Activity activity; + private Context context; + private Activity activity; + //요청할 권한 배열 저장 - private final String[] permissions = { + private String[] permissions = { Manifest.permission.ACTIVITY_RECOGNITION, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, @@ -29,8 +27,12 @@ public class PermissionSupport { }; private List permissionList; + //권한 요청시 발생하는 창에 대한 결과값을 받기 위해 지정해주는 int 형 + //원하는 임의의 숫자 지정 + private final int MULTIPLE_PERMISSIONS = 1023; //요청에 대한 결과값 확인을 위해 RequestCode를 final로 정의 + //생성자에서 Activity와 Context를 파라미터로 받아 - public PermissionSupport(Activity _activity, Context _context) { + public PermissionSupport(Activity _activity, Context _context){ this.activity = _activity; this.context = _context; } @@ -40,29 +42,32 @@ public boolean checkPermission() { int result; permissionList = new ArrayList<>(); - for (String pm : permissions) { + for(String pm : permissions){ result = ContextCompat.checkSelfPermission(context, pm); - if (result != PackageManager.PERMISSION_GRANTED) { + if(result != PackageManager.PERMISSION_GRANTED){ permissionList.add(pm); } } - return permissionList.isEmpty(); + if(!permissionList.isEmpty()){ + return false; + } + return true; } //배열로 선언한 권한에 대해 사용자에게 허용 요청 - public void requestPermission() { + public void requestPermission(){ ActivityCompat.requestPermissions(activity, (String[]) permissionList.toArray(new String[permissionList.size()]), MULTIPLE_PERMISSIONS); } //요청한 권한에 대한 결과값 판단 및 처리 - public boolean permissionResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + public boolean permissionResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults){ //우선 requestCode가 아까 위에 final로 선언하였던 숫자와 맞는지, 결과값의 길이가 0보다는 큰지 먼저 체크 //if(requestCode == MULTIPLE_PERMISSIONS && (grantResults.length >0)) { - if ((grantResults.length > 0)) { - for (int i = 0; i < grantResults.length; i++) { + if((grantResults.length >0)) { + for(int i=0; i< grantResults.length; i++){ //grantResults 가 0이면 사용자가 허용한 것 / -1이면 거부한 것 //-1이 있는지 체크하여 하나라도 -1이 나온다면 false를 리턴 - if (grantResults[i] == -1) { + if(grantResults[i] == -1){ return false; } } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/Post.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/Post.java similarity index 57% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/Post.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/Post.java index 02b40c47..6fd57bc8 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/Post.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/Post.java @@ -1,14 +1,13 @@ -package com.runus.runusandroid; +package com.example.runusandroid; public class Post { private int id; private String test; - - public int getId() { + public int getId(){ return id; } - public String getTest() { + public String getTest(){ return test; } } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/RefreshTokenData.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/RefreshTokenData.java similarity index 70% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/RefreshTokenData.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/RefreshTokenData.java index 688b357c..4ddf1082 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/RefreshTokenData.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/RefreshTokenData.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import com.google.gson.annotations.SerializedName; @@ -6,7 +6,7 @@ public class RefreshTokenData { @SerializedName("refresh") String refreshToken; - public RefreshTokenData(String refresh) { + public RefreshTokenData(String refresh){ this.refreshToken = refresh; } } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ResetPasswordActivity1.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ResetPasswordActivity1.java similarity index 96% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ResetPasswordActivity1.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ResetPasswordActivity1.java index 32878016..1b8cb233 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ResetPasswordActivity1.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ResetPasswordActivity1.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import android.app.AlertDialog; import android.content.Context; @@ -153,12 +153,12 @@ public void onShow(DialogInterface arg0) { public boolean dispatchTouchEvent(MotionEvent ev) { View view = getCurrentFocus(); if (view != null && (ev.getAction() == MotionEvent.ACTION_UP || ev.getAction() == MotionEvent.ACTION_MOVE) && view instanceof EditText && !view.getClass().getName().startsWith("android.webkit.")) { - int[] scrcoords = new int[2]; + int scrcoords[] = new int[2]; view.getLocationOnScreen(scrcoords); float x = ev.getRawX() + view.getLeft() - scrcoords[0]; float y = ev.getRawY() + view.getTop() - scrcoords[1]; if (x < view.getLeft() || x > view.getRight() || y < view.getTop() || y > view.getBottom()) - ((InputMethodManager) this.getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow((this.getWindow().getDecorView().getApplicationWindowToken()), 0); + ((InputMethodManager)this.getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow((this.getWindow().getDecorView().getApplicationWindowToken()), 0); } return super.dispatchTouchEvent(ev); } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ResetPasswordActivity2.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ResetPasswordActivity2.java similarity index 96% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ResetPasswordActivity2.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ResetPasswordActivity2.java index 3388c19b..a889bd24 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ResetPasswordActivity2.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ResetPasswordActivity2.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import android.app.AlertDialog; import android.content.Context; @@ -145,12 +145,12 @@ public void onShow(DialogInterface arg0) { public boolean dispatchTouchEvent(MotionEvent ev) { View view = getCurrentFocus(); if (view != null && (ev.getAction() == MotionEvent.ACTION_UP || ev.getAction() == MotionEvent.ACTION_MOVE) && view instanceof EditText && !view.getClass().getName().startsWith("android.webkit.")) { - int[] scrcoords = new int[2]; + int scrcoords[] = new int[2]; view.getLocationOnScreen(scrcoords); float x = ev.getRawX() + view.getLeft() - scrcoords[0]; float y = ev.getRawY() + view.getTop() - scrcoords[1]; if (x < view.getLeft() || x > view.getRight() || y < view.getTop() || y > view.getBottom()) - ((InputMethodManager) this.getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow((this.getWindow().getDecorView().getApplicationWindowToken()), 0); + ((InputMethodManager)this.getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow((this.getWindow().getDecorView().getApplicationWindowToken()), 0); } return super.dispatchTouchEvent(ev); } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ResetPasswordData.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ResetPasswordData.java similarity index 95% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ResetPasswordData.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ResetPasswordData.java index abdc6da4..b7b186bd 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ResetPasswordData.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ResetPasswordData.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; public class ResetPasswordData { diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/RetrofitClient.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/RetrofitClient.java similarity index 98% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/RetrofitClient.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/RetrofitClient.java index 1574d8a5..69581828 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/RetrofitClient.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/RetrofitClient.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import java.io.IOException; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/SendMailData.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/SendMailData.java similarity index 93% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/SendMailData.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/SendMailData.java index 3200b8ec..bf83e15b 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/SendMailData.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/SendMailData.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; public class SendMailData { private String username; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/SignUpData.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/SignUpData.java similarity index 97% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/SignUpData.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/SignUpData.java index d88b1a4d..eadeee55 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/SignUpData.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/SignUpData.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import com.google.gson.annotations.SerializedName; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/SignUpStep1Activity.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/SignUpStep1Activity.java similarity index 94% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/SignUpStep1Activity.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/SignUpStep1Activity.java index 595dbb71..04c1684c 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/SignUpStep1Activity.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/SignUpStep1Activity.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import android.content.Context; import android.content.Intent; @@ -29,7 +29,6 @@ public class SignUpStep1Activity extends AppCompatActivity { private ImageButton backButton; private AccountApi accountApi; private long nextButtonLastClickTime = 0; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -101,11 +100,11 @@ public CharSequence filter(CharSequence source, int start, int end, Spanned dest return; } IdValidationData requestData = new IdValidationData(Id); - accountApi.postIdValidationData(requestData).enqueue(new Callback() { + accountApi.postIdValidationData(requestData).enqueue(new Callback(){ @Override public void onResponse(Call call, Response response) { - if (response.isSuccessful()) { + if(response.isSuccessful()) { Intent intent1 = new Intent(SignUpStep1Activity.this, SignUpStep2Activity.class); intent1.putExtra("userName", Id); intent1.putExtra("password", password1); @@ -117,7 +116,8 @@ public void onResponse(Call call, Response response) intent1.putExtra("gender", gender); intent1.putExtra("age", age); startActivity(intent1); - } else { + } + else { signUpIdInput.setError("동일한 아이디가 이미 존재합니다."); } } @@ -143,12 +143,12 @@ public void onClick(View view) { public boolean dispatchTouchEvent(MotionEvent ev) { View view = getCurrentFocus(); if (view != null && (ev.getAction() == MotionEvent.ACTION_UP || ev.getAction() == MotionEvent.ACTION_MOVE) && view instanceof EditText && !view.getClass().getName().startsWith("android.webkit.")) { - int[] scrcoords = new int[2]; + int scrcoords[] = new int[2]; view.getLocationOnScreen(scrcoords); float x = ev.getRawX() + view.getLeft() - scrcoords[0]; float y = ev.getRawY() + view.getTop() - scrcoords[1]; if (x < view.getLeft() || x > view.getRight() || y < view.getTop() || y > view.getBottom()) - ((InputMethodManager) this.getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow((this.getWindow().getDecorView().getApplicationWindowToken()), 0); + ((InputMethodManager)this.getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow((this.getWindow().getDecorView().getApplicationWindowToken()), 0); } return super.dispatchTouchEvent(ev); } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/SignUpStep2Activity.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/SignUpStep2Activity.java similarity index 93% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/SignUpStep2Activity.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/SignUpStep2Activity.java index a7ea7381..49012b7c 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/SignUpStep2Activity.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/SignUpStep2Activity.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import android.content.Context; import android.content.Intent; @@ -87,7 +87,7 @@ public void onClick(View view) { intentToStep3.putExtra("height", height); intentToStep3.putExtra("weight", weight); intentToStep3.putExtra("gender", gender); - intentToStep3.putExtra("age", age); + intentToStep3.putExtra("age",age); startActivity(intentToStep3); } }); @@ -104,7 +104,7 @@ public void onClick(View view) { intentToStep1.putExtra("height", height); intentToStep1.putExtra("weight", weight); intentToStep1.putExtra("gender", gender); - intentToStep1.putExtra("age", age); + intentToStep1.putExtra("age",age); startActivity(intentToStep1); } }); @@ -114,12 +114,12 @@ public void onClick(View view) { public boolean dispatchTouchEvent(MotionEvent ev) { View view = getCurrentFocus(); if (view != null && (ev.getAction() == MotionEvent.ACTION_UP || ev.getAction() == MotionEvent.ACTION_MOVE) && view instanceof EditText && !view.getClass().getName().startsWith("android.webkit.")) { - int[] scrcoords = new int[2]; + int scrcoords[] = new int[2]; view.getLocationOnScreen(scrcoords); float x = ev.getRawX() + view.getLeft() - scrcoords[0]; float y = ev.getRawY() + view.getTop() - scrcoords[1]; if (x < view.getLeft() || x > view.getRight() || y < view.getTop() || y > view.getBottom()) - ((InputMethodManager) this.getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow((this.getWindow().getDecorView().getApplicationWindowToken()), 0); + ((InputMethodManager)this.getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow((this.getWindow().getDecorView().getApplicationWindowToken()), 0); } return super.dispatchTouchEvent(ev); } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/SignUpStep3Activity.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/SignUpStep3Activity.java similarity index 97% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/SignUpStep3Activity.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/SignUpStep3Activity.java index ed033c84..c18add0a 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/SignUpStep3Activity.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/SignUpStep3Activity.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import android.content.Context; import android.content.Intent; @@ -189,12 +189,12 @@ public String getSelectedGenderText() { public boolean dispatchTouchEvent(MotionEvent ev) { View view = getCurrentFocus(); if (view != null && (ev.getAction() == MotionEvent.ACTION_UP || ev.getAction() == MotionEvent.ACTION_MOVE) && view instanceof EditText && !view.getClass().getName().startsWith("android.webkit.")) { - int[] scrcoords = new int[2]; + int scrcoords[] = new int[2]; view.getLocationOnScreen(scrcoords); float x = ev.getRawX() + view.getLeft() - scrcoords[0]; float y = ev.getRawY() + view.getTop() - scrcoords[1]; if (x < view.getLeft() || x > view.getRight() || y < view.getTop() || y > view.getBottom()) - ((InputMethodManager) this.getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow((this.getWindow().getDecorView().getApplicationWindowToken()), 0); + ((InputMethodManager)this.getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow((this.getWindow().getDecorView().getApplicationWindowToken()), 0); } return super.dispatchTouchEvent(ev); } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/UserProfileResponse.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/UserProfileResponse.java similarity index 92% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/UserProfileResponse.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/UserProfileResponse.java index 54485657..9207050c 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/UserProfileResponse.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/UserProfileResponse.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid; +package com.example.runusandroid; import com.google.gson.annotations.SerializedName; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/history/HistoryFragment.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/history/HistoryFragment.java similarity index 96% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/history/HistoryFragment.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/history/HistoryFragment.java index c047ac26..6a747095 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/history/HistoryFragment.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/history/HistoryFragment.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.history; +package com.example.runusandroid.ui.history; import static android.content.Context.MODE_PRIVATE; @@ -18,11 +18,11 @@ import com.applandeo.materialcalendarview.CalendarView; import com.applandeo.materialcalendarview.EventDay; import com.applandeo.materialcalendarview.listeners.OnDayClickListener; -import com.runus.runusandroid.HistoryApi; -import com.runus.runusandroid.HistoryDataforRendering; -import com.runus.runusandroid.R; -import com.runus.runusandroid.RetrofitClient; -import com.runus.runusandroid.databinding.FragmentHistoryBinding; +import com.example.runusandroid.HistoryApi; +import com.example.runusandroid.HistoryDataforRendering; +import com.example.runusandroid.R; +import com.example.runusandroid.RetrofitClient; +import com.example.runusandroid.databinding.FragmentHistoryBinding; import java.text.ParseException; import java.util.ArrayList; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/history/HistoryViewModel.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/history/HistoryViewModel.java similarity index 83% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/history/HistoryViewModel.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/history/HistoryViewModel.java index 0f059662..4f0d37fd 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/history/HistoryViewModel.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/history/HistoryViewModel.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.history; +package com.example.runusandroid.ui.history; import androidx.lifecycle.LiveData; import androidx.lifecycle.ViewModel; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/home/HomeFragment.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/home/HomeFragment.java similarity index 95% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/home/HomeFragment.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/home/HomeFragment.java index 5626b586..5a2ad3d5 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/home/HomeFragment.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/home/HomeFragment.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.home; +package com.example.runusandroid.ui.home; import static android.content.Context.MODE_PRIVATE; @@ -15,11 +15,11 @@ import androidx.lifecycle.ViewModelProvider; import androidx.viewpager.widget.ViewPager; -import com.runus.runusandroid.HistoryApi; -import com.runus.runusandroid.R; -import com.runus.runusandroid.RetrofitClient; -import com.runus.runusandroid.databinding.FragmentHomeBinding; -import com.runus.runusandroid.ui.multi_mode.SocketManager; +import com.example.runusandroid.HistoryApi; +import com.example.runusandroid.R; +import com.example.runusandroid.RetrofitClient; +import com.example.runusandroid.databinding.FragmentHomeBinding; +import com.example.runusandroid.ui.multi_mode.SocketManager; import java.util.Calendar; import java.util.Random; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/home/HomePageAdapter.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/home/HomePageAdapter.java similarity index 93% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/home/HomePageAdapter.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/home/HomePageAdapter.java index 50b63494..7ed98ad3 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/home/HomePageAdapter.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/home/HomePageAdapter.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.home; +package com.example.runusandroid.ui.home; import android.view.LayoutInflater; import android.view.View; @@ -8,7 +8,7 @@ import androidx.annotation.NonNull; import androidx.viewpager.widget.PagerAdapter; -import com.runus.runusandroid.R; +import com.example.runusandroid.R; public class HomePageAdapter extends PagerAdapter { diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/home/HomeViewModel.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/home/HomeViewModel.java similarity index 90% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/home/HomeViewModel.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/home/HomeViewModel.java index 33083900..a237deca 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/home/HomeViewModel.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/home/HomeViewModel.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.home; +package com.example.runusandroid.ui.home; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/BackGroundSocketService.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/BackGroundSocketService.java similarity index 86% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/BackGroundSocketService.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/BackGroundSocketService.java index a2440c85..df04d5d1 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/BackGroundSocketService.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/BackGroundSocketService.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.multi_mode; +package com.example.runusandroid.ui.multi_mode; import android.app.Notification; import android.app.NotificationChannel; @@ -8,6 +8,7 @@ import android.os.IBinder; import android.util.Log; + import androidx.annotation.Nullable; import java.util.Objects; @@ -24,17 +25,17 @@ public IBinder onBind(Intent intent) { @Override public int onStartCommand(Intent intent, int flags, int startId) { - Log.d("start service", "socket service come"); - if (intent == null) { + Log.d("start service","socket service come"); + if(intent==null){ return START_STICKY; } if (Objects.equals(intent.getAction(), START_SOCKET_SERVICE)) { - Log.d("start service", "socket service start"); + Log.d("start service","socket service start"); Notification notification = getNotification(); startForeground(1133, notification); } else if (Objects.equals(intent.getAction(), STOP_SOCKET_SERVICE)) { - Log.d("start service", "socket service stop"); + Log.d("start service","socket service stop"); stopForeground(true); stopSelf(); } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeAdapter.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeAdapter.java similarity index 98% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeAdapter.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeAdapter.java index d3040cb2..2a2ec7bd 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeAdapter.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeAdapter.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.multi_mode; +package com.example.runusandroid.ui.multi_mode; import android.annotation.SuppressLint; import android.app.Activity; @@ -22,7 +22,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.runus.runusandroid.R; +import com.example.runusandroid.R; import java.io.IOException; import java.io.ObjectOutputStream; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeFragment.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeFragment.java similarity index 97% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeFragment.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeFragment.java index 1f14c20f..90e0624f 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeFragment.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeFragment.java @@ -1,6 +1,7 @@ -package com.runus.runusandroid.ui.multi_mode; +package com.example.runusandroid.ui.multi_mode; import static android.content.Context.MODE_PRIVATE; + import static com.google.android.material.internal.ViewUtils.hideKeyboard; import android.annotation.SuppressLint; @@ -19,6 +20,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.Window; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.EditText; import android.widget.ImageButton; @@ -33,12 +35,12 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.example.runusandroid.AccountApi; +import com.example.runusandroid.MainActivity2; +import com.example.runusandroid.R; +import com.example.runusandroid.RetrofitClient; +import com.example.runusandroid.UserProfileResponse; import com.google.android.material.bottomnavigation.BottomNavigationView; -import com.runus.runusandroid.AccountApi; -import com.runus.runusandroid.MainActivity2; -import com.runus.runusandroid.R; -import com.runus.runusandroid.RetrofitClient; -import com.runus.runusandroid.UserProfileResponse; import java.io.IOException; import java.io.ObjectOutputStream; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModePlayFragment.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModePlayFragment.java similarity index 98% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModePlayFragment.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModePlayFragment.java index c6ffa1a0..26ac515b 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModePlayFragment.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModePlayFragment.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.multi_mode; +package com.example.runusandroid.ui.multi_mode; import android.Manifest; import android.annotation.SuppressLint; @@ -35,6 +35,16 @@ import androidx.navigation.NavController; import androidx.navigation.Navigation; +import com.example.runusandroid.AccountAPIFactory; +import com.example.runusandroid.ActivityRecognition.RunningState; +import com.example.runusandroid.ExpSystem; +import com.example.runusandroid.GroupHistoryData; +import com.example.runusandroid.HistoryApi; +import com.example.runusandroid.HistoryData; +import com.example.runusandroid.MainActivity2; +import com.example.runusandroid.R; +import com.example.runusandroid.RetrofitClient; +import com.example.runusandroid.ui.single_mode.BackGroundLocationService; import com.google.android.gms.location.FusedLocationProviderClient; import com.google.android.gms.location.LocationCallback; import com.google.android.gms.location.LocationRequest; @@ -43,16 +53,6 @@ import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.PolylineOptions; -import com.runus.runusandroid.AccountAPIFactory; -import com.runus.runusandroid.ActivityRecognition.RunningState; -import com.runus.runusandroid.ExpSystem; -import com.runus.runusandroid.GroupHistoryData; -import com.runus.runusandroid.HistoryApi; -import com.runus.runusandroid.HistoryData; -import com.runus.runusandroid.MainActivity2; -import com.runus.runusandroid.R; -import com.runus.runusandroid.RetrofitClient; -import com.runus.runusandroid.ui.single_mode.BackGroundLocationService; import org.json.JSONException; import org.json.JSONObject; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeRecordAdapter.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeRecordAdapter.java similarity index 96% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeRecordAdapter.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeRecordAdapter.java index 7ea726d1..b51d78ee 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeRecordAdapter.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeRecordAdapter.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.multi_mode; +package com.example.runusandroid.ui.multi_mode; import android.util.Log; import android.view.LayoutInflater; @@ -9,7 +9,7 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.runus.runusandroid.R; +import com.example.runusandroid.R; import java.util.ArrayList; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeResultFragment.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeResultFragment.java similarity index 98% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeResultFragment.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeResultFragment.java index 993d87cb..c3573891 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeResultFragment.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeResultFragment.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.multi_mode; +package com.example.runusandroid.ui.multi_mode; import static android.content.Context.MODE_PRIVATE; import static android.view.View.GONE; @@ -30,12 +30,12 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.runus.runusandroid.AccountApi; -import com.runus.runusandroid.ExpSystem; -import com.runus.runusandroid.MainActivity2; -import com.runus.runusandroid.R; -import com.runus.runusandroid.RetrofitClient; -import com.runus.runusandroid.UserProfileResponse; +import com.example.runusandroid.AccountApi; +import com.example.runusandroid.ExpSystem; +import com.example.runusandroid.MainActivity2; +import com.example.runusandroid.R; +import com.example.runusandroid.RetrofitClient; +import com.example.runusandroid.UserProfileResponse; import java.util.ArrayList; import java.util.Locale; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeViewModel.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeViewModel.java similarity index 89% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeViewModel.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeViewModel.java index b48f33d4..c4916a49 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeViewModel.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeViewModel.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.multi_mode; +package com.example.runusandroid.ui.multi_mode; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeWaitFragment.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeWaitFragment.java similarity index 98% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeWaitFragment.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeWaitFragment.java index 24857127..ebb0deae 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/MultiModeWaitFragment.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/MultiModeWaitFragment.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.multi_mode; +package com.example.runusandroid.ui.multi_mode; import android.Manifest; import android.annotation.SuppressLint; @@ -36,12 +36,12 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; +import com.example.runusandroid.AccountApi; +import com.example.runusandroid.MainActivity2; +import com.example.runusandroid.R; +import com.example.runusandroid.RetrofitClient; +import com.example.runusandroid.UserProfileResponse; import com.google.android.material.bottomnavigation.BottomNavigationView; -import com.runus.runusandroid.AccountApi; -import com.runus.runusandroid.MainActivity2; -import com.runus.runusandroid.R; -import com.runus.runusandroid.RetrofitClient; -import com.runus.runusandroid.UserProfileResponse; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/RecordDialog.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/RecordDialog.java similarity index 95% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/RecordDialog.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/RecordDialog.java index 68d48063..33924f48 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/RecordDialog.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/RecordDialog.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.multi_mode; +package com.example.runusandroid.ui.multi_mode; import android.app.Dialog; import android.content.Context; @@ -12,7 +12,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.runus.runusandroid.R; +import com.example.runusandroid.R; public class RecordDialog extends Dialog implements View.OnClickListener { diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/RecordItem.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/RecordItem.java similarity index 88% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/RecordItem.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/RecordItem.java index 126d16ec..57177bd8 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/RecordItem.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/RecordItem.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.multi_mode; +package com.example.runusandroid.ui.multi_mode; public class RecordItem { private final double section; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/RoomCreateModalFragment.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/RoomCreateModalFragment.java similarity index 95% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/RoomCreateModalFragment.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/RoomCreateModalFragment.java index b3e450e6..a9277d84 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/RoomCreateModalFragment.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/RoomCreateModalFragment.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.multi_mode; +package com.example.runusandroid.ui.multi_mode; import android.app.AlertDialog; import android.app.Dialog; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/SocketListenerThread.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/SocketListenerThread.java similarity index 99% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/SocketListenerThread.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/SocketListenerThread.java index 75b8fb42..f972bbc2 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/SocketListenerThread.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/SocketListenerThread.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.multi_mode; +package com.example.runusandroid.ui.multi_mode; import android.os.Bundle; import android.os.Handler; @@ -8,7 +8,7 @@ import androidx.navigation.NavController; import androidx.navigation.Navigation; -import com.runus.runusandroid.R; +import com.example.runusandroid.R; import org.json.JSONException; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/SocketManager.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/SocketManager.java similarity index 97% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/SocketManager.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/SocketManager.java index 08ef7ef7..35a57786 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/multi_mode/SocketManager.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/multi_mode/SocketManager.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.multi_mode; +package com.example.runusandroid.ui.multi_mode; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/BackGroundLocationService.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/BackGroundLocationService.java similarity index 98% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/BackGroundLocationService.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/BackGroundLocationService.java index 2824f06f..c69e2998 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/BackGroundLocationService.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/BackGroundLocationService.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.single_mode; +package com.example.runusandroid.ui.single_mode; import android.Manifest; import android.app.Notification; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/SingleModeFragment.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeFragment.java similarity index 98% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/SingleModeFragment.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeFragment.java index c5b9ad23..97fc902a 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/SingleModeFragment.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeFragment.java @@ -1,6 +1,7 @@ -package com.runus.runusandroid.ui.single_mode; +package com.example.runusandroid.ui.single_mode; import static android.content.Context.MODE_PRIVATE; + import static com.google.android.material.internal.ViewUtils.hideKeyboard; import android.Manifest; @@ -33,6 +34,7 @@ import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; +import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.Chronometer; import android.widget.EditText; @@ -51,20 +53,20 @@ import androidx.navigation.NavController; import androidx.navigation.Navigation; +import com.example.runusandroid.ActivityRecognition.RunningState; +import com.example.runusandroid.ExpSystem; +import com.example.runusandroid.HistoryApi; +import com.example.runusandroid.HistoryData; +import com.example.runusandroid.MainActivity2; +import com.example.runusandroid.R; +import com.example.runusandroid.RetrofitClient; +import com.example.runusandroid.databinding.FragmentSingleModeBinding; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.PolylineOptions; import com.google.android.material.bottomnavigation.BottomNavigationView; -import com.runus.runusandroid.ActivityRecognition.RunningState; -import com.runus.runusandroid.ExpSystem; -import com.runus.runusandroid.HistoryApi; -import com.runus.runusandroid.HistoryData; -import com.runus.runusandroid.MainActivity2; -import com.runus.runusandroid.R; -import com.runus.runusandroid.RetrofitClient; -import com.runus.runusandroid.databinding.FragmentSingleModeBinding; import org.json.JSONArray; import org.json.JSONException; @@ -1150,7 +1152,7 @@ public void onResponse(Call call, Response response) float recentDistance = (float) historyObject.getDouble("distance"); float recentDuration = convertTimetoHour(historyObject.getString("duration")); - if (recentDistance >= 0.01 && recentDuration >= 0.008) { + if (recentDistance>=0.01 && recentDuration>=0.008){ originalData[cleansedNum][0] = recentDistance; originalData[cleansedNum][1] = recentDuration; wholeDistance += recentDistance; @@ -1162,14 +1164,15 @@ public void onResponse(Call call, Response response) historyNum = cleansedNum; float alpha = 2f / (1f + 20); - for (int i = 0; i < cleansedNum; i++) { + for (int i=0; i 0) { + if (i>0){ modelInput[0][i][0] = modelInput[0][i - 1][0] * alpha + tmpDistance * (1 - alpha); modelInput[0][i][1] = modelInput[0][i - 1][1] * alpha + tmpTime * (1 - alpha); - } else { + } + else{ modelInput[0][i][0] = tmpDistance; modelInput[0][i][1] = tmpTime; } @@ -1191,7 +1194,8 @@ public void onResponse(Call call, Response response) if (goalDistance >= 1.2f * wholeDistance) { goalDistance /= 1.2f; goalTime /= 1.2f; - } else if (goalDistance <= 0.8f * wholeDistance) { + } + else if (goalDistance <= 0.8f * wholeDistance) { goalDistance /= 0.8f; goalTime /= 0.8f; } diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/SingleModeMainUI.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeMainUI.java similarity index 96% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/SingleModeMainUI.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeMainUI.java index 2c8a5954..b5bfc0f2 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/SingleModeMainUI.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeMainUI.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.single_mode; +package com.example.runusandroid.ui.single_mode; import android.widget.Button; import android.widget.Chronometer; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/SingleModeResultFragment.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeResultFragment.java similarity index 97% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/SingleModeResultFragment.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeResultFragment.java index a95bae43..e9201657 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/SingleModeResultFragment.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeResultFragment.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.single_mode; +package com.example.runusandroid.ui.single_mode; import static android.content.Context.MODE_PRIVATE; @@ -33,17 +33,17 @@ import androidx.navigation.NavController; import androidx.navigation.Navigation; +import com.example.runusandroid.ExpSystem; +import com.example.runusandroid.MainActivity2; +import com.example.runusandroid.R; +import com.example.runusandroid.databinding.FragmentSingleModeResultBinding; +import com.example.runusandroid.ui.multi_mode.RecordDialog; +import com.example.runusandroid.ui.multi_mode.RecordItem; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.PolylineOptions; -import com.runus.runusandroid.ExpSystem; -import com.runus.runusandroid.MainActivity2; -import com.runus.runusandroid.R; -import com.runus.runusandroid.databinding.FragmentSingleModeResultBinding; -import com.runus.runusandroid.ui.multi_mode.RecordDialog; -import com.runus.runusandroid.ui.multi_mode.RecordItem; import java.util.ArrayList; import java.util.List; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/SingleModeUiState.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeUiState.java similarity index 91% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/SingleModeUiState.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeUiState.java index 4879e5c9..b430ae02 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/SingleModeUiState.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeUiState.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.single_mode; +package com.example.runusandroid.ui.single_mode; import android.widget.Chronometer; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/SingleModeViewModel.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeViewModel.java similarity index 89% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/SingleModeViewModel.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeViewModel.java index 66c8c7cc..a61bc144 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/single_mode/SingleModeViewModel.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/single_mode/SingleModeViewModel.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.single_mode; +package com.example.runusandroid.ui.single_mode; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/user_setting/CreditDialog.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/user_setting/CreditDialog.java similarity index 97% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/user_setting/CreditDialog.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/user_setting/CreditDialog.java index ae706115..d8aa16ae 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/user_setting/CreditDialog.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/user_setting/CreditDialog.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.user_setting; +package com.example.runusandroid.ui.user_setting; import android.app.Dialog; import android.content.Context; @@ -12,7 +12,7 @@ import androidx.core.text.HtmlCompat; -import com.runus.runusandroid.R; +import com.example.runusandroid.R; public class CreditDialog extends Dialog implements View.OnClickListener { diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/user_setting/UserSettingFragment.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/user_setting/UserSettingFragment.java similarity index 95% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/user_setting/UserSettingFragment.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/user_setting/UserSettingFragment.java index 9ddfd382..b067e0cd 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/user_setting/UserSettingFragment.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/user_setting/UserSettingFragment.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.user_setting; +package com.example.runusandroid.ui.user_setting; import static android.content.Context.MODE_PRIVATE; @@ -27,18 +27,18 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.runus.runusandroid.AccountApi; -import com.runus.runusandroid.ActivityRecognition.RunningState; -import com.runus.runusandroid.ExpSystem; -import com.runus.runusandroid.ImageResponse; -import com.runus.runusandroid.LoginActivity; -import com.runus.runusandroid.MainActivity2; -import com.runus.runusandroid.R; -import com.runus.runusandroid.RetrofitClient; -import com.runus.runusandroid.UserProfileResponse; -import com.runus.runusandroid.databinding.FragmentUserSettingBinding; -import com.runus.runusandroid.ui.multi_mode.MultiModeFragment; -import com.runus.runusandroid.ui.multi_mode.SocketManager; +import com.example.runusandroid.AccountApi; +import com.example.runusandroid.ActivityRecognition.RunningState; +import com.example.runusandroid.ExpSystem; +import com.example.runusandroid.ImageResponse; +import com.example.runusandroid.LoginActivity; +import com.example.runusandroid.MainActivity2; +import com.example.runusandroid.R; +import com.example.runusandroid.RetrofitClient; +import com.example.runusandroid.UserProfileResponse; +import com.example.runusandroid.databinding.FragmentUserSettingBinding; +import com.example.runusandroid.ui.multi_mode.MultiModeFragment; +import com.example.runusandroid.ui.multi_mode.SocketManager; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/user_setting/UserSettingViewModel.java b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/user_setting/UserSettingViewModel.java similarity index 91% rename from android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/user_setting/UserSettingViewModel.java rename to android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/user_setting/UserSettingViewModel.java index d0a53ff0..9087358c 100644 --- a/android/RunUsAndroid/app/src/main/java/com/runus/runusandroid/ui/user_setting/UserSettingViewModel.java +++ b/android/RunUsAndroid/app/src/main/java/com/example/runusandroid/ui/user_setting/UserSettingViewModel.java @@ -1,4 +1,4 @@ -package com.runus.runusandroid.ui.user_setting; +package com.example.runusandroid.ui.user_setting; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; diff --git a/android/RunUsAndroid/app/src/main/res/layout/activity_find_id.xml b/android/RunUsAndroid/app/src/main/res/layout/activity_find_id.xml index 440303ec..da81c1fc 100644 --- a/android/RunUsAndroid/app/src/main/res/layout/activity_find_id.xml +++ b/android/RunUsAndroid/app/src/main/res/layout/activity_find_id.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.runus.runusandroid.FindIdActivity"> + tools:context=".FindIdActivity"> + tools:context=".LoginActivity"> @@ -112,8 +112,8 @@ android:id="@+id/forgotPasswordText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="15dp" android:fontFamily="@font/pretendardregular" + android:layout_marginRight="15dp" android:padding="5dp" android:text="비밀번호를 잊어버리셨나요? 비밀번호 찾기" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/RunUsAndroid/app/src/main/res/layout/activity_main.xml b/android/RunUsAndroid/app/src/main/res/layout/activity_main.xml index 26d66d1a..38926c33 100644 --- a/android/RunUsAndroid/app/src/main/res/layout/activity_main.xml +++ b/android/RunUsAndroid/app/src/main/res/layout/activity_main.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.runus.runusandroid.MainActivity"> + tools:context=".MainActivity">