diff --git a/SPOTeam_android/app/build.gradle.kts b/SPOTeam_android/app/build.gradle.kts index bc76e467..77bb305d 100644 --- a/SPOTeam_android/app/build.gradle.kts +++ b/SPOTeam_android/app/build.gradle.kts @@ -13,11 +13,11 @@ val properties = Properties().apply { } android { - namespace = "com.example.spoteam_android" + namespace = "com.spot.android" compileSdk = 34 defaultConfig { - applicationId = "com.example.spoteam_android" + applicationId = "com.spot.android" minSdk = 33 targetSdk = 34 versionCode = 1 diff --git a/SPOTeam_android/app/src/androidTest/java/com/example/spoteam_android/ExampleInstrumentedTest.kt b/SPOTeam_android/app/src/androidTest/java/com/spot/android/ExampleInstrumentedTest.kt similarity index 94% rename from SPOTeam_android/app/src/androidTest/java/com/example/spoteam_android/ExampleInstrumentedTest.kt rename to SPOTeam_android/app/src/androidTest/java/com/spot/android/ExampleInstrumentedTest.kt index b99a1147..4b39a4a6 100644 --- a/SPOTeam_android/app/src/androidTest/java/com/example/spoteam_android/ExampleInstrumentedTest.kt +++ b/SPOTeam_android/app/src/androidTest/java/com/spot/android/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android +package com.spot.android import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/AuthApiService.kt b/SPOTeam_android/app/src/main/java/com/spot/android/AuthApiService.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/AuthApiService.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/AuthApiService.kt index 10d602e0..ae2779ef 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/AuthApiService.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/AuthApiService.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android +package com.spot.android import retrofit2.Call import retrofit2.http.Header diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/Authenticator.kt b/SPOTeam_android/app/src/main/java/com/spot/android/Authenticator.kt similarity index 98% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/Authenticator.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/Authenticator.kt index aa7683ec..f525d853 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/Authenticator.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/Authenticator.kt @@ -1,9 +1,9 @@ -package com.example.spoteam_android +package com.spot.android import android.content.Context import android.content.Intent import android.util.Log -import com.example.spoteam_android.login.StartLoginActivity +import com.spot.android.login.StartLoginActivity import okhttp3.Interceptor import okhttp3.Response import retrofit2.Retrofit diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/CompleteSignupStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/CompleteSignupStudyFragment.kt similarity index 82% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/CompleteSignupStudyFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/CompleteSignupStudyFragment.kt index 4f6a6cbb..5103ab5f 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/CompleteSignupStudyFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/CompleteSignupStudyFragment.kt @@ -1,17 +1,13 @@ -package com.example.spoteam_android +package com.spot.android import android.app.Dialog import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable -import android.view.View import android.view.Window -import android.widget.Button import android.widget.ImageButton import android.widget.Toast -import androidx.fragment.app.DialogFragment -import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.R +import com.spot.android.R class CompleteSignupStudyFragment (private val context: Context) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/Data.kt b/SPOTeam_android/app/src/main/java/com/spot/android/Data.kt similarity index 99% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/Data.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/Data.kt index a379b305..168aeabb 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/Data.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/Data.kt @@ -1,9 +1,6 @@ -package com.example.spoteam_android +package com.spot.android import Gender -import android.os.Parcel -import android.os.Parcelable -import com.example.spoteam_android.data.ApiModels import com.google.gson.annotations.SerializedName diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/GlobalApplication.kt b/SPOTeam_android/app/src/main/java/com/spot/android/GlobalApplication.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/GlobalApplication.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/GlobalApplication.kt index cbf17213..931f62e2 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/GlobalApplication.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/GlobalApplication.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android +package com.spot.android import android.app.Application import android.util.Log diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/HouseFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/HouseFragment.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/HouseFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/HouseFragment.kt index c037fab9..4ee15d5e 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/HouseFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/HouseFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android +package com.spot.android import StudyApiService import StudyViewModel @@ -13,34 +13,33 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import android.widget.Toast -import androidx.activity.viewModels import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.databinding.FragmentHouseBinding -import com.example.spoteam_android.search.SearchFragment -import com.example.spoteam_android.ui.alert.AlertFragment -import com.example.spoteam_android.ui.category.CategoryFragment -import com.example.spoteam_android.ui.category.CategoryFragment_1 -import com.example.spoteam_android.ui.category.CategoryInterestViewModel -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.CommunityContentActivity -import com.example.spoteam_android.ui.community.CommunityHomeFragment -import com.example.spoteam_android.ui.community.CommunityResponse -import com.example.spoteam_android.ui.home.HomeFragment -import com.example.spoteam_android.ui.interestarea.ApiResponse -import com.example.spoteam_android.ui.interestarea.InterestAreaApiService -import com.example.spoteam_android.ui.interestarea.InterestFilterViewModel -import com.example.spoteam_android.ui.interestarea.InterestFragment -import com.example.spoteam_android.ui.interestarea.InterestVPAdapter -import com.example.spoteam_android.ui.interestarea.RecommendStudyApiService -import com.example.spoteam_android.ui.myinterest.MyInterestStudyFragment -import com.example.spoteam_android.ui.recruiting.RecruitingStudyFragment -import com.example.spoteam_android.ui.study.DetailStudyFragment -import com.example.spoteam_android.ui.study.RegisterStudyFragment -import com.example.spoteam_android.weather.WeatherViewModel +import com.spot.android.databinding.FragmentHouseBinding +import com.spot.android.search.SearchFragment +import com.spot.android.ui.alert.AlertFragment +import com.spot.android.ui.category.CategoryFragment +import com.spot.android.ui.category.CategoryFragment_1 +import com.spot.android.ui.category.CategoryInterestViewModel +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.CommunityContentActivity +import com.spot.android.ui.community.CommunityHomeFragment +import com.spot.android.ui.community.CommunityResponse +import com.spot.android.ui.home.HomeFragment +import com.spot.android.ui.interestarea.ApiResponse +import com.spot.android.ui.interestarea.InterestAreaApiService +import com.spot.android.ui.interestarea.InterestFilterViewModel +import com.spot.android.ui.interestarea.InterestFragment +import com.spot.android.ui.interestarea.InterestVPAdapter +import com.spot.android.ui.interestarea.RecommendStudyApiService +import com.spot.android.ui.myinterest.MyInterestStudyFragment +import com.spot.android.ui.recruiting.RecruitingStudyFragment +import com.spot.android.ui.study.DetailStudyFragment +import com.spot.android.ui.study.RegisterStudyFragment +import com.spot.android.weather.WeatherViewModel import com.google.android.material.floatingactionbutton.FloatingActionButton import dagger.hilt.android.AndroidEntryPoint import retrofit2.Call diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/MainActivity.kt b/SPOTeam_android/app/src/main/java/com/spot/android/MainActivity.kt similarity index 86% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/MainActivity.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/MainActivity.kt index cbb125d9..9945e0ea 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/MainActivity.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/MainActivity.kt @@ -1,65 +1,49 @@ -package com.example.spoteam_android +package com.spot.android import StudyViewModel import android.annotation.SuppressLint import android.content.Context import android.content.SharedPreferences -import android.content.res.ColorStateList import android.os.Bundle import android.util.Log import android.view.View -import android.widget.TextView import android.widget.Toast import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity -import androidx.core.content.ContentProviderCompat.requireContext -import androidx.core.content.ContextCompat -import androidx.core.view.GravityCompat -import androidx.drawerlayout.widget.DrawerLayout import androidx.fragment.app.Fragment -import androidx.fragment.app.activityViewModels -import androidx.fragment.app.viewModels -import androidx.navigation.NavController -import androidx.navigation.fragment.NavHostFragment -import com.example.spoteam_android.data.ApiModels -import com.example.spoteam_android.databinding.ActivityMainBinding -import com.example.spoteam_android.login.LoginApiService -import com.example.spoteam_android.login.TokenUtil -import com.example.spoteam_android.ui.study.todolist.TodoViewModel -import com.example.spoteam_android.ui.alert.AlertFragment -import com.example.spoteam_android.ui.bookMark.BookmarkFragment +import com.spot.android.data.ApiModels +import com.spot.android.databinding.ActivityMainBinding +import com.spot.android.login.LoginApiService +import com.spot.android.login.TokenUtil +import com.spot.android.ui.alert.AlertFragment +import com.spot.android.ui.bookMark.BookmarkFragment //import com.example.spoteam_android.ui.bookMark.BookmarkFragment //import com.example.spoteam_android.ui.bookMark.BookmarkFragment -import com.example.spoteam_android.ui.category.CategoryFragment -import com.example.spoteam_android.ui.category.CategoryFragment_1 -import com.example.spoteam_android.ui.category.CategoryInterestViewModel -import com.example.spoteam_android.ui.category.CategoryNavViewFragment -import com.example.spoteam_android.ui.community.CommunityFragment -import com.example.spoteam_android.ui.community.CommunityHomeFragment -import com.example.spoteam_android.ui.community.WriteContentFragment -import com.example.spoteam_android.ui.interestarea.BottomNavVisibilityController -import com.example.spoteam_android.ui.interestarea.InterestFilterFragment -import com.example.spoteam_android.ui.myinterest.MyInterestStudyFilterFragment -import com.example.spoteam_android.ui.myinterest.MyInterestStudyFragment +import com.spot.android.ui.category.CategoryFragment +import com.spot.android.ui.category.CategoryFragment_1 +import com.spot.android.ui.category.CategoryInterestViewModel +import com.spot.android.ui.category.CategoryNavViewFragment +import com.spot.android.ui.community.CommunityFragment +import com.spot.android.ui.community.CommunityHomeFragment +import com.spot.android.ui.community.WriteContentFragment +import com.spot.android.ui.interestarea.BottomNavVisibilityController +import com.spot.android.ui.interestarea.InterestFilterFragment +import com.spot.android.ui.myinterest.MyInterestStudyFilterFragment //import com.example.spoteam_android.ui.mypage.ConsiderAttendanceMemberFragment -import com.example.spoteam_android.ui.mypage.MyPageFragment -import com.example.spoteam_android.ui.recruiting.RecruitingStudyFilterFragment -import com.example.spoteam_android.ui.study.DetailStudyFragment -import com.example.spoteam_android.ui.study.MyStudyCommunityFragment -import com.example.spoteam_android.ui.study.MyStudyWriteContentFragment -import com.example.spoteam_android.ui.study.RegisterStudyFragment -import com.example.spoteam_android.ui.study.StudyFragment -import com.example.spoteam_android.weather.WeatherViewModel -import com.example.spoteam_android.weather.parseCsv +import com.spot.android.ui.mypage.MyPageFragment +import com.spot.android.ui.recruiting.RecruitingStudyFilterFragment +import com.spot.android.ui.study.DetailStudyFragment +import com.spot.android.ui.study.MyStudyWriteContentFragment +import com.spot.android.ui.study.StudyFragment +import com.spot.android.weather.WeatherViewModel +import com.spot.android.weather.parseCsv import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.floatingactionbutton.FloatingActionButton -import com.google.android.material.navigation.NavigationView import com.google.gson.Gson import dagger.hilt.android.AndroidEntryPoint import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import java.sql.Time import java.text.SimpleDateFormat import java.util.Calendar import java.util.Locale diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/RetrofitInstance.kt b/SPOTeam_android/app/src/main/java/com/spot/android/RetrofitInstance.kt similarity index 98% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/RetrofitInstance.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/RetrofitInstance.kt index 3afc2825..00570680 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/RetrofitInstance.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/RetrofitInstance.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android +package com.spot.android import android.content.Context import android.util.Log diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/StudyRegisterPopupFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/StudyRegisterPopupFragment.kt similarity index 91% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/StudyRegisterPopupFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/StudyRegisterPopupFragment.kt index 5e445fd2..eeab32db 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/StudyRegisterPopupFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/StudyRegisterPopupFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android +package com.spot.android import android.app.Dialog import android.content.Context @@ -9,8 +9,6 @@ import android.view.Window import android.widget.Toast import android.widget.EditText import android.widget.ImageView -import android.widget.TextView -import com.example.spoteam_android.ui.mypage.ExitStudyPopupFragment class StudyRegisterPopupFragment(private val context: Context) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListCategoryActivity.kt b/SPOTeam_android/app/src/main/java/com/spot/android/checklist/CheckListCategoryActivity.kt similarity index 94% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListCategoryActivity.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/checklist/CheckListCategoryActivity.kt index ec614e4b..779c351a 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListCategoryActivity.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/checklist/CheckListCategoryActivity.kt @@ -1,12 +1,12 @@ -package com.example.spoteam_android.checklist +package com.spot.android.checklist import android.content.Intent import android.os.Bundle import android.util.Log import android.widget.CompoundButton import androidx.appcompat.app.AppCompatActivity -import com.example.spoteam_android.databinding.ActivityCheckListCategoryBinding -import com.example.spoteam_android.login.NicNameActivity +import com.spot.android.databinding.ActivityCheckListCategoryBinding +import com.spot.android.login.NicNameActivity import com.google.android.material.chip.Chip class CheckListCategoryActivity : AppCompatActivity() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListLocationActivity.kt b/SPOTeam_android/app/src/main/java/com/spot/android/checklist/CheckListLocationActivity.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListLocationActivity.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/checklist/CheckListLocationActivity.kt index 9885cf09..a986d075 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListLocationActivity.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/checklist/CheckListLocationActivity.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.checklist +package com.spot.android.checklist import android.content.Intent import android.os.Bundle @@ -7,10 +7,10 @@ import android.view.View import android.view.ViewGroup import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ActivityCheckListLocationBinding -import com.example.spoteam_android.login.LocationSearchActivity -import com.example.spoteam_android.login.RegisterInformation +import com.spot.android.R +import com.spot.android.databinding.ActivityCheckListLocationBinding +import com.spot.android.login.LocationSearchActivity +import com.spot.android.login.RegisterInformation import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipDrawable diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListStudyPurposeActivity.kt b/SPOTeam_android/app/src/main/java/com/spot/android/checklist/CheckListStudyPurposeActivity.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListStudyPurposeActivity.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/checklist/CheckListStudyPurposeActivity.kt index 1f6cff6c..9d542d00 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/checklist/CheckListStudyPurposeActivity.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/checklist/CheckListStudyPurposeActivity.kt @@ -1,13 +1,12 @@ - package com.example.spoteam_android.checklist + package com.spot.android.checklist import android.content.Intent import android.os.Bundle - import android.util.Log import android.widget.CompoundButton import androidx.appcompat.app.AppCompatActivity - import com.example.spoteam_android.MainActivity - import com.example.spoteam_android.R - import com.example.spoteam_android.databinding.ActivityCheckListStudyPurposeBinding + import com.spot.android.MainActivity + import com.spot.android.R + import com.spot.android.databinding.ActivityCheckListStudyPurposeBinding import com.google.android.material.chip.Chip class CheckListStudyPurposeActivity : AppCompatActivity() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/ApiModels.kt b/SPOTeam_android/app/src/main/java/com/spot/android/data/ApiModels.kt similarity index 94% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/ApiModels.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/data/ApiModels.kt index a83e87ac..b93d8aa9 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/data/ApiModels.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/data/ApiModels.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.data +package com.spot.android.data class ApiModels { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/di/AppModule.kt b/SPOTeam_android/app/src/main/java/com/spot/android/di/AppModule.kt similarity index 79% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/di/AppModule.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/di/AppModule.kt index 8355c79a..b5918272 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/di/AppModule.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/di/AppModule.kt @@ -1,7 +1,7 @@ -package com.example.spoteam_android.di +package com.spot.android.di -import com.example.spoteam_android.weather.Constants.Companion.BASE_URL -import com.example.spoteam_android.weather.WeatherApi +import com.spot.android.weather.Constants.Companion.BASE_URL +import com.spot.android.weather.WeatherApi import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/CategorySpinnerAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/CategorySpinnerAdapter.kt similarity index 90% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/CategorySpinnerAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/CategorySpinnerAdapter.kt index 3726f88a..7747505b 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/CategorySpinnerAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/CategorySpinnerAdapter.kt @@ -1,11 +1,11 @@ -package com.example.spoteam_android.login +package com.spot.android.login import android.content.Context import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter -import com.example.spoteam_android.databinding.ItemSpinnerHomeRegisterBinding +import com.spot.android.databinding.ItemSpinnerHomeRegisterBinding class CategorySpinnerAdapter( context: Context, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/CellPhoneLoginActivity.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/CellPhoneLoginActivity.kt similarity index 98% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/CellPhoneLoginActivity.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/CellPhoneLoginActivity.kt index 9c540de7..28a3ba9c 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/CellPhoneLoginActivity.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/CellPhoneLoginActivity.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.login +package com.spot.android.login import android.content.Intent import androidx.appcompat.app.AppCompatActivity @@ -9,8 +9,8 @@ import android.view.View import android.widget.AdapterView import android.widget.ArrayAdapter import androidx.core.content.ContextCompat -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ActivityCellPhoneLoginBinding +import com.spot.android.R +import com.spot.android.databinding.ActivityCellPhoneLoginBinding class CellPhoneLoginActivity : AppCompatActivity() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/EmailVerificationActivity.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/EmailVerificationActivity.kt similarity index 97% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/EmailVerificationActivity.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/EmailVerificationActivity.kt index c4a5ed3f..4d4ac18b 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/EmailVerificationActivity.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/EmailVerificationActivity.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.login +package com.spot.android.login import android.content.Intent import android.os.Bundle @@ -11,11 +11,11 @@ import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat -import com.example.spoteam_android.EmailVerifyResponse -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.ValidateEmailResponse -import com.example.spoteam_android.databinding.ActivityEmailVerificationBinding +import com.spot.android.EmailVerifyResponse +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.ValidateEmailResponse +import com.spot.android.databinding.ActivityEmailVerificationBinding import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationApiService.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/LocationApiService.kt similarity index 89% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationApiService.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/LocationApiService.kt index 91ca0ba6..22df33be 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationApiService.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/LocationApiService.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.login +package com.spot.android.login import StudyRequest import retrofit2.Call diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationItem.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/LocationItem.kt similarity index 85% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationItem.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/LocationItem.kt index 4911a97d..368fb712 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationItem.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/LocationItem.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.login +package com.spot.android.login data class LocationItem( val code: String, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationSearchActivity.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/LocationSearchActivity.kt similarity index 98% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationSearchActivity.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/LocationSearchActivity.kt index 551e1847..caccc0c9 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationSearchActivity.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/LocationSearchActivity.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.login +package com.spot.android.login import LocationSearchAdapter import android.content.Context @@ -13,7 +13,7 @@ import android.view.inputmethod.InputMethodManager import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.databinding.ActivityLocationSearchBinding +import com.spot.android.databinding.ActivityLocationSearchBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationSearchAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/LocationSearchAdapter.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationSearchAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/LocationSearchAdapter.kt index 0f1a21b4..63b75b32 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LocationSearchAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/LocationSearchAdapter.kt @@ -1,8 +1,8 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.databinding.ItemLocationSearchBinding -import com.example.spoteam_android.login.LocationItem +import com.spot.android.databinding.ItemLocationSearchBinding +import com.spot.android.login.LocationItem class LocationSearchAdapter( private val dataList: List, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginApiService.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/LoginApiService.kt similarity index 66% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginApiService.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/LoginApiService.kt index 3c3499f0..a113a957 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginApiService.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/LoginApiService.kt @@ -1,35 +1,29 @@ -package com.example.spoteam_android.login - -import com.example.spoteam_android.EmailResponse -import com.example.spoteam_android.EmailVerifyResponse -import com.example.spoteam_android.IdResponse -import com.example.spoteam_android.NaverLoginRequest -import com.example.spoteam_android.NaverResponse -import com.example.spoteam_android.NaverResult -import com.example.spoteam_android.NickNameRequest -import com.example.spoteam_android.NickNameResponse -import com.example.spoteam_android.NicknameCheckResponse -import com.example.spoteam_android.ReasonApiResponse -import com.example.spoteam_android.RegionApiResponse -import com.example.spoteam_android.RegionsPreferences -import com.example.spoteam_android.SpotMemberCheckResponse -import com.example.spoteam_android.StudyReasons -import com.example.spoteam_android.ThemeApiResponse -import com.example.spoteam_android.ThemePreferences -import com.example.spoteam_android.ValidateEmailResponse -import com.example.spoteam_android.WithdrawResponse -import com.example.spoteam_android.YourResponse +package com.spot.android.login + +import com.spot.android.EmailResponse +import com.spot.android.EmailVerifyResponse +import com.spot.android.IdResponse +import com.spot.android.NaverLoginRequest +import com.spot.android.NaverResponse +import com.spot.android.NickNameRequest +import com.spot.android.NickNameResponse +import com.spot.android.NicknameCheckResponse +import com.spot.android.ReasonApiResponse +import com.spot.android.RegionApiResponse +import com.spot.android.RegionsPreferences +import com.spot.android.SpotMemberCheckResponse +import com.spot.android.StudyReasons +import com.spot.android.ThemeApiResponse +import com.spot.android.ThemePreferences +import com.spot.android.ValidateEmailResponse +import com.spot.android.WithdrawResponse +import com.spot.android.YourResponse import retrofit2.Call import retrofit2.Response import retrofit2.http.Body -import retrofit2.http.Field -import retrofit2.http.FormUrlEncoded import retrofit2.http.GET -import retrofit2.http.Header -import retrofit2.http.Headers import retrofit2.http.PATCH import retrofit2.http.POST -import retrofit2.http.Path import retrofit2.http.Query interface LoginApiService { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginRepository.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/LoginRepository.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginRepository.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/LoginRepository.kt index 7b456da4..0076de6e 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginRepository.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/LoginRepository.kt @@ -1,18 +1,16 @@ -package com.example.spoteam_android.login +package com.spot.android.login import android.util.Log -import com.example.spoteam_android.KaKaoResult -import com.example.spoteam_android.NaverLoginRequest -import com.example.spoteam_android.NaverResult -import com.example.spoteam_android.RetrofitInstance +import com.spot.android.KaKaoResult +import com.spot.android.NaverLoginRequest +import com.spot.android.NaverResult +import com.spot.android.RetrofitInstance import com.kakao.sdk.user.UserApiClient -import com.navercorp.nid.NaverIdLoginSDK import com.navercorp.nid.oauth.NidOAuthLogin import com.navercorp.nid.profile.NidProfileCallback import com.navercorp.nid.profile.data.NidProfileResponse import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import retrofit2.create class LoginRepository(private val tokenManager: TokenManager) { private val api: LoginApiService = diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginViewModel.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/LoginViewModel.kt similarity index 91% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginViewModel.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/LoginViewModel.kt index 8a9bb7d3..a100b912 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginViewModel.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/LoginViewModel.kt @@ -1,17 +1,13 @@ -package com.example.spoteam_android.login +package com.spot.android.login import android.app.Activity -import android.util.Log -import android.widget.Toast import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.spoteam_android.KaKaoResult -import com.example.spoteam_android.NaverResult -import com.example.spoteam_android.RetrofitInstance +import com.spot.android.KaKaoResult +import com.spot.android.NaverResult import com.kakao.sdk.auth.model.OAuthToken -import com.kakao.sdk.common.model.AuthErrorCause import com.kakao.sdk.user.UserApiClient import com.navercorp.nid.NaverIdLoginSDK import com.navercorp.nid.oauth.OAuthLoginCallback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginViewModelFactory.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/LoginViewModelFactory.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginViewModelFactory.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/LoginViewModelFactory.kt index 882f1bbd..7fa1135b 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LoginViewModelFactory.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/LoginViewModelFactory.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.login +package com.spot.android.login import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LogoutActivity.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/LogoutActivity.kt similarity index 94% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LogoutActivity.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/LogoutActivity.kt index 83f828d2..1c0520eb 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/LogoutActivity.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/LogoutActivity.kt @@ -1,12 +1,11 @@ -package com.example.spoteam_android.login +package com.spot.android.login import android.content.Intent import android.os.Bundle import android.util.Log import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.databinding.ActivityLogoutBinding +import com.spot.android.databinding.ActivityLogoutBinding import com.kakao.sdk.user.UserApiClient class LogoutActivity : AppCompatActivity() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/NicNameActivity.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/NicNameActivity.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/NicNameActivity.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/NicNameActivity.kt index a2d64a09..1fd006e2 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/NicNameActivity.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/NicNameActivity.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.login +package com.spot.android.login import android.app.Dialog import android.content.Intent @@ -17,14 +17,14 @@ import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat -import com.example.spoteam_android.NickNameRequest -import com.example.spoteam_android.NickNameResponse -import com.example.spoteam_android.NicknameCheckResponse -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.ActivityNicNameBinding -import com.example.spoteam_android.databinding.DialogAgreementBinding -import com.example.spoteam_android.databinding.DialogIdentificationAgreementBinding +import com.spot.android.NickNameRequest +import com.spot.android.NickNameResponse +import com.spot.android.NicknameCheckResponse +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.ActivityNicNameBinding +import com.spot.android.databinding.DialogAgreementBinding +import com.spot.android.databinding.DialogIdentificationAgreementBinding import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/NormalLoginActivity.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/NormalLoginActivity.kt similarity index 98% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/NormalLoginActivity.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/NormalLoginActivity.kt index 7b9dcb4f..4e253b33 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/NormalLoginActivity.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/NormalLoginActivity.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.login +package com.spot.android.login import android.content.Context import android.content.Intent @@ -11,9 +11,9 @@ import android.widget.EditText import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat -import com.example.spoteam_android.R -import com.example.spoteam_android.UserInfo -import com.example.spoteam_android.databinding.ActivityNormalLoginBinding +import com.spot.android.R +import com.spot.android.UserInfo +import com.spot.android.databinding.ActivityNormalLoginBinding import com.google.gson.Gson class NormalLoginActivity : AppCompatActivity() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/RegisterInformation.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/RegisterInformation.kt similarity index 91% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/RegisterInformation.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/RegisterInformation.kt index 6833f1b5..75d1e7bd 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/RegisterInformation.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/RegisterInformation.kt @@ -1,19 +1,18 @@ -package com.example.spoteam_android.login +package com.spot.android.login import android.content.Intent import android.os.Bundle import android.util.Log import android.widget.Toast import androidx.activity.ComponentActivity -import androidx.core.content.ContextCompat.startActivity import androidx.lifecycle.lifecycleScope -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.RegionsPreferences -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.StudyReasons -import com.example.spoteam_android.ThemePreferences -import com.example.spoteam_android.checklist.CheckListCategoryActivity -import com.example.spoteam_android.databinding.ActivityRegisterInformationBinding +import com.spot.android.MainActivity +import com.spot.android.RegionsPreferences +import com.spot.android.RetrofitInstance +import com.spot.android.StudyReasons +import com.spot.android.ThemePreferences +import com.spot.android.checklist.CheckListCategoryActivity +import com.spot.android.databinding.ActivityRegisterInformationBinding import com.google.gson.Gson import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/SocialLoginRetrofitInstance.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/SocialLoginRetrofitInstance.kt similarity index 88% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/SocialLoginRetrofitInstance.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/SocialLoginRetrofitInstance.kt index c4c026d0..c4448d86 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/SocialLoginRetrofitInstance.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/SocialLoginRetrofitInstance.kt @@ -1,7 +1,6 @@ -package com.example.spoteam_android.login +package com.spot.android.login -import com.example.spoteam_android.BuildConfig -import com.example.spoteam_android.RetrofitInstance +import com.spot.android.BuildConfig import okhttp3.OkHttpClient import okhttp3.Request import retrofit2.Retrofit diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/SplashActivity.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/SplashActivity.kt similarity index 89% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/SplashActivity.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/SplashActivity.kt index f4df0c17..da2325c6 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/SplashActivity.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/SplashActivity.kt @@ -1,14 +1,14 @@ -package com.example.spoteam_android +package com.spot.android import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope -import com.example.spoteam_android.databinding.ActivitySplashBinding -import com.example.spoteam_android.login.LoginApiService -import com.example.spoteam_android.login.NicNameActivity -import com.example.spoteam_android.login.StartLoginActivity -import com.example.spoteam_android.login.TokenManager +import com.spot.android.databinding.ActivitySplashBinding +import com.spot.android.login.LoginApiService +import com.spot.android.login.NicNameActivity +import com.spot.android.login.StartLoginActivity +import com.spot.android.login.TokenManager import kotlinx.coroutines.delay import kotlinx.coroutines.launch import retrofit2.Call diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/StartLoginActivity.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/StartLoginActivity.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/StartLoginActivity.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/StartLoginActivity.kt index d407ad8f..35038aa5 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/StartLoginActivity.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/StartLoginActivity.kt @@ -1,12 +1,12 @@ -package com.example.spoteam_android.login +package com.spot.android.login import android.content.Intent import android.os.Bundle import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.ViewModelProvider -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.databinding.ActivityStartLoginBinding +import com.spot.android.MainActivity +import com.spot.android.databinding.ActivityStartLoginBinding class StartLoginActivity : AppCompatActivity() { private lateinit var binding: ActivityStartLoginBinding diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/TokenManager.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/TokenManager.kt similarity index 98% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/TokenManager.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/TokenManager.kt index c7096f7b..b8555fe9 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/TokenManager.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/TokenManager.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.login +package com.spot.android.login import android.content.Context import android.content.SharedPreferences diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/TokenUtil.kt b/SPOTeam_android/app/src/main/java/com/spot/android/login/TokenUtil.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/TokenUtil.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/login/TokenUtil.kt index d81beb38..a6fc2765 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/login/TokenUtil.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/login/TokenUtil.kt @@ -1,11 +1,11 @@ -package com.example.spoteam_android.login +package com.spot.android.login import android.content.Context import android.content.Intent import android.util.Log -import com.example.spoteam_android.AuthApiService -import com.example.spoteam_android.BuildConfig -import com.example.spoteam_android.RetrofitInstance +import com.spot.android.AuthApiService +import com.spot.android.BuildConfig +import com.spot.android.RetrofitInstance import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/AppDatabase.kt b/SPOTeam_android/app/src/main/java/com/spot/android/search/AppDatabase.kt similarity index 97% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/AppDatabase.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/search/AppDatabase.kt index 3dd6f94e..9182a210 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/AppDatabase.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/search/AppDatabase.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.search +package com.spot.android.search import android.content.Context import androidx.room.Database diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/search/SearchAdapter.kt similarity index 94% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/search/SearchAdapter.kt index c6ae2dae..df44c80b 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/search/SearchAdapter.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.search +package com.spot.android.search import android.util.Log import android.view.LayoutInflater @@ -6,9 +6,9 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.BoardItem -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemRecyclerViewPlusToggleBinding +import com.spot.android.BoardItem +import com.spot.android.R +import com.spot.android.databinding.ItemRecyclerViewPlusToggleBinding class SearchAdapter( private val itemList: ArrayList, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchApiService.kt b/SPOTeam_android/app/src/main/java/com/spot/android/search/SearchApiService.kt similarity index 81% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchApiService.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/search/SearchApiService.kt index 76691340..27d6103d 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchApiService.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/search/SearchApiService.kt @@ -1,10 +1,8 @@ -package com.example.spoteam_android.search +package com.spot.android.search -import com.example.spoteam_android.ui.interestarea.ApiResponse +import com.spot.android.ui.interestarea.ApiResponse import retrofit2.Call -import retrofit2.Response import retrofit2.http.GET -import retrofit2.http.Header import retrofit2.http.Path import retrofit2.http.Query diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/search/SearchFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/search/SearchFragment.kt index 1767a45b..ea4ca4be 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/search/SearchFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.search +package com.spot.android.search import StudyApiService import StudyViewModel @@ -17,24 +17,18 @@ import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.BoardItem -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentSearchBinding -import com.example.spoteam_android.ui.interestarea.ApiResponse -import com.example.spoteam_android.ui.interestarea.InterestVPAdapter -import com.example.spoteam_android.ui.interestarea.RecommendStudyApiService -import com.example.spoteam_android.ui.interestarea.RecruitingStudyApiService -import com.example.spoteam_android.ui.study.DetailStudyFragment -import com.example.spoteam_android.ui.study.calendar.CalendarApiService -import com.example.spoteam_android.ui.study.calendar.Event -import com.example.spoteam_android.ui.study.calendar.ScheduleResponse +import com.spot.android.BoardItem +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentSearchBinding +import com.spot.android.ui.interestarea.ApiResponse +import com.spot.android.ui.interestarea.InterestVPAdapter +import com.spot.android.ui.interestarea.RecommendStudyApiService +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipDrawable -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -44,7 +38,6 @@ import retrofit2.Response import kotlinx.coroutines.Job import kotlinx.coroutines.MainScope import kotlinx.coroutines.delay -import kotlinx.coroutines.launch class SearchFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchQuery.kt b/SPOTeam_android/app/src/main/java/com/spot/android/search/SearchQuery.kt similarity index 86% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchQuery.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/search/SearchQuery.kt index 35900193..92198db2 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchQuery.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/search/SearchQuery.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.search +package com.spot.android.search import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchQueryDao.kt b/SPOTeam_android/app/src/main/java/com/spot/android/search/SearchQueryDao.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchQueryDao.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/search/SearchQueryDao.kt index 30c92c24..b5e614f7 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchQueryDao.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/search/SearchQueryDao.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.search +package com.spot.android.search import androidx.room.* diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchResultFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/search/SearchResultFragment.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchResultFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/search/SearchResultFragment.kt index 48fa7670..d38d89cd 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchResultFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/search/SearchResultFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.search +package com.spot.android.search import StudyApiService import StudyViewModel @@ -8,30 +8,24 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.ArrayAdapter import android.widget.FrameLayout import android.widget.ImageView -import android.widget.Spinner -import android.widget.TextView import android.widget.Toast -import androidx.compose.runtime.key import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.BoardItem -import com.example.spoteam_android.HouseFragment -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentSearchResultBinding -import com.example.spoteam_android.ui.alert.AlertFragment -import com.example.spoteam_android.ui.home.HomeFragment -import com.example.spoteam_android.ui.interestarea.ApiResponse -import com.example.spoteam_android.ui.interestarea.InterestFragment -import com.example.spoteam_android.ui.interestarea.InterestVPAdapter -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.BoardItem +import com.spot.android.HouseFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentSearchResultBinding +import com.spot.android.ui.alert.AlertFragment +import com.spot.android.ui.interestarea.ApiResponse +import com.spot.android.ui.interestarea.InterestVPAdapter +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchStudyData.kt b/SPOTeam_android/app/src/main/java/com/spot/android/search/SearchStudyData.kt similarity index 98% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchStudyData.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/search/SearchStudyData.kt index 10a6a6b4..e5f634f4 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/search/SearchStudyData.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/search/SearchStudyData.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.search +package com.spot.android.search import com.google.gson.annotations.SerializedName diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/AlertFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/AlertFragment.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/AlertFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/AlertFragment.kt index 332f4995..5bf19e7f 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/AlertFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/AlertFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.alert +package com.spot.android.ui.alert import StudyViewModel import android.os.Bundle @@ -6,21 +6,20 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.HouseFragment -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentAlertBinding -import com.example.spoteam_android.ui.community.AlertDetail -import com.example.spoteam_android.ui.community.AlertResponse -import com.example.spoteam_android.ui.community.AlertStudyResponse -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.NotificationStateResponse -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.HouseFragment +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentAlertBinding +import com.spot.android.ui.community.AlertDetail +import com.spot.android.ui.community.AlertResponse +import com.spot.android.ui.community.AlertStudyResponse +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.NotificationStateResponse +import com.spot.android.ui.study.DetailStudyFragment import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/AlertMultiViewRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/AlertMultiViewRVAdapter.kt similarity index 90% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/AlertMultiViewRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/AlertMultiViewRVAdapter.kt index b3c254cf..d0591aca 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/AlertMultiViewRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/AlertMultiViewRVAdapter.kt @@ -1,24 +1,15 @@ -package com.example.spoteam_android.ui.alert +package com.spot.android.ui.alert -import StudyViewModel -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.TextView -import androidx.core.content.ContextCompat import androidx.core.view.isVisible -import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.AlertInfo -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemAlertEnrollStudyBinding -import com.example.spoteam_android.databinding.ItemAlertLiveBinding -import com.example.spoteam_android.databinding.ItemAlertUpdateBinding -import com.example.spoteam_android.ui.community.AlertDetail -import com.example.spoteam_android.ui.study.DetailStudyFragment -import com.google.android.material.card.MaterialCardView +import com.spot.android.R +import com.spot.android.databinding.ItemAlertLiveBinding +import com.spot.android.databinding.ItemAlertUpdateBinding +import com.spot.android.ui.community.AlertDetail class AlertMultiViewRVAdapter( private val dataList: List diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/CheckAppliedStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/CheckAppliedStudyFragment.kt similarity index 90% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/CheckAppliedStudyFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/CheckAppliedStudyFragment.kt index 8e343716..05fae816 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/CheckAppliedStudyFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/CheckAppliedStudyFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.alert +package com.spot.android.ui.alert import android.os.Bundle import android.util.Log @@ -8,14 +8,14 @@ import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCheckAppliedStudyBinding -import com.example.spoteam_android.ui.category.CategoryFragment_1 -import com.example.spoteam_android.ui.community.AcceptedAlertStudyResponse -import com.example.spoteam_android.ui.community.AlertStudyDetail -import com.example.spoteam_android.ui.community.AlertStudyResponse -import com.example.spoteam_android.ui.community.CommunityAPIService +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCheckAppliedStudyBinding +import com.spot.android.ui.category.CategoryFragment_1 +import com.spot.android.ui.community.AcceptedAlertStudyResponse +import com.spot.android.ui.community.AlertStudyDetail +import com.spot.android.ui.community.AlertStudyResponse +import com.spot.android.ui.community.CommunityAPIService import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/CheckAppliedStudyFragmentRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/CheckAppliedStudyFragmentRVAdapter.kt similarity index 87% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/CheckAppliedStudyFragmentRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/CheckAppliedStudyFragmentRVAdapter.kt index 8472a78d..ec917015 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/CheckAppliedStudyFragmentRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/CheckAppliedStudyFragmentRVAdapter.kt @@ -1,13 +1,12 @@ -package com.example.spoteam_android.ui.alert +package com.spot.android.ui.alert import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.R -import com.example.spoteam_android.StudyInfo -import com.example.spoteam_android.databinding.ItemAppliedStudyBinding -import com.example.spoteam_android.ui.community.AlertStudyDetail +import com.spot.android.R +import com.spot.android.databinding.ItemAppliedStudyBinding +import com.spot.android.ui.community.AlertStudyDetail class CheckAppliedStudyFragmentRVAdapter(private val dataList: List) : RecyclerView.Adapter() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/OkDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/OkDialog.kt similarity index 89% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/OkDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/OkDialog.kt index b263ea1d..85c945a0 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/OkDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/OkDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.alert +package com.spot.android.ui.alert import android.content.Context import android.graphics.Color @@ -6,9 +6,9 @@ import android.graphics.drawable.ColorDrawable import android.view.Window import android.widget.ImageView import android.widget.TextView -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.ui.study.StudyFragment +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.ui.study.StudyFragment interface AttendStudyCompleteListener { fun onAttendComplete() diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/RefuseDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/RefuseDialog.kt similarity index 90% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/RefuseDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/RefuseDialog.kt index 0f6cee0a..b0cc8ef6 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/alert/RefuseDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/alert/RefuseDialog.kt @@ -1,18 +1,17 @@ -package com.example.spoteam_android.ui.alert +package com.spot.android.ui.alert import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.util.Log import android.view.Window -import android.widget.Button import android.widget.ImageView import android.widget.TextView import android.widget.Toast -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.ui.community.AcceptedAlertStudyResponse -import com.example.spoteam_android.ui.community.CommunityAPIService +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.ui.community.AcceptedAlertStudyResponse +import com.spot.android.ui.community.CommunityAPIService import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/bookMark/BookMarkRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/bookMark/BookMarkRVAdapter.kt similarity index 90% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/bookMark/BookMarkRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/bookMark/BookMarkRVAdapter.kt index 443747d9..3d5581c8 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/bookMark/BookMarkRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/bookMark/BookMarkRVAdapter.kt @@ -1,15 +1,13 @@ -package com.example.spoteam_android.ui.bookMark +package com.spot.android.ui.bookMark -import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import android.widget.ImageView import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.BookmarkItem -import com.example.spoteam_android.R -import com.example.spoteam_android.StudyItem -import com.example.spoteam_android.databinding.ItemRecyclerViewBinding +import com.spot.android.BookmarkItem +import com.spot.android.R +import com.spot.android.databinding.ItemRecyclerViewBinding class BookMarkRVAdapter( private var bookmarkitemList: ArrayList, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/bookMark/BookmarkFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/bookMark/BookmarkFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/bookMark/BookmarkFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/bookMark/BookmarkFragment.kt index fc756332..5bce5a29 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/bookMark/BookmarkFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/bookMark/BookmarkFragment.kt @@ -1,16 +1,15 @@ -package com.example.spoteam_android.ui.bookMark +package com.spot.android.ui.bookMark import StudyApiService import StudyViewModel import android.content.Context.MODE_PRIVATE -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.BookmarkItem -import com.example.spoteam_android.BookmarkResponse -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.databinding.FragmentBookmarkBinding +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.BookmarkItem +import com.spot.android.BookmarkResponse +import com.spot.android.LikeResponse +import com.spot.android.databinding.FragmentBookmarkBinding import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -19,8 +18,7 @@ import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.ui.study.DetailStudyFragment import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryFragment.kt similarity index 82% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryFragment.kt index ddc8d27b..5773a565 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryFragment.kt @@ -1,20 +1,16 @@ -package com.example.spoteam_android.ui.category +package com.spot.android.ui.category -import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView import androidx.fragment.app.Fragment -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentCategoryBinding -import com.example.spoteam_android.search.SearchFragment -import com.example.spoteam_android.ui.alert.AlertFragment -import com.example.spoteam_android.ui.home.HomeFragment -import com.google.android.material.tabs.TabLayoutMediator +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.databinding.FragmentCategoryBinding +import com.spot.android.search.SearchFragment +import com.spot.android.ui.alert.AlertFragment +import com.spot.android.ui.home.HomeFragment class CategoryFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryFragment_1.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryFragment_1.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryFragment_1.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryFragment_1.kt index c07ff8bf..46b2322d 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryFragment_1.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryFragment_1.kt @@ -1,9 +1,8 @@ -package com.example.spoteam_android.ui.category +package com.spot.android.ui.category import StudyApiService import StudyViewModel import android.content.Context -import android.graphics.PorterDuff import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -11,25 +10,23 @@ import android.view.ViewGroup import android.widget.FrameLayout import android.widget.ImageView import android.widget.TextView -import android.widget.Toast -import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.BoardItem -import com.example.spoteam_android.HouseFragment -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCategoryBinding -import com.example.spoteam_android.search.SearchFragment -import com.example.spoteam_android.ui.alert.AlertFragment -import com.example.spoteam_android.ui.community.CategoryStudyResponse -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.interestarea.ApiResponse -import com.example.spoteam_android.ui.interestarea.MyInterestStudySpecificApiService -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.BoardItem +import com.spot.android.HouseFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCategoryBinding +import com.spot.android.search.SearchFragment +import com.spot.android.ui.alert.AlertFragment +import com.spot.android.ui.community.CategoryStudyResponse +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.interestarea.ApiResponse +import com.spot.android.ui.interestarea.MyInterestStudySpecificApiService +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.tabs.TabLayout import retrofit2.Call diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryInterestFilterFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryInterestFilterFragment.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryInterestFilterFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryInterestFilterFragment.kt index 419fbe74..c23a6088 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryInterestFilterFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryInterestFilterFragment.kt @@ -1,31 +1,19 @@ -package com.example.spoteam_android.ui.category +package com.spot.android.ui.category -import com.example.spoteam_android.ui.interestarea.BottomNavVisibilityController -import com.example.spoteam_android.ui.interestarea.InterestFilterViewModel -import com.example.spoteam_android.ui.interestarea.InterestFragment +import com.spot.android.ui.interestarea.BottomNavVisibilityController import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color import android.icu.text.NumberFormat import android.os.Bundle -import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.view.inputmethod.EditorInfo -import android.view.inputmethod.InputMethodManager import androidx.core.content.ContextCompat import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentCategoryFilterBinding -import com.example.spoteam_android.databinding.FragmentInterestFilterBinding -import com.example.spoteam_android.databinding.FragmentMyInterestStudyFilterBinding -import com.example.spoteam_android.ui.myinterest.MyInterestChipViewModel +import com.spot.android.R +import com.spot.android.databinding.FragmentCategoryFilterBinding import com.google.android.material.chip.Chip -import com.google.android.material.chip.ChipDrawable import com.google.android.material.chip.ChipGroup diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryInterestViewModel.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryInterestViewModel.kt similarity index 94% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryInterestViewModel.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryInterestViewModel.kt index 46471178..0e5e2175 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryInterestViewModel.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryInterestViewModel.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.category +package com.spot.android.ui.category import androidx.lifecycle.ViewModel diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryNavViewFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryNavViewFragment.kt similarity index 85% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryNavViewFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryNavViewFragment.kt index cdb0a1cb..5dbafc4a 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryNavViewFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryNavViewFragment.kt @@ -1,15 +1,13 @@ -package com.example.spoteam_android.ui.category +package com.spot.android.ui.category import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentCategoryBinding -import com.example.spoteam_android.databinding.FragmentCategoryNavigationviewBinding -import com.google.android.material.tabs.TabLayoutMediator +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.databinding.FragmentCategoryNavigationviewBinding class CategoryNavViewFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryVPAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryVPAdapter.kt similarity index 97% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryVPAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryVPAdapter.kt index d7731bba..f0e5eb76 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/CategoryVPAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/CategoryVPAdapter.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.category +package com.spot.android.ui.category import StudyViewModel import android.view.LayoutInflater @@ -9,9 +9,9 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.BoardItem -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemRecyclerViewBinding +import com.spot.android.BoardItem +import com.spot.android.R +import com.spot.android.databinding.ItemRecyclerViewBinding class CategoryVPAdapter( var dataList: ArrayList, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/AllCategoryFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/AllCategoryFragment.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/AllCategoryFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/AllCategoryFragment.kt index 4ab12979..81043497 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/AllCategoryFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/AllCategoryFragment.kt @@ -1,32 +1,28 @@ -package com.example.spoteam_android.ui.category.category_tabs +package com.spot.android.ui.category.category_tabs import StudyApiService import StudyViewModel import android.content.Context import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.AdapterView -import android.widget.ArrayAdapter import android.widget.FrameLayout import android.widget.ImageView import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.BoardItem -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding -import com.example.spoteam_android.ui.community.CategoryStudyDetail -import com.example.spoteam_android.ui.community.CategoryStudyResponse -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.interestarea.InterestFilterFragment -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCategoryStudyContentBinding +import com.spot.android.ui.community.CategoryStudyDetail +import com.spot.android.ui.community.CategoryStudyResponse +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.interestarea.InterestFilterFragment +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/CategoryStudyContentRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/CategoryStudyContentRVAdapter.kt similarity index 88% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/CategoryStudyContentRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/CategoryStudyContentRVAdapter.kt index 03fea3c5..67283eb1 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/CategoryStudyContentRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/CategoryStudyContentRVAdapter.kt @@ -1,19 +1,13 @@ -package com.example.spoteam_android.ui.category.category_tabs +package com.spot.android.ui.category.category_tabs -import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import android.widget.ImageView import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.BoardItem -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemRecyclerViewBinding -import com.example.spoteam_android.ui.community.CategoryStudyDetail -import java.text.ParseException -import java.text.SimpleDateFormat -import java.util.Date -import java.util.Locale +import com.spot.android.R +import com.spot.android.databinding.ItemRecyclerViewBinding +import com.spot.android.ui.community.CategoryStudyDetail class CategoryStudyContentRVAdapter( var dataList: ArrayList, // ArrayList로 명시적으로 선언 diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/ContestFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/ContestFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/ContestFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/ContestFragment.kt index ce105a4c..a396012c 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/ContestFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/ContestFragment.kt @@ -1,30 +1,28 @@ -package com.example.spoteam_android.ui.category.category_tabs +package com.spot.android.ui.category.category_tabs import StudyApiService import StudyViewModel import android.content.Context import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.AdapterView -import android.widget.ArrayAdapter import android.widget.FrameLayout import android.widget.ImageView import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding -import com.example.spoteam_android.ui.community.CategoryStudyDetail -import com.example.spoteam_android.ui.community.CategoryStudyResponse -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCategoryStudyContentBinding +import com.spot.android.ui.community.CategoryStudyDetail +import com.spot.android.ui.community.CategoryStudyResponse +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/DiscussionFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/DiscussionFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/DiscussionFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/DiscussionFragment.kt index db14ba6a..78061dce 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/DiscussionFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/DiscussionFragment.kt @@ -1,30 +1,28 @@ -package com.example.spoteam_android.ui.category.category_tabs +package com.spot.android.ui.category.category_tabs import StudyApiService import StudyViewModel import android.content.Context import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.AdapterView -import android.widget.ArrayAdapter import android.widget.FrameLayout import android.widget.ImageView import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding -import com.example.spoteam_android.ui.community.CategoryStudyDetail -import com.example.spoteam_android.ui.community.CategoryStudyResponse -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCategoryStudyContentBinding +import com.spot.android.ui.community.CategoryStudyDetail +import com.spot.android.ui.community.CategoryStudyResponse +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/FreeStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/FreeStudyFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/FreeStudyFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/FreeStudyFragment.kt index 976b4b3b..c8b06d08 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/FreeStudyFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/FreeStudyFragment.kt @@ -1,30 +1,28 @@ -package com.example.spoteam_android.ui.category.category_tabs +package com.spot.android.ui.category.category_tabs import StudyApiService import StudyViewModel import android.content.Context import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.AdapterView -import android.widget.ArrayAdapter import android.widget.FrameLayout import android.widget.ImageView import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding -import com.example.spoteam_android.ui.community.CategoryStudyDetail -import com.example.spoteam_android.ui.community.CategoryStudyResponse -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCategoryStudyContentBinding +import com.spot.android.ui.community.CategoryStudyDetail +import com.spot.android.ui.community.CategoryStudyResponse +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/JobFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/JobFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/JobFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/JobFragment.kt index 18f81e69..457c451e 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/JobFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/JobFragment.kt @@ -1,30 +1,28 @@ -package com.example.spoteam_android.ui.category.category_tabs +package com.spot.android.ui.category.category_tabs import StudyApiService import StudyViewModel import android.content.Context import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.AdapterView -import android.widget.ArrayAdapter import android.widget.FrameLayout import android.widget.ImageView import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding -import com.example.spoteam_android.ui.community.CategoryStudyDetail -import com.example.spoteam_android.ui.community.CategoryStudyResponse -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCategoryStudyContentBinding +import com.spot.android.ui.community.CategoryStudyDetail +import com.spot.android.ui.community.CategoryStudyResponse +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/LanguageFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/LanguageFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/LanguageFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/LanguageFragment.kt index b83dbede..77b22e96 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/LanguageFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/LanguageFragment.kt @@ -1,30 +1,28 @@ -package com.example.spoteam_android.ui.category.category_tabs +package com.spot.android.ui.category.category_tabs import StudyApiService import StudyViewModel import android.content.Context import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.AdapterView -import android.widget.ArrayAdapter import android.widget.FrameLayout import android.widget.ImageView import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding -import com.example.spoteam_android.ui.community.CategoryStudyDetail -import com.example.spoteam_android.ui.community.CategoryStudyResponse -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCategoryStudyContentBinding +import com.spot.android.ui.community.CategoryStudyDetail +import com.spot.android.ui.community.CategoryStudyResponse +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/LicenseFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/LicenseFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/LicenseFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/LicenseFragment.kt index e3a35e86..05bda044 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/LicenseFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/LicenseFragment.kt @@ -1,30 +1,28 @@ -package com.example.spoteam_android.ui.category.category_tabs +package com.spot.android.ui.category.category_tabs import StudyApiService import StudyViewModel import android.content.Context import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.AdapterView -import android.widget.ArrayAdapter import android.widget.FrameLayout import android.widget.ImageView import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding -import com.example.spoteam_android.ui.community.CategoryStudyDetail -import com.example.spoteam_android.ui.community.CategoryStudyResponse -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCategoryStudyContentBinding +import com.spot.android.ui.community.CategoryStudyDetail +import com.spot.android.ui.community.CategoryStudyResponse +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/MajorFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/MajorFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/MajorFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/MajorFragment.kt index e7bc7661..d9bf6dd2 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/MajorFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/MajorFragment.kt @@ -1,30 +1,28 @@ -package com.example.spoteam_android.ui.category.category_tabs +package com.spot.android.ui.category.category_tabs import StudyApiService import StudyViewModel import android.content.Context import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.AdapterView -import android.widget.ArrayAdapter import android.widget.FrameLayout import android.widget.ImageView import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding -import com.example.spoteam_android.ui.community.CategoryStudyDetail -import com.example.spoteam_android.ui.community.CategoryStudyResponse -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCategoryStudyContentBinding +import com.spot.android.ui.community.CategoryStudyDetail +import com.spot.android.ui.community.CategoryStudyResponse +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/NewsFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/NewsFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/NewsFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/NewsFragment.kt index f9eff81f..34a5229d 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/NewsFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/NewsFragment.kt @@ -1,30 +1,28 @@ -package com.example.spoteam_android.ui.category.category_tabs +package com.spot.android.ui.category.category_tabs import StudyApiService import StudyViewModel import android.content.Context import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.AdapterView -import android.widget.ArrayAdapter import android.widget.FrameLayout import android.widget.ImageView import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding -import com.example.spoteam_android.ui.community.CategoryStudyDetail -import com.example.spoteam_android.ui.community.CategoryStudyResponse -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCategoryStudyContentBinding +import com.spot.android.ui.community.CategoryStudyDetail +import com.spot.android.ui.community.CategoryStudyResponse +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/ProjectFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/ProjectFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/ProjectFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/ProjectFragment.kt index 6eb162cd..d275bfa9 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/ProjectFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/ProjectFragment.kt @@ -1,30 +1,28 @@ -package com.example.spoteam_android.ui.category.category_tabs +package com.spot.android.ui.category.category_tabs import StudyApiService import StudyViewModel import android.content.Context import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.AdapterView -import android.widget.ArrayAdapter import android.widget.FrameLayout import android.widget.ImageView import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding -import com.example.spoteam_android.ui.community.CategoryStudyDetail -import com.example.spoteam_android.ui.community.CategoryStudyResponse -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCategoryStudyContentBinding +import com.spot.android.ui.community.CategoryStudyDetail +import com.spot.android.ui.community.CategoryStudyResponse +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/RestFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/RestFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/RestFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/RestFragment.kt index 25c4cf85..cf12f147 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/category/category_tabs/RestFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/category/category_tabs/RestFragment.kt @@ -1,30 +1,28 @@ -package com.example.spoteam_android.ui.category.category_tabs +package com.spot.android.ui.category.category_tabs import StudyApiService import StudyViewModel import android.content.Context import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.AdapterView -import android.widget.ArrayAdapter import android.widget.FrameLayout import android.widget.ImageView import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCategoryStudyContentBinding -import com.example.spoteam_android.ui.community.CategoryStudyDetail -import com.example.spoteam_android.ui.community.CategoryStudyResponse -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCategoryStudyContentBinding +import com.spot.android.ui.community.CategoryStudyDetail +import com.spot.android.ui.community.CategoryStudyResponse +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityAPIService.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityAPIService.kt similarity index 99% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityAPIService.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityAPIService.kt index e3ad753a..f641cb1e 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityAPIService.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityAPIService.kt @@ -1,10 +1,9 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import okhttp3.MultipartBody import okhttp3.RequestBody import retrofit2.Call import retrofit2.http.* -import java.time.LocalDate interface CommunityAPIService { @GET("/spot/posts/best") diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityCategoryVPAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityCategoryVPAdapter.kt similarity index 57% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityCategoryVPAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityCategoryVPAdapter.kt index 3d21d23c..ee4ebcf7 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityCategoryVPAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityCategoryVPAdapter.kt @@ -1,15 +1,15 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter -import com.example.spoteam_android.ui.community.communityContent.AllFragment +import com.spot.android.ui.community.communityContent.AllFragment //import com.example.spoteam_android.ui.community.communityContent.AllFragment -import com.example.spoteam_android.ui.community.communityContent.CounselingFragment -import com.example.spoteam_android.ui.community.communityContent.FreeTalkFragment -import com.example.spoteam_android.ui.community.communityContent.JobSeekingTalkFragment -import com.example.spoteam_android.ui.community.communityContent.PassingReviewFragment -import com.example.spoteam_android.ui.community.communityContent.ShareInfoFragment -import com.example.spoteam_android.ui.community.communityContent.NotificationFragment +import com.spot.android.ui.community.communityContent.CounselingFragment +import com.spot.android.ui.community.communityContent.FreeTalkFragment +import com.spot.android.ui.community.communityContent.JobSeekingTalkFragment +import com.spot.android.ui.community.communityContent.PassingReviewFragment +import com.spot.android.ui.community.communityContent.ShareInfoFragment +import com.spot.android.ui.community.communityContent.NotificationFragment class CommunityCategoryVPAdapter(fragment : Fragment) : FragmentStateAdapter(fragment) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityContentActivity.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityContentActivity.kt similarity index 99% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityContentActivity.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityContentActivity.kt index 5c1615c9..062c0a4a 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityContentActivity.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityContentActivity.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import android.content.Context import android.graphics.PorterDuff @@ -21,10 +21,10 @@ import androidx.core.view.isVisible import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.LinearLayoutManager import com.bumptech.glide.Glide -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.ActivityCommunityContentBinding -import com.example.spoteam_android.ui.community.contentComment.ContentCommentMultiViewRVAdapter +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.ActivityCommunityContentBinding +import com.spot.android.ui.community.contentComment.ContentCommentMultiViewRVAdapter import com.google.android.material.bottomsheet.BottomSheetDialogFragment import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityFragment.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityFragment.kt index 13c50bbc..971cc754 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityFragment.kt @@ -1,15 +1,14 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import android.graphics.Color -import android.graphics.Typeface import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.fragment.app.Fragment -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentCommunityBinding +import com.spot.android.R +import com.spot.android.databinding.FragmentCommunityBinding import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityHomeFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityHomeFragment.kt index bd8533f5..85066085 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityHomeFragment.kt @@ -1,22 +1,21 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import android.os.Bundle import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.HouseFragment -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCommunityHomeBinding -import com.example.spoteam_android.search.SearchFragment -import com.example.spoteam_android.ui.alert.AlertFragment -import com.example.spoteam_android.ui.home.HomeFragment +import com.spot.android.HouseFragment +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCommunityHomeBinding +import com.spot.android.search.SearchFragment +import com.spot.android.ui.alert.AlertFragment +import com.spot.android.ui.home.HomeFragment import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterAnnouncement.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityHomeRVAdapterAnnouncement.kt similarity index 91% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterAnnouncement.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityHomeRVAdapterAnnouncement.kt index e03763a6..ea9c78f8 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterAnnouncement.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityHomeRVAdapterAnnouncement.kt @@ -1,12 +1,11 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import android.content.Intent import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.databinding.ItemCommunityhomeContentWithIndexBinding -import com.kakao.sdk.template.model.Content +import com.spot.android.databinding.ItemCommunityhomeContentWithIndexBinding class CommunityHomeRVAdapterAnnouncement(private val dataList: List) : RecyclerView.Adapter() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterWithCategory.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityHomeRVAdapterWithCategory.kt similarity index 94% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterWithCategory.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityHomeRVAdapterWithCategory.kt index 13f65f25..422094fb 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterWithCategory.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityHomeRVAdapterWithCategory.kt @@ -1,10 +1,10 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import android.content.Intent import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.databinding.ItemCommunityhomeContentWithCategoryBinding +import com.spot.android.databinding.ItemCommunityhomeContentWithCategoryBinding class CommunityHomeRVAdapterWithCategory(private val dataList: List) : RecyclerView.Adapter() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterWithIndex.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityHomeRVAdapterWithIndex.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterWithIndex.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityHomeRVAdapterWithIndex.kt index 9d587b02..313c398c 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityHomeRVAdapterWithIndex.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityHomeRVAdapterWithIndex.kt @@ -1,10 +1,10 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import android.content.Intent import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.databinding.ItemCommunityhomeContentWithIndexBinding +import com.spot.android.databinding.ItemCommunityhomeContentWithIndexBinding class CommunityHomeRVAdapterWithIndex(private val dataList: List) : RecyclerView.Adapter() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityRequest.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityRequest.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityRequest.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityRequest.kt index 118ae009..229495f8 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityRequest.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityRequest.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import okhttp3.MultipartBody diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityResponse.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityResponse.kt similarity index 99% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityResponse.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityResponse.kt index 5822d554..5576e6ec 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityResponse.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityResponse.kt @@ -1,7 +1,4 @@ -package com.example.spoteam_android.ui.community - -import com.example.spoteam_android.ProfileItem -import com.example.spoteam_android.ScheduleResult +package com.spot.android.ui.community /*********Best 인기글 조회********/ data class CommunityResponse( diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityViewModel.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityViewModel.kt similarity index 72% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityViewModel.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityViewModel.kt index d611aef9..47556464 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/CommunityViewModel.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/CommunityViewModel.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import androidx.lifecycle.ViewModel diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/DeleteContentDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/DeleteContentDialog.kt similarity index 78% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/DeleteContentDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/DeleteContentDialog.kt index 9b34cd2b..0ced31b5 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/DeleteContentDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/DeleteContentDialog.kt @@ -1,18 +1,12 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable -import android.util.Log import android.view.Window import android.widget.Button -import android.widget.Toast import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response +import com.spot.android.R class DeleteContentDialog(private val context: Context) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/EditContentFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/EditContentFragment.kt similarity index 97% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/EditContentFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/EditContentFragment.kt index 976f851b..faf124d0 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/EditContentFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/EditContentFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import android.app.Activity import android.content.Intent @@ -19,10 +19,10 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.core.content.ContextCompat import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentMystudyWriteContentBinding -import com.example.spoteam_android.ui.study.WriteContentImageRVadapter +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentMystudyWriteContentBinding +import com.spot.android.ui.study.WriteContentImageRVadapter import com.google.android.material.bottomsheet.BottomSheetDialogFragment import kotlinx.coroutines.launch import okhttp3.MediaType.Companion.toMediaTypeOrNull diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/FailedDeleteContentDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/FailedDeleteContentDialog.kt similarity index 77% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/FailedDeleteContentDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/FailedDeleteContentDialog.kt index e62436a2..f772de04 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/FailedDeleteContentDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/FailedDeleteContentDialog.kt @@ -1,18 +1,12 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable -import android.util.Log import android.view.Window import android.widget.Button -import android.widget.Toast import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response +import com.spot.android.R class FailedDeleteContentDialog(private val context: Context) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/ReportContentDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/ReportContentDialog.kt similarity index 91% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/ReportContentDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/ReportContentDialog.kt index 2a23ca39..32843a4a 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/ReportContentDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/ReportContentDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import android.content.Context import android.graphics.Color @@ -6,7 +6,7 @@ import android.graphics.drawable.ColorDrawable import android.view.Window import android.widget.Button import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.R +import com.spot.android.R class ReportContentDialog(val context: Context, val fragmentManager: FragmentManager) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/WriteContentFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/WriteContentFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/WriteContentFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/WriteContentFragment.kt index 8c8ad89d..704ec9e7 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/WriteContentFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/WriteContentFragment.kt @@ -1,7 +1,6 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import android.app.Activity -import android.content.Context import android.content.Intent import android.graphics.PorterDuff import android.net.Uri @@ -18,13 +17,11 @@ import android.widget.Toast import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.core.content.ContextCompat -import androidx.core.os.bundleOf -import androidx.fragment.app.setFragmentResult import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentMystudyWriteContentBinding -import com.example.spoteam_android.ui.study.WriteContentImageRVadapter +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentMystudyWriteContentBinding +import com.spot.android.ui.study.WriteContentImageRVadapter import retrofit2.Callback import retrofit2.Response import com.google.android.material.bottomsheet.BottomSheetDialogFragment @@ -37,7 +34,6 @@ import retrofit2.Call import java.io.File import java.io.FileOutputStream import java.util.UUID -import kotlin.reflect.typeOf class WriteContentFragment() : BottomSheetDialogFragment(), AdapterView.OnItemSelectedListener { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/AllFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/AllFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/AllFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/AllFragment.kt index ba010f56..7323555b 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/AllFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/AllFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.content.Context import android.content.Intent @@ -10,10 +10,9 @@ import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCommunityCategoryContentBinding -import com.example.spoteam_android.ui.community.* +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCommunityCategoryContentBinding +import com.spot.android.ui.community.* import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/CommunityCategoryContentRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/CommunityCategoryContentRVAdapter.kt similarity index 97% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/CommunityCategoryContentRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/CommunityCategoryContentRVAdapter.kt index 0cf43789..4f6b2ed2 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/CommunityCategoryContentRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/CommunityCategoryContentRVAdapter.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.util.Log import android.view.LayoutInflater @@ -8,9 +8,9 @@ import android.widget.ImageView import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemCommunityContentBinding -import com.example.spoteam_android.ui.community.CategoryPagesDetail +import com.spot.android.R +import com.spot.android.databinding.ItemCommunityContentBinding +import com.spot.android.ui.community.CategoryPagesDetail import java.text.ParseException import java.text.SimpleDateFormat import java.util.* diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/CounselingFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/CounselingFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/CounselingFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/CounselingFragment.kt index 35dd5e8f..70691d83 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/CounselingFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/CounselingFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.content.Context import android.content.Intent @@ -7,13 +7,11 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCommunityCategoryContentBinding -import com.example.spoteam_android.ui.community.* +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCommunityCategoryContentBinding +import com.spot.android.ui.community.* import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/FreeTalkFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/FreeTalkFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/FreeTalkFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/FreeTalkFragment.kt index a516fff5..56f1cf95 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/FreeTalkFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/FreeTalkFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.content.Context import android.content.Intent @@ -7,13 +7,11 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCommunityCategoryContentBinding -import com.example.spoteam_android.ui.community.* +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCommunityCategoryContentBinding +import com.spot.android.ui.community.* import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/JobSeekingTalkFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/JobSeekingTalkFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/JobSeekingTalkFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/JobSeekingTalkFragment.kt index 94aa348d..2024fd57 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/JobSeekingTalkFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/JobSeekingTalkFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.content.Context import android.content.Intent @@ -7,13 +7,11 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCommunityCategoryContentBinding -import com.example.spoteam_android.ui.community.* +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCommunityCategoryContentBinding +import com.spot.android.ui.community.* import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/NotificationFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/NotificationFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/NotificationFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/NotificationFragment.kt index 5c070d51..f403fbca 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/NotificationFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/NotificationFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.content.Context import android.content.Intent @@ -7,13 +7,11 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCommunityCategoryContentBinding -import com.example.spoteam_android.ui.community.* +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCommunityCategoryContentBinding +import com.spot.android.ui.community.* import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/PassingReviewFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/PassingReviewFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/PassingReviewFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/PassingReviewFragment.kt index 656156ce..876f07b5 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/PassingReviewFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/PassingReviewFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.content.Context import android.content.Intent @@ -7,13 +7,11 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCommunityCategoryContentBinding -import com.example.spoteam_android.ui.community.* +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCommunityCategoryContentBinding +import com.spot.android.ui.community.* import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/ShareInfoFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/ShareInfoFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/ShareInfoFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/ShareInfoFragment.kt index 5f990ab5..9e66d05b 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/communityContent/ShareInfoFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/communityContent/ShareInfoFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.content.Context import android.content.Intent @@ -7,13 +7,11 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCommunityCategoryContentBinding -import com.example.spoteam_android.ui.community.* +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCommunityCategoryContentBinding +import com.spot.android.ui.community.* import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/contentComment/ContentCommentMultiViewRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/contentComment/ContentCommentMultiViewRVAdapter.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/contentComment/ContentCommentMultiViewRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/community/contentComment/ContentCommentMultiViewRVAdapter.kt index 35837cef..5d43b60e 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/community/contentComment/ContentCommentMultiViewRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/community/contentComment/ContentCommentMultiViewRVAdapter.kt @@ -1,14 +1,14 @@ -package com.example.spoteam_android.ui.community.contentComment +package com.spot.android.ui.community.contentComment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemContentCommentBinding -import com.example.spoteam_android.databinding.ItemContentCommentReplyBinding -import com.example.spoteam_android.ui.community.CommentsInfo +import com.spot.android.R +import com.spot.android.databinding.ItemContentCommentBinding +import com.spot.android.databinding.ItemContentCommentReplyBinding +import com.spot.android.ui.community.CommentsInfo class ContentCommentMultiViewRVAdapter(private val dataList: List) : RecyclerView.Adapter() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/home/HomeFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/home/HomeFragment.kt similarity index 81% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/home/HomeFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/home/HomeFragment.kt index 2072d0f2..3bd155d8 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/home/HomeFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/home/HomeFragment.kt @@ -1,11 +1,11 @@ -package com.example.spoteam_android.ui.home +package com.spot.android.ui.home import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.spoteam_android.databinding.FragmentHomeBinding +import com.spot.android.databinding.FragmentHomeBinding class HomeFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/BottomNavVisibilityController.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/BottomNavVisibilityController.kt similarity index 63% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/BottomNavVisibilityController.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/BottomNavVisibilityController.kt index 6291d8c7..a43229ce 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/BottomNavVisibilityController.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/BottomNavVisibilityController.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.interestarea +package com.spot.android.ui.interestarea interface BottomNavVisibilityController { fun hideBottomNav() diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestAreaApiService.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestAreaApiService.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestAreaApiService.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestAreaApiService.kt index 877a6100..6c378267 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestAreaApiService.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestAreaApiService.kt @@ -1,15 +1,13 @@ -package com.example.spoteam_android.ui.interestarea +package com.spot.android.ui.interestarea -import com.example.spoteam_android.FinishedStudyResponse -import com.example.spoteam_android.HostApiResponse -import com.example.spoteam_android.HostWithDrawl -import com.example.spoteam_android.WithdrawHostRequest +import com.spot.android.FinishedStudyResponse +import com.spot.android.HostApiResponse +import com.spot.android.HostWithDrawl +import com.spot.android.WithdrawHostRequest import retrofit2.Call import retrofit2.http.Body -import retrofit2.http.DELETE import retrofit2.http.GET import retrofit2.http.HTTP -import retrofit2.http.Header import retrofit2.http.Path import retrofit2.http.Query diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestAreaData.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestAreaData.kt similarity index 97% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestAreaData.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestAreaData.kt index 03b86935..92e3fe81 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestAreaData.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestAreaData.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.interestarea +package com.spot.android.ui.interestarea import com.google.gson.annotations.SerializedName diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFilterFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestFilterFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFilterFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestFilterFragment.kt index 9e27f797..73daad4b 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFilterFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestFilterFragment.kt @@ -1,22 +1,18 @@ -package com.example.spoteam_android.ui.interestarea +package com.spot.android.ui.interestarea import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color import android.icu.text.NumberFormat import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.view.inputmethod.EditorInfo -import android.view.inputmethod.InputMethodManager import androidx.core.content.ContextCompat import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentInterestFilterBinding +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.databinding.FragmentInterestFilterBinding import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipGroup diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFilterViewModel.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestFilterViewModel.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFilterViewModel.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestFilterViewModel.kt index 53f08409..fadbdac0 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFilterViewModel.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestFilterViewModel.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.interestarea +package com.spot.android.ui.interestarea import androidx.lifecycle.ViewModel diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestFragment.kt index 41e10b8a..7a097039 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestFragment.kt @@ -1,48 +1,35 @@ -package com.example.spoteam_android.ui.interestarea +package com.spot.android.ui.interestarea import StudyApiService import StudyViewModel -import android.annotation.SuppressLint import android.content.Context -import android.content.pm.PackageManager -import android.graphics.Typeface -import android.os.Build import android.os.Bundle -import android.util.Base64 import android.view.LayoutInflater -import android.view.MotionEvent import android.view.View import android.view.ViewGroup -import android.widget.AdapterView -import android.widget.ArrayAdapter import android.widget.FrameLayout import android.widget.ImageView -import android.widget.Spinner import android.widget.TextView import android.widget.Toast -import androidx.core.content.ContentProviderCompat import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.BoardItem -import com.example.spoteam_android.HouseFragment -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentInterestBinding -import com.example.spoteam_android.search.SearchFragment -import com.example.spoteam_android.ui.alert.AlertFragment -import com.example.spoteam_android.ui.study.DetailStudyFragment -import com.example.spoteam_android.ui.study.FixedRoundedSpinnerAdapter +import com.spot.android.BoardItem +import com.spot.android.HouseFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentInterestBinding +import com.spot.android.search.SearchFragment +import com.spot.android.ui.alert.AlertFragment +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.tabs.TabLayout import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import java.security.MessageDigest -import java.security.NoSuchAlgorithmException class InterestFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestVPAdater.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestVPAdater.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestVPAdater.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestVPAdater.kt index 384ff3dd..957db6ff 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/interestarea/InterestVPAdater.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/interestarea/InterestVPAdater.kt @@ -1,16 +1,15 @@ -package com.example.spoteam_android.ui.interestarea +package com.spot.android.ui.interestarea import StudyViewModel import android.util.Log import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup import android.widget.ImageView import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.BoardItem -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemRecyclerViewBinding +import com.spot.android.BoardItem +import com.spot.android.R +import com.spot.android.databinding.ItemRecyclerViewBinding class InterestVPAdapter( var dataList: ArrayList, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestChipViewModel.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/myinterest/MyInterestChipViewModel.kt similarity index 94% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestChipViewModel.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/myinterest/MyInterestChipViewModel.kt index 8c9ab804..786c2144 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestChipViewModel.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/myinterest/MyInterestChipViewModel.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.myinterest +package com.spot.android.ui.myinterest import androidx.lifecycle.ViewModel diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFilterFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/myinterest/MyInterestStudyFilterFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFilterFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/myinterest/MyInterestStudyFilterFragment.kt index 37418969..d0ca8f0f 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFilterFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/myinterest/MyInterestStudyFilterFragment.kt @@ -1,27 +1,20 @@ -package com.example.spoteam_android.ui.myinterest +package com.spot.android.ui.myinterest -import com.example.spoteam_android.ui.interestarea.BottomNavVisibilityController -import com.example.spoteam_android.ui.interestarea.InterestFilterViewModel -import com.example.spoteam_android.ui.interestarea.InterestFragment +import com.spot.android.ui.interestarea.BottomNavVisibilityController import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color import android.icu.text.NumberFormat import android.os.Bundle import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.view.inputmethod.EditorInfo -import android.view.inputmethod.InputMethodManager import androidx.core.content.ContextCompat import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentInterestFilterBinding -import com.example.spoteam_android.databinding.FragmentMyInterestStudyFilterBinding +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.databinding.FragmentMyInterestStudyFilterBinding import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipDrawable import com.google.android.material.chip.ChipGroup diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFilterLocationFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/myinterest/MyInterestStudyFilterLocationFragment.kt similarity index 88% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFilterLocationFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/myinterest/MyInterestStudyFilterLocationFragment.kt index 7267a59d..f651446c 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFilterLocationFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/myinterest/MyInterestStudyFilterLocationFragment.kt @@ -1,7 +1,7 @@ -package com.example.spoteam_android.ui.myinterest +package com.spot.android.ui.myinterest import LocationSearchAdapter -import com.example.spoteam_android.databinding.FragmentMyInerestStudyFilterLocationBinding +import com.spot.android.databinding.FragmentMyInerestStudyFilterLocationBinding import android.os.Bundle import android.text.Editable import android.text.TextWatcher @@ -9,18 +9,12 @@ import android.view.LayoutInflater import android.view.MotionEvent import android.view.View import android.view.ViewGroup -import android.widget.Toolbar import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentLocationStudyBinding -import com.example.spoteam_android.login.LocationItem -import com.example.spoteam_android.ui.interestarea.InterestFragment -import com.example.spoteam_android.ui.study.IntroduceStudyFragment -import com.example.spoteam_android.ui.study.OnlineStudyFragment -import com.example.spoteam_android.ui.study.RegisterStudyFragment +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.login.LocationItem import java.io.BufferedReader import java.io.InputStreamReader diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/myinterest/MyInterestStudyFragment.kt similarity index 94% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/myinterest/MyInterestStudyFragment.kt index ad4bac78..344d2e93 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/myinterest/MyInterestStudyFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/myinterest/MyInterestStudyFragment.kt @@ -1,51 +1,42 @@ -package com.example.spoteam_android.ui.myinterest +package com.spot.android.ui.myinterest import StudyApiService import StudyViewModel import android.content.Context -import android.graphics.Typeface import android.os.Bundle -import android.util.Log import android.util.Log.* import android.view.LayoutInflater -import android.view.MotionEvent import android.view.View import android.view.ViewGroup -import android.widget.AdapterView -import android.widget.ArrayAdapter import android.widget.FrameLayout import android.widget.ImageView -import android.widget.Spinner import android.widget.TextView import android.widget.Toast import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.BoardItem -import com.example.spoteam_android.HouseFragment -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentMyInterestStudyBinding -import com.example.spoteam_android.search.SearchFragment -import com.example.spoteam_android.ui.alert.AlertFragment -import com.example.spoteam_android.ui.home.HomeFragment -import com.example.spoteam_android.ui.interestarea.ApiResponse -import com.example.spoteam_android.ui.interestarea.GetInterestCategoryApiService -import com.example.spoteam_android.ui.interestarea.InterestFilterViewModel -import com.example.spoteam_android.ui.interestarea.InterestVPAdapter -import com.example.spoteam_android.ui.interestarea.MyInterestStudyAllApiService -import com.example.spoteam_android.ui.interestarea.MyInterestStudySpecificApiService -import com.example.spoteam_android.ui.study.DetailStudyFragment -import com.example.spoteam_android.ui.study.FixedRoundedSpinnerAdapter +import com.spot.android.BoardItem +import com.spot.android.HouseFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentMyInterestStudyBinding +import com.spot.android.search.SearchFragment +import com.spot.android.ui.alert.AlertFragment +import com.spot.android.ui.interestarea.ApiResponse +import com.spot.android.ui.interestarea.GetInterestCategoryApiService +import com.spot.android.ui.interestarea.InterestVPAdapter +import com.spot.android.ui.interestarea.MyInterestStudyAllApiService +import com.spot.android.ui.interestarea.MyInterestStudySpecificApiService +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.tabs.TabLayout import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import retrofit2.http.Query + class MyInterestStudyFragment : Fragment() { lateinit var binding: FragmentMyInterestStudyBinding diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/AttendanceContentDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/AttendanceContentDialog.kt similarity index 71% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/AttendanceContentDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/AttendanceContentDialog.kt index 65c5978f..dff9882c 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/AttendanceContentDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/AttendanceContentDialog.kt @@ -1,22 +1,12 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable -import android.media.Image -import android.util.Log import android.view.Window import android.widget.ImageView import android.widget.TextView -import android.widget.Toast -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.MemberAcceptResponse -import com.example.spoteam_android.ui.community.MemberIntroInfo -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response +import com.spot.android.R class AttendanceContentDialog( private val context: Context diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/AttendanceDenyDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/AttendanceDenyDialog.kt similarity index 89% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/AttendanceDenyDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/AttendanceDenyDialog.kt index 8c290d3b..c2222848 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/AttendanceDenyDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/AttendanceDenyDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.content.Context import android.graphics.Color @@ -8,12 +8,10 @@ import android.view.Window import android.widget.ImageView import android.widget.TextView import android.widget.Toast -import androidx.appcompat.app.AppCompatActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.MemberAcceptResponse -import com.example.spoteam_android.ui.community.MemberIntroInfo +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.MemberAcceptResponse import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/BoardAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/BoardAdapter.kt similarity index 94% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/BoardAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/BoardAdapter.kt index 8c3f3181..fe17631b 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/BoardAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/BoardAdapter.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import StudyFormMode import android.content.Context @@ -15,15 +15,15 @@ import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.BoardItem -import com.example.spoteam_android.HostApiResponse -import com.example.spoteam_android.HostResult -import com.example.spoteam_android.R -import com.example.spoteam_android.ReportStudyMemberFragment -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.ItemRecyclerViewPlusToggleBinding -import com.example.spoteam_android.ui.interestarea.GetHostInterface -import com.example.spoteam_android.ui.study.RegisterStudyFragment +import com.spot.android.BoardItem +import com.spot.android.HostApiResponse +import com.spot.android.HostResult +import com.spot.android.R +import com.spot.android.ReportStudyMemberFragment +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.ItemRecyclerViewPlusToggleBinding +import com.spot.android.ui.interestarea.GetHostInterface +import com.spot.android.ui.study.RegisterStudyFragment import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceContentRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ConsiderAttendanceContentRVAdapter.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceContentRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ConsiderAttendanceContentRVAdapter.kt index aed44260..f0e67378 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceContentRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ConsiderAttendanceContentRVAdapter.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.view.LayoutInflater import android.view.View @@ -8,9 +8,9 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemConsiderAttendanceBinding -import com.example.spoteam_android.ui.community.MyRecruitingStudyDetail +import com.spot.android.R +import com.spot.android.databinding.ItemConsiderAttendanceBinding +import com.spot.android.ui.community.MyRecruitingStudyDetail class ConsiderAttendanceContentRVAdapter( private var dataList: List, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ConsiderAttendanceFragment.kt similarity index 90% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ConsiderAttendanceFragment.kt index dbd3a853..8b157364 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ConsiderAttendanceFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.content.Context import android.os.Bundle @@ -9,13 +9,13 @@ import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentConsiderAttendanceBinding -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.MyRecruitingStudiesResponse -import com.example.spoteam_android.ui.study.RegisterStudyFragment +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentConsiderAttendanceBinding +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.MyRecruitingStudiesResponse +import com.spot.android.ui.study.RegisterStudyFragment import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMemberFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ConsiderAttendanceMemberFragment.kt similarity index 94% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMemberFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ConsiderAttendanceMemberFragment.kt index 04e0e697..1b4f7af3 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMemberFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ConsiderAttendanceMemberFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.os.Bundle import android.util.Log @@ -8,13 +8,13 @@ import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.GridLayoutManager -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.attendanceMemberData -import com.example.spoteam_android.databinding.FragmentConsiderAttendanceMemberBinding -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.MemberAcceptResponse -import com.example.spoteam_android.ui.community.MemberAttendanceIntroResponse -import com.example.spoteam_android.ui.community.MyStudyAttendanceMemberResponse +import com.spot.android.RetrofitInstance +import com.spot.android.attendanceMemberData +import com.spot.android.databinding.FragmentConsiderAttendanceMemberBinding +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.MemberAcceptResponse +import com.spot.android.ui.community.MemberAttendanceIntroResponse +import com.spot.android.ui.community.MyStudyAttendanceMemberResponse import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMemberVPAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ConsiderAttendanceMemberVPAdapter.kt similarity index 84% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMemberVPAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ConsiderAttendanceMemberVPAdapter.kt index 617c4725..dfdb5062 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMemberVPAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ConsiderAttendanceMemberVPAdapter.kt @@ -1,11 +1,10 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.ProfileTemperatureItem -import com.example.spoteam_android.databinding.ItemConsiderAttendanceMemberBinding +import com.spot.android.ProfileTemperatureItem +import com.spot.android.databinding.ItemConsiderAttendanceMemberBinding class ConsiderAttendanceMemberVPAdapter( private val profileList: List diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMembersRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ConsiderAttendanceMembersRVAdapter.kt similarity index 91% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMembersRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ConsiderAttendanceMembersRVAdapter.kt index 3c01a262..f831434f 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ConsiderAttendanceMembersRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ConsiderAttendanceMembersRVAdapter.kt @@ -1,12 +1,12 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.R -import com.example.spoteam_android.attendanceMemberData -import com.example.spoteam_android.databinding.ItemConsiderAttendanceMemberBinding +import com.spot.android.R +import com.spot.android.attendanceMemberData +import com.spot.android.databinding.ItemConsiderAttendanceMemberBinding class ConsiderAttendanceMembersRVAdapter(private var dataList: ArrayList) : RecyclerView.Adapter() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/EndStudyDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/EndStudyDialog.kt similarity index 94% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/EndStudyDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/EndStudyDialog.kt index 593803ed..006bbb72 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/EndStudyDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/EndStudyDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.content.Context import android.graphics.Color @@ -13,10 +13,10 @@ import android.widget.ImageView import android.widget.TextView import android.widget.Toast import androidx.core.content.ContextCompat -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.EndStudyResponse +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.EndStudyResponse import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/EndStudyFinishDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/EndStudyFinishDialog.kt similarity index 62% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/EndStudyFinishDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/EndStudyFinishDialog.kt index ce469004..bd6a25a0 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/EndStudyFinishDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/EndStudyFinishDialog.kt @@ -1,28 +1,12 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable -import android.media.Image -import android.text.Editable -import android.text.TextWatcher -import android.util.Log import android.view.Window import android.widget.Button -import android.widget.EditText import android.widget.ImageView -import android.widget.TextView -import android.widget.Toast -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.ContentResponse -import com.example.spoteam_android.ui.community.EndStudyResponse -import com.example.spoteam_android.ui.community.MemberAcceptResponse -import com.example.spoteam_android.ui.community.MemberIntroInfo -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response +import com.spot.android.R class EndStudyFinishDialog( val context: Context, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ExitStudyPopupFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ExitStudyPopupFragment.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ExitStudyPopupFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ExitStudyPopupFragment.kt index 0f9f4876..0eade9bd 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ExitStudyPopupFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ExitStudyPopupFragment.kt @@ -1,5 +1,5 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.app.Dialog import android.content.Context @@ -8,7 +8,7 @@ import android.graphics.drawable.ColorDrawable import android.view.Window import android.widget.ImageButton import android.widget.Toast -import com.example.spoteam_android.R +import com.spot.android.R class ExitStudyPopupFragment(private val context: Context, private val adapter: BoardAdapter, private val position: Int) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/FinishReportCrewDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/FinishReportCrewDialog.kt similarity index 72% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/FinishReportCrewDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/FinishReportCrewDialog.kt index c0a820ce..0cf34989 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/FinishReportCrewDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/FinishReportCrewDialog.kt @@ -1,24 +1,13 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable -import android.media.Image -import android.util.Log import android.util.TypedValue import android.view.Window import android.widget.Button import android.widget.ImageView -import android.widget.TextView -import android.widget.Toast -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.MemberAcceptResponse -import com.example.spoteam_android.ui.community.MemberIntroInfo -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response +import com.spot.android.R class FinishReportCrewDialog(private val context: Context) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/HostLeaveStudyDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/HostLeaveStudyDialog.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/HostLeaveStudyDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/HostLeaveStudyDialog.kt index 6282c497..ddb95ab6 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/HostLeaveStudyDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/HostLeaveStudyDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.app.Dialog import android.content.Context @@ -9,7 +9,7 @@ import android.widget.Button import android.widget.ImageView import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.R +import com.spot.android.R class HostLeaveStudyDialog ( diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/HostLeaveStudySuccessDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/HostLeaveStudySuccessDialog.kt similarity index 88% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/HostLeaveStudySuccessDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/HostLeaveStudySuccessDialog.kt index 54d2eb22..ce294fb8 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/HostLeaveStudySuccessDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/HostLeaveStudySuccessDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.app.Dialog import android.content.Context @@ -7,9 +7,7 @@ import android.graphics.drawable.ColorDrawable import android.view.Window import android.widget.Button import android.widget.ImageView -import androidx.fragment.app.FragmentActivity -import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.R +import com.spot.android.R class HostLeaveStudySuccessDialog( diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/LogOutCompleteDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/LogOutCompleteDialog.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/LogOutCompleteDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/LogOutCompleteDialog.kt index 5188f9f1..87f4463b 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/LogOutCompleteDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/LogOutCompleteDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.app.Dialog import android.content.Context @@ -7,7 +7,7 @@ import android.graphics.drawable.ColorDrawable import android.view.Window import android.widget.Button import android.widget.ImageView -import com.example.spoteam_android.R +import com.spot.android.R class LogOutCompleteDialog( private val context: Context, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/LogOutDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/LogOutDialog.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/LogOutDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/LogOutDialog.kt index af4b3295..f09da2b8 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/LogOutDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/LogOutDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.app.Dialog import android.content.Context @@ -7,7 +7,7 @@ import android.graphics.drawable.ColorDrawable import android.view.Window import android.widget.Button import android.widget.ImageView -import com.example.spoteam_android.R +import com.spot.android.R class LogOutDialog( private val context: Context, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MandateStudyOwnerFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MandateStudyOwnerFragment.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MandateStudyOwnerFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MandateStudyOwnerFragment.kt index db040a94..b8efe67c 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MandateStudyOwnerFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MandateStudyOwnerFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.app.Dialog import android.content.Context @@ -12,11 +12,11 @@ import android.view.Window import android.widget.Toast import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentMandateStudyOwnerBinding -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.MembersDetail -import com.example.spoteam_android.ui.community.StudyMemberResponse +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentMandateStudyOwnerBinding +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.MembersDetail +import com.spot.android.ui.community.StudyMemberResponse class MandateStudyOwnerFragment( private val context: Context, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MandateStudyOwnerReasonFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MandateStudyOwnerReasonFragment.kt similarity index 91% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MandateStudyOwnerReasonFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MandateStudyOwnerReasonFragment.kt index c5aa4607..3f5ca536 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MandateStudyOwnerReasonFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MandateStudyOwnerReasonFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.app.Dialog import android.content.Context @@ -10,11 +10,11 @@ import android.util.Log import android.util.TypedValue import android.widget.Toast import androidx.core.widget.addTextChangedListener -import com.example.spoteam_android.HostWithDrawl -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.WithdrawHostRequest -import com.example.spoteam_android.databinding.FragmentMandateStudyOwnerReasonBinding -import com.example.spoteam_android.ui.interestarea.GetHostInterface +import com.spot.android.HostWithDrawl +import com.spot.android.RetrofitInstance +import com.spot.android.WithdrawHostRequest +import com.spot.android.databinding.FragmentMandateStudyOwnerReasonBinding +import com.spot.android.ui.interestarea.GetHostInterface import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MemberLeaveStudyDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MemberLeaveStudyDialog.kt similarity index 91% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MemberLeaveStudyDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MemberLeaveStudyDialog.kt index 27fc7d11..26bf349f 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MemberLeaveStudyDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MemberLeaveStudyDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.app.Dialog import android.content.Context @@ -10,15 +10,13 @@ import android.view.Window import android.widget.Button import android.widget.ImageView import androidx.fragment.app.FragmentActivity -import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.HostWithDrawl -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.ui.interestarea.GetHostInterface +import com.spot.android.HostWithDrawl +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.ui.interestarea.GetHostInterface import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import androidx.fragment.app.setFragmentResult class MemberLeaveStudyDialog( diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MemberLeaveSuccessDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MemberLeaveSuccessDialog.kt similarity index 88% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MemberLeaveSuccessDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MemberLeaveSuccessDialog.kt index 4449b7a4..8bd9e64f 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MemberLeaveSuccessDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MemberLeaveSuccessDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.app.Dialog import android.content.Context @@ -7,9 +7,7 @@ import android.graphics.drawable.ColorDrawable import android.view.Window import android.widget.Button import android.widget.ImageView -import androidx.fragment.app.FragmentActivity -import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.R +import com.spot.android.R class MemberLeaveSuccessDialog( diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyPageFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MyPageFragment.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyPageFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MyPageFragment.kt index 19cc52ac..98fe9a44 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyPageFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MyPageFragment.kt @@ -1,6 +1,5 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage -import StudyApiService import android.annotation.SuppressLint import android.content.Context import android.content.Context.MODE_PRIVATE @@ -12,34 +11,31 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Toast -import androidx.appcompat.app.AlertDialog import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager import com.bumptech.glide.Glide -import com.example.spoteam_android.FinishedStudyItem -import com.example.spoteam_android.FinishedStudyResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.ReasonApiResponse -import com.example.spoteam_android.RegionApiResponse -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.StudyItem -import com.example.spoteam_android.StudyResponse -import com.example.spoteam_android.ThemeApiResponse -import com.example.spoteam_android.WithdrawResponse -import com.example.spoteam_android.databinding.FragmentMypageBinding -import com.example.spoteam_android.login.LoginApiService -import com.example.spoteam_android.login.StartLoginActivity -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.MyPageStudyNumInfo -import com.example.spoteam_android.ui.community.MyPageStudyNumResponse -import com.example.spoteam_android.ui.community.ScrapFragment -import com.example.spoteam_android.ui.interestarea.FinishedStudyApiService -import com.example.spoteam_android.ui.mypage.cancel.CancelDialog -import com.example.spoteam_android.ui.mypage.rule.CommunityPrivacyPolicyFragment -import com.example.spoteam_android.ui.mypage.rule.CommunityRestrictionsFragment -import com.example.spoteam_android.ui.mypage.rule.CommunityRuleFragment -import com.example.spoteam_android.ui.mypage.rule.CommunityTermsOfUseFragment +import com.spot.android.FinishedStudyItem +import com.spot.android.FinishedStudyResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.ReasonApiResponse +import com.spot.android.RegionApiResponse +import com.spot.android.RetrofitInstance +import com.spot.android.ThemeApiResponse +import com.spot.android.WithdrawResponse +import com.spot.android.databinding.FragmentMypageBinding +import com.spot.android.login.LoginApiService +import com.spot.android.login.StartLoginActivity +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.MyPageStudyNumInfo +import com.spot.android.ui.community.MyPageStudyNumResponse +import com.spot.android.ui.community.ScrapFragment +import com.spot.android.ui.interestarea.FinishedStudyApiService +import com.spot.android.ui.mypage.cancel.CancelDialog +import com.spot.android.ui.mypage.rule.CommunityPrivacyPolicyFragment +import com.spot.android.ui.mypage.rule.CommunityRestrictionsFragment +import com.spot.android.ui.mypage.rule.CommunityRuleFragment +import com.spot.android.ui.mypage.rule.CommunityTermsOfUseFragment import com.kakao.sdk.user.UserApiClient import com.navercorp.nid.NaverIdLoginSDK import retrofit2.Call diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyPageLocationFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MyPageLocationFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyPageLocationFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MyPageLocationFragment.kt index 4deaa3b7..b15c149e 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyPageLocationFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MyPageLocationFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import LocationSearchAdapter import android.os.Bundle @@ -11,10 +11,9 @@ import android.view.View import android.view.ViewGroup import android.widget.Toast import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentMyPageLocationBinding -import com.example.spoteam_android.login.LocationItem -import com.example.spoteam_android.ui.study.OnlineStudyFragment +import com.spot.android.R +import com.spot.android.databinding.FragmentMyPageLocationBinding +import com.spot.android.login.LocationItem import java.io.BufferedReader import java.io.InputStreamReader diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyStudyAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MyStudyAdapter.kt similarity index 87% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyStudyAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MyStudyAdapter.kt index a73f314b..77ad3a0c 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/MyStudyAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/MyStudyAdapter.kt @@ -1,14 +1,11 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage -import android.content.res.Resources import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.FinishedStudyItem -import com.example.spoteam_android.StudyItem -import com.example.spoteam_android.databinding.ItemCardMyStudyBinding -import com.example.spoteam_android.databinding.ItemMyStudyBinding +import com.spot.android.FinishedStudyItem +import com.spot.android.databinding.ItemCardMyStudyBinding import java.time.LocalDateTime import java.time.format.DateTimeFormatter diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ParticipatingStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ParticipatingStudyFragment.kt similarity index 94% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ParticipatingStudyFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ParticipatingStudyFragment.kt index 13fd1713..6c95ca99 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ParticipatingStudyFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ParticipatingStudyFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import StudyViewModel import android.content.Context @@ -7,19 +7,18 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.TextView import android.widget.Toast import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.BoardItem -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentParticipatingStudyBinding -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.MemberOnStudiesResponse -import com.example.spoteam_android.ui.community.MyRecruitingStudyDetail +import com.spot.android.BoardItem +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentParticipatingStudyBinding +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.MemberOnStudiesResponse +import com.spot.android.ui.community.MyRecruitingStudyDetail import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PermissionWaitFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/PermissionWaitFragment.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PermissionWaitFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/PermissionWaitFragment.kt index 6d7f5cee..d07a7758 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PermissionWaitFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/PermissionWaitFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import StudyApiService import StudyViewModel @@ -14,20 +14,18 @@ import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.BoardItem -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentParticipatingStudyBinding -import com.example.spoteam_android.databinding.FragmentPermissionWaitBinding -import com.example.spoteam_android.ui.category.CategoryFragment -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.MemberOnStudiesResponse -import com.example.spoteam_android.ui.community.MyRecruitingStudyDetail -import com.example.spoteam_android.ui.interestarea.InterestVPAdapter -import com.example.spoteam_android.ui.study.DetailStudyFragment -import com.example.spoteam_android.ui.study.StudyFragment +import com.spot.android.BoardItem +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentPermissionWaitBinding +import com.spot.android.ui.category.CategoryFragment +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.MemberOnStudiesResponse +import com.spot.android.ui.community.MyRecruitingStudyDetail +import com.spot.android.ui.interestarea.InterestVPAdapter +import com.spot.android.ui.study.DetailStudyFragment import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PurposePreferenceFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/PurposePreferenceFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PurposePreferenceFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/PurposePreferenceFragment.kt index 3ced5a49..c6dac6ae 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PurposePreferenceFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/PurposePreferenceFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.content.Context import android.os.Bundle @@ -9,12 +9,12 @@ import android.view.ViewGroup import android.widget.CompoundButton import android.widget.Toast import androidx.fragment.app.Fragment -import com.example.spoteam_android.R -import com.example.spoteam_android.ReasonApiResponse -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.StudyReasons -import com.example.spoteam_android.databinding.FragmentPurposePreferenceBinding -import com.example.spoteam_android.login.LoginApiService +import com.spot.android.R +import com.spot.android.ReasonApiResponse +import com.spot.android.RetrofitInstance +import com.spot.android.StudyReasons +import com.spot.android.databinding.FragmentPurposePreferenceBinding +import com.spot.android.login.LoginApiService import com.google.android.material.chip.Chip import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PurposeUploadComplteDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/PurposeUploadComplteDialog.kt similarity index 91% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PurposeUploadComplteDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/PurposeUploadComplteDialog.kt index 2481890b..96aa8f13 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/PurposeUploadComplteDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/PurposeUploadComplteDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.content.Context import android.graphics.Color @@ -6,9 +6,8 @@ import android.graphics.drawable.ColorDrawable import android.view.Window import android.widget.Button import android.widget.ImageView -import android.widget.TextView import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.R +import com.spot.android.R class PurposeUploadComplteDialog(private val context: Context) { private val dlg = android.app.Dialog(context) diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RegionPreferenceFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/RegionPreferenceFragment.kt similarity index 94% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RegionPreferenceFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/RegionPreferenceFragment.kt index 1a505819..7b820e72 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RegionPreferenceFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/RegionPreferenceFragment.kt @@ -1,6 +1,5 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage -import LocationStudyFragment import android.content.Context import android.os.Bundle import android.util.Log @@ -12,12 +11,12 @@ import android.widget.LinearLayout import android.widget.TextView import android.widget.Toast import androidx.core.content.res.ResourcesCompat -import com.example.spoteam_android.R -import com.example.spoteam_android.Region -import com.example.spoteam_android.RegionApiResponse -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentRegionPreferenceBinding -import com.example.spoteam_android.login.LoginApiService +import com.spot.android.R +import com.spot.android.Region +import com.spot.android.RegionApiResponse +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentRegionPreferenceBinding +import com.spot.android.login.LoginApiService import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RegionUploadCompleteDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/RegionUploadCompleteDialog.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RegionUploadCompleteDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/RegionUploadCompleteDialog.kt index 75909a02..b4c09385 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RegionUploadCompleteDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/RegionUploadCompleteDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.content.Context import android.graphics.Color @@ -7,7 +7,7 @@ import android.view.Window import android.widget.Button import android.widget.ImageView import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.R +import com.spot.android.R class RegionUploadCompleteDialog(private val context: Context) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyCrewMemberRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ReportStudyCrewMemberRVAdapter.kt similarity index 90% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyCrewMemberRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ReportStudyCrewMemberRVAdapter.kt index 468ea908..c6e2f708 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyCrewMemberRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ReportStudyCrewMemberRVAdapter.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.graphics.Color import android.view.LayoutInflater @@ -6,10 +6,9 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemDetailStudyHomeMemberBinding -import com.example.spoteam_android.ui.community.MembersDetail -import com.google.android.material.imageview.ShapeableImageView +import com.spot.android.R +import com.spot.android.databinding.ItemDetailStudyHomeMemberBinding +import com.spot.android.ui.community.MembersDetail class ReportStudyCrewMemberRVAdapter( private var dataList: List, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyMemberContentFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ReportStudyMemberContentFragment.kt similarity index 89% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyMemberContentFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ReportStudyMemberContentFragment.kt index 1377ca67..bc0b9dc4 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyMemberContentFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ReportStudyMemberContentFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android +package com.spot.android import android.content.Context import android.graphics.Color @@ -8,13 +8,12 @@ import android.text.TextWatcher import android.util.TypedValue import android.view.LayoutInflater import android.view.Window -import android.view.WindowManager import android.widget.Toast -import com.example.spoteam_android.databinding.DialogReportMemberContentBinding -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.ReportCrewRequest -import com.example.spoteam_android.ui.community.ReportCrewResponse -import com.example.spoteam_android.ui.mypage.FinishReportCrewDialog +import com.spot.android.databinding.DialogReportMemberContentBinding +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.ReportCrewRequest +import com.spot.android.ui.community.ReportCrewResponse +import com.spot.android.ui.mypage.FinishReportCrewDialog import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyMemberFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ReportStudyMemberFragment.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyMemberFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ReportStudyMemberFragment.kt index 16a66586..835989ea 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ReportStudyMemberFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ReportStudyMemberFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android +package com.spot.android import android.app.Dialog import android.content.Context @@ -9,11 +9,11 @@ import android.util.TypedValue import android.view.Window import android.widget.Toast import androidx.recyclerview.widget.GridLayoutManager -import com.example.spoteam_android.databinding.DialogReportStudymemberBinding -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.MembersDetail -import com.example.spoteam_android.ui.community.StudyMemberResponse -import com.example.spoteam_android.ui.mypage.ReportStudyCrewMemberRVAdapter +import com.spot.android.databinding.DialogReportStudymemberBinding +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.MembersDetail +import com.spot.android.ui.community.StudyMemberResponse +import com.spot.android.ui.mypage.ReportStudyCrewMemberRVAdapter import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RightSpaceItemDecoration.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/RightSpaceItemDecoration.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RightSpaceItemDecoration.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/RightSpaceItemDecoration.kt index a5a2ca71..a5709817 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/RightSpaceItemDecoration.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/RightSpaceItemDecoration.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.graphics.Rect import android.view.View diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/TemporaryRegionFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/TemporaryRegionFragment.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/TemporaryRegionFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/TemporaryRegionFragment.kt index 9eabbf0d..d79ad575 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/TemporaryRegionFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/TemporaryRegionFragment.kt @@ -1,9 +1,8 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.content.Context import android.os.Bundle import android.util.Log -import android.util.TypedValue import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View @@ -11,14 +10,11 @@ import android.view.ViewGroup import android.widget.LinearLayout import android.widget.TextView import androidx.core.content.res.ResourcesCompat -import com.example.spoteam_android.R -import com.example.spoteam_android.RegionsPreferences -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentTemporaryRegionBinding -import com.example.spoteam_android.login.LoginApiService -import com.google.android.material.chip.Chip -import com.google.android.material.chip.ChipDrawable -import com.google.android.material.chip.ChipGroup +import com.spot.android.R +import com.spot.android.RegionsPreferences +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentTemporaryRegionBinding +import com.spot.android.login.LoginApiService import retrofit2.Call import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ThemePreferenceFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ThemePreferenceFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ThemePreferenceFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ThemePreferenceFragment.kt index 53cc600e..89bc25b5 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ThemePreferenceFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ThemePreferenceFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.content.Context import android.os.Bundle @@ -9,12 +9,11 @@ import android.view.ViewGroup import android.widget.CompoundButton import android.widget.Toast import androidx.fragment.app.Fragment -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.ThemeApiResponse -import com.example.spoteam_android.ThemePreferences -import com.example.spoteam_android.databinding.FragmentThemePreferenceBinding -import com.example.spoteam_android.login.LoginApiService +import com.spot.android.RetrofitInstance +import com.spot.android.ThemeApiResponse +import com.spot.android.ThemePreferences +import com.spot.android.databinding.FragmentThemePreferenceBinding +import com.spot.android.login.LoginApiService import com.google.android.material.chip.Chip import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ThemeUploadCompleteDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ThemeUploadCompleteDialog.kt similarity index 89% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ThemeUploadCompleteDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ThemeUploadCompleteDialog.kt index 6c0882d4..ea119a9c 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/ThemeUploadCompleteDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/ThemeUploadCompleteDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.content.Context import android.graphics.Color @@ -7,8 +7,7 @@ import android.view.Window import android.widget.Button import android.widget.ImageView import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.R -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.R class ThemeUploadCompleteDialog (private val context: Context) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/cancel/CancelDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/cancel/CancelDialog.kt similarity index 91% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/cancel/CancelDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/cancel/CancelDialog.kt index 0b0e7089..834e6520 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/cancel/CancelDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/cancel/CancelDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage.cancel +package com.spot.android.ui.mypage.cancel import android.app.Dialog import android.content.Context @@ -7,7 +7,7 @@ import android.graphics.drawable.ColorDrawable import android.view.Window import android.widget.Button import android.widget.ImageView -import com.example.spoteam_android.R +import com.spot.android.R class CancelDialog( private val context: Context, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/cancel/CancelFinishDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/cancel/CancelFinishDialog.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/cancel/CancelFinishDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/cancel/CancelFinishDialog.kt index 906857bc..66309f7f 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/cancel/CancelFinishDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/cancel/CancelFinishDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.mypage +package com.spot.android.ui.mypage import android.app.Dialog import android.content.Context @@ -7,7 +7,7 @@ import android.graphics.drawable.ColorDrawable import android.view.Window import android.widget.Button import android.widget.ImageView -import com.example.spoteam_android.R +import com.spot.android.R class CancelFinishDialog( private val context: Context, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityPrivacyPolicyFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/rule/CommunityPrivacyPolicyFragment.kt similarity index 64% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityPrivacyPolicyFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/rule/CommunityPrivacyPolicyFragment.kt index 52552555..d14bde77 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityPrivacyPolicyFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/rule/CommunityPrivacyPolicyFragment.kt @@ -1,14 +1,11 @@ -package com.example.spoteam_android.ui.mypage.rule +package com.spot.android.ui.mypage.rule import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.spoteam_android.databinding.FragmentCommunityPrivacyBinding -import com.example.spoteam_android.databinding.FragmentCommunityRuleBinding -import com.example.spoteam_android.databinding.FragmentCommunityTermsBinding -import com.example.spoteam_android.databinding.FragmentMypageBinding +import com.spot.android.databinding.FragmentCommunityPrivacyBinding class CommunityPrivacyPolicyFragment : Fragment() { private lateinit var binding: FragmentCommunityPrivacyBinding diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityRestrictionsFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/rule/CommunityRestrictionsFragment.kt similarity index 70% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityRestrictionsFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/rule/CommunityRestrictionsFragment.kt index 5e0db047..857f6643 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityRestrictionsFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/rule/CommunityRestrictionsFragment.kt @@ -1,13 +1,11 @@ -package com.example.spoteam_android.ui.mypage.rule +package com.spot.android.ui.mypage.rule import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.spoteam_android.databinding.FragmentCommunityRestrictionBinding -import com.example.spoteam_android.databinding.FragmentCommunityRuleBinding -import com.example.spoteam_android.databinding.FragmentMypageBinding +import com.spot.android.databinding.FragmentCommunityRestrictionBinding class CommunityRestrictionsFragment : Fragment() { private lateinit var binding: FragmentCommunityRestrictionBinding diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityRuleFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/rule/CommunityRuleFragment.kt similarity index 76% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityRuleFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/rule/CommunityRuleFragment.kt index 68f836b6..abd59253 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityRuleFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/rule/CommunityRuleFragment.kt @@ -1,12 +1,11 @@ -package com.example.spoteam_android.ui.mypage.rule +package com.spot.android.ui.mypage.rule import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.spoteam_android.databinding.FragmentCommunityRuleBinding -import com.example.spoteam_android.databinding.FragmentMypageBinding +import com.spot.android.databinding.FragmentCommunityRuleBinding class CommunityRuleFragment : Fragment() { private lateinit var binding: FragmentCommunityRuleBinding diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityTermsOfUseFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/rule/CommunityTermsOfUseFragment.kt similarity index 64% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityTermsOfUseFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/rule/CommunityTermsOfUseFragment.kt index 89c67f95..b3c711e6 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/rule/CommunityTermsOfUseFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/rule/CommunityTermsOfUseFragment.kt @@ -1,14 +1,11 @@ -package com.example.spoteam_android.ui.mypage.rule +package com.spot.android.ui.mypage.rule import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.spoteam_android.databinding.FragmentCommunityPrivacyBinding -import com.example.spoteam_android.databinding.FragmentCommunityRuleBinding -import com.example.spoteam_android.databinding.FragmentCommunityTermsBinding -import com.example.spoteam_android.databinding.FragmentMypageBinding +import com.spot.android.databinding.FragmentCommunityTermsBinding class CommunityTermsOfUseFragment : Fragment() { private lateinit var binding: FragmentCommunityTermsBinding diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/ScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/ScrapFragment.kt similarity index 87% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/ScrapFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/ScrapFragment.kt index 1de79239..359fcbef 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/ScrapFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/ScrapFragment.kt @@ -1,22 +1,17 @@ -package com.example.spoteam_android.ui.community +package com.spot.android.ui.community import android.graphics.Color import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.fragment.app.Fragment -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentCommunityBinding -import com.example.spoteam_android.ui.mypage.scrap.ScrapVPAdapter +import com.spot.android.R +import com.spot.android.databinding.FragmentCommunityBinding +import com.spot.android.ui.mypage.scrap.ScrapVPAdapter import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response class ScrapFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/ScrapVPAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/ScrapVPAdapter.kt similarity index 56% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/ScrapVPAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/ScrapVPAdapter.kt index 61951f34..f905145f 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/ScrapVPAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/ScrapVPAdapter.kt @@ -1,15 +1,15 @@ -package com.example.spoteam_android.ui.mypage.scrap +package com.spot.android.ui.mypage.scrap import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter -import com.example.spoteam_android.ui.community.communityContent.AllScrapFragment +import com.spot.android.ui.community.communityContent.AllScrapFragment //import com.example.spoteam_android.ui.community.communityContent.AllFragment -import com.example.spoteam_android.ui.community.communityContent.CounselingScrapFragment -import com.example.spoteam_android.ui.community.communityContent.FreeTalkScrapFragment -import com.example.spoteam_android.ui.community.communityContent.JobSeekingTalkScrapFragment -import com.example.spoteam_android.ui.community.communityContent.PassingReviewScrapFragment -import com.example.spoteam_android.ui.community.communityContent.ShareInfoScrapFragment -import com.example.spoteam_android.ui.community.communityContent.NotificationScrapFragment +import com.spot.android.ui.community.communityContent.CounselingScrapFragment +import com.spot.android.ui.community.communityContent.FreeTalkScrapFragment +import com.spot.android.ui.community.communityContent.JobSeekingTalkScrapFragment +import com.spot.android.ui.community.communityContent.PassingReviewScrapFragment +import com.spot.android.ui.community.communityContent.ShareInfoScrapFragment +import com.spot.android.ui.community.communityContent.NotificationScrapFragment class ScrapVPAdapter(fragment : Fragment) : FragmentStateAdapter(fragment) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/AllScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/AllScrapFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/AllScrapFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/AllScrapFragment.kt index 29f763e6..27267a99 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/AllScrapFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/AllScrapFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.content.Context import android.content.Intent @@ -10,11 +10,11 @@ import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentScrapContentBinding -import com.example.spoteam_android.ui.community.* +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentScrapContentBinding +import com.spot.android.ui.community.* import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/CounselingScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/CounselingScrapFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/CounselingScrapFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/CounselingScrapFragment.kt index 5f128378..7c0f5cc0 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/CounselingScrapFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/CounselingScrapFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.content.Context import android.content.Intent @@ -10,11 +10,11 @@ import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentScrapContentBinding -import com.example.spoteam_android.ui.community.* +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentScrapContentBinding +import com.spot.android.ui.community.* import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/FreeTalkScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/FreeTalkScrapFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/FreeTalkScrapFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/FreeTalkScrapFragment.kt index a299d337..79118555 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/FreeTalkScrapFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/FreeTalkScrapFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.content.Context import android.content.Intent @@ -10,11 +10,11 @@ import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentScrapContentBinding -import com.example.spoteam_android.ui.community.* +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentScrapContentBinding +import com.spot.android.ui.community.* import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/JobSeekingTalkScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/JobSeekingTalkScrapFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/JobSeekingTalkScrapFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/JobSeekingTalkScrapFragment.kt index 2edfe28f..b3aba38a 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/JobSeekingTalkScrapFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/JobSeekingTalkScrapFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.content.Context import android.content.Intent @@ -10,11 +10,11 @@ import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentScrapContentBinding -import com.example.spoteam_android.ui.community.* +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentScrapContentBinding +import com.spot.android.ui.community.* import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/NotificationScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/NotificationScrapFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/NotificationScrapFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/NotificationScrapFragment.kt index 7504a5b4..c525cacf 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/NotificationScrapFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/NotificationScrapFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.content.Context import android.content.Intent @@ -10,11 +10,11 @@ import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentScrapContentBinding -import com.example.spoteam_android.ui.community.* +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentScrapContentBinding +import com.spot.android.ui.community.* import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/PassingReviewScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/PassingReviewScrapFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/PassingReviewScrapFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/PassingReviewScrapFragment.kt index eecf36be..491208c8 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/PassingReviewScrapFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/PassingReviewScrapFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.content.Context import android.content.Intent @@ -10,11 +10,11 @@ import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentScrapContentBinding -import com.example.spoteam_android.ui.community.* +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentScrapContentBinding +import com.spot.android.ui.community.* import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/ScrapContentRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/ScrapContentRVAdapter.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/ScrapContentRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/ScrapContentRVAdapter.kt index bb9425e1..8de683bf 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/ScrapContentRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/ScrapContentRVAdapter.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.util.Log import android.view.LayoutInflater @@ -7,9 +7,9 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemCommunityContentBinding -import com.example.spoteam_android.ui.community.CategoryPagesDetail +import com.spot.android.R +import com.spot.android.databinding.ItemCommunityContentBinding +import com.spot.android.ui.community.CategoryPagesDetail import java.text.ParseException import java.text.SimpleDateFormat import java.util.Locale diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/ShareInfoScrapFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/ShareInfoScrapFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/ShareInfoScrapFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/ShareInfoScrapFragment.kt index db290c96..b2d31546 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/mypage/scrap/scrapContent/ShareInfoScrapFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/mypage/scrap/scrapContent/ShareInfoScrapFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.community.communityContent +package com.spot.android.ui.community.communityContent import android.content.Context import android.content.Intent @@ -10,11 +10,11 @@ import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentScrapContentBinding -import com.example.spoteam_android.ui.community.* +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentScrapContentBinding +import com.spot.android.ui.community.* import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingChipViewModel.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/recruiting/RecruitingChipViewModel.kt similarity index 94% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingChipViewModel.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/recruiting/RecruitingChipViewModel.kt index 6111bf58..7c027f94 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingChipViewModel.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/recruiting/RecruitingChipViewModel.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.recruiting +package com.spot.android.ui.recruiting import androidx.lifecycle.ViewModel diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFilterFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/recruiting/RecruitingStudyFilterFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFilterFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/recruiting/RecruitingStudyFilterFragment.kt index afac9c61..e3ad259c 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFilterFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/recruiting/RecruitingStudyFilterFragment.kt @@ -1,26 +1,20 @@ -package com.example.spoteam_android.ui.recruiting +package com.spot.android.ui.recruiting -import com.example.spoteam_android.ui.interestarea.BottomNavVisibilityController -import com.example.spoteam_android.ui.interestarea.InterestFilterViewModel -import com.example.spoteam_android.ui.interestarea.InterestFragment +import com.spot.android.ui.interestarea.BottomNavVisibilityController import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color import android.icu.text.NumberFormat import android.os.Bundle import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.view.inputmethod.EditorInfo -import android.view.inputmethod.InputMethodManager import androidx.core.content.ContextCompat import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentRecruitingStudyFilterBinding +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.databinding.FragmentRecruitingStudyFilterBinding import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipDrawable import com.google.android.material.chip.ChipGroup diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFilterLocationFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/recruiting/RecruitingStudyFilterLocationFragment.kt similarity index 87% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFilterLocationFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/recruiting/RecruitingStudyFilterLocationFragment.kt index 166e422b..92e068e0 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFilterLocationFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/recruiting/RecruitingStudyFilterLocationFragment.kt @@ -1,5 +1,5 @@ -package com.example.spoteam_android.ui.recruiting +package com.spot.android.ui.recruiting import LocationSearchAdapter import android.os.Bundle @@ -9,20 +9,13 @@ import android.view.LayoutInflater import android.view.MotionEvent import android.view.View import android.view.ViewGroup -import android.widget.Toolbar import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentLocationStudyBinding -import com.example.spoteam_android.databinding.FragmentRecruitingStudyFilterBinding -import com.example.spoteam_android.databinding.FragmentRecruitingStudyFilterLocationBinding -import com.example.spoteam_android.login.LocationItem -import com.example.spoteam_android.ui.interestarea.InterestFragment -import com.example.spoteam_android.ui.study.IntroduceStudyFragment -import com.example.spoteam_android.ui.study.OnlineStudyFragment -import com.example.spoteam_android.ui.study.RegisterStudyFragment +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.databinding.FragmentRecruitingStudyFilterLocationBinding +import com.spot.android.login.LocationItem import java.io.BufferedReader import java.io.InputStreamReader diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/recruiting/RecruitingStudyFragment.kt similarity index 94% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/recruiting/RecruitingStudyFragment.kt index f83a6b54..3eed7b7a 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/recruiting/RecruitingStudyFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/recruiting/RecruitingStudyFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.recruiting +package com.spot.android.ui.recruiting import StudyApiService import StudyViewModel @@ -7,30 +7,25 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.AdapterView -import android.widget.ArrayAdapter import android.widget.FrameLayout import android.widget.ImageView -import android.widget.Spinner -import android.widget.TextView -import android.widget.Toast import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.BoardItem -import com.example.spoteam_android.HouseFragment -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentRecruitingStudyBinding -import com.example.spoteam_android.search.SearchFragment -import com.example.spoteam_android.ui.alert.AlertFragment -import com.example.spoteam_android.ui.interestarea.ApiResponse -import com.example.spoteam_android.ui.interestarea.InterestVPAdapter -import com.example.spoteam_android.ui.interestarea.RecruitingStudyApiService -import com.example.spoteam_android.ui.study.DetailStudyFragment +import com.spot.android.BoardItem +import com.spot.android.HouseFragment +import com.spot.android.LikeResponse +import com.spot.android.MainActivity +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentRecruitingStudyBinding +import com.spot.android.search.SearchFragment +import com.spot.android.ui.alert.AlertFragment +import com.spot.android.ui.interestarea.ApiResponse +import com.spot.android.ui.interestarea.InterestVPAdapter +import com.spot.android.ui.interestarea.RecruitingStudyApiService +import com.spot.android.ui.study.DetailStudyFragment import com.google.android.material.bottomsheet.BottomSheetDialog import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ActivityFeeStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/ActivityFeeStudyFragment.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ActivityFeeStudyFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/ActivityFeeStudyFragment.kt index b7a89401..a574dfff 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ActivityFeeStudyFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/ActivityFeeStudyFragment.kt @@ -1,22 +1,16 @@ -import android.content.Context -import android.net.Uri import android.os.Bundle import android.text.Editable import android.text.TextWatcher -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Toast -import androidx.activity.ComponentActivity.MODE_PRIVATE import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentActivityFeeStudyBinding -import com.example.spoteam_android.ui.mypage.PurposeUploadComplteDialog -import com.example.spoteam_android.ui.study.CorrectStudyCompleteDialog -import com.example.spoteam_android.ui.study.MyStudyRegisterPreviewFragment +import com.spot.android.R +import com.spot.android.databinding.FragmentActivityFeeStudyBinding +import com.spot.android.ui.study.CorrectStudyCompleteDialog +import com.spot.android.ui.study.MyStudyRegisterPreviewFragment class ActivityFeeStudyFragment : Fragment() { private lateinit var binding: FragmentActivityFeeStudyBinding private val viewModel: StudyViewModel by activityViewModels() diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ApplyStudyDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/ApplyStudyDialog.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ApplyStudyDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/ApplyStudyDialog.kt index dbe7e3ba..1b2ca9b0 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ApplyStudyDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/ApplyStudyDialog.kt @@ -2,7 +2,6 @@ import android.app.Dialog import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable -import android.media.Image import android.text.Editable import android.text.TextWatcher import android.util.Log @@ -11,12 +10,11 @@ import android.widget.Button import android.widget.EditText import android.widget.ImageView import android.widget.Toast -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.StudyApplyResponse -import com.example.spoteam_android.StudyDetailsResponse -import com.example.spoteam_android.ui.study.DetailStudyFragment -import com.example.spoteam_android.ui.study.DetailStudyHomeFragment +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.StudyApplyResponse +import com.spot.android.StudyDetailsResponse +import com.spot.android.ui.study.DetailStudyFragment import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/CompleteScheduleDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/CompleteScheduleDialog.kt similarity index 86% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/CompleteScheduleDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/CompleteScheduleDialog.kt index 40455b12..db3c0ad3 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/CompleteScheduleDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/CompleteScheduleDialog.kt @@ -1,13 +1,11 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable -import android.os.Bundle import android.view.Window import android.widget.Button -import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.R +import com.spot.android.R class CompleteScheduleDialog (private val context: Context, private val startDateTime: String) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/CorrectStudyCompleteDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/CorrectStudyCompleteDialog.kt similarity index 83% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/CorrectStudyCompleteDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/CorrectStudyCompleteDialog.kt index 5801313b..c9822c43 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/CorrectStudyCompleteDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/CorrectStudyCompleteDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.content.Context @@ -7,11 +7,9 @@ import android.graphics.drawable.ColorDrawable import android.view.Window import android.widget.Button import android.widget.ImageView -import android.widget.TextView import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.R -import com.example.spoteam_android.ui.mypage.ParticipatingStudyFragment -import com.example.spoteam_android.ui.mypage.PurposePreferenceFragment +import com.spot.android.R +import com.spot.android.ui.mypage.ParticipatingStudyFragment class CorrectStudyCompleteDialog(private val context: Context) { private val dlg = android.app.Dialog(context) diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DeleteStudyContentDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DeleteStudyContentDialog.kt similarity index 78% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DeleteStudyContentDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DeleteStudyContentDialog.kt index 87bf6ae6..382ac062 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DeleteStudyContentDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DeleteStudyContentDialog.kt @@ -1,18 +1,12 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable -import android.util.Log import android.view.Window import android.widget.Button -import android.widget.Toast import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response +import com.spot.android.R class DeleteStudyContentDialog(private val context: Context) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DetailStudyFragment.kt similarity index 97% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DetailStudyFragment.kt index 17d20baa..13ba5531 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DetailStudyFragment.kt @@ -1,10 +1,9 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import ApplyStudyDialog import StudyApiService import StudyViewModel import android.content.Context -import android.content.SharedPreferences import android.graphics.drawable.GradientDrawable import android.os.Bundle import android.view.LayoutInflater @@ -16,9 +15,9 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.viewpager2.widget.ViewPager2 import com.bumptech.glide.Glide -import com.example.spoteam_android.* -import com.example.spoteam_android.databinding.FragmentDetailStudyBinding -import com.example.spoteam_android.ui.category.CategoryFragment_1 +import com.spot.android.* +import com.spot.android.databinding.FragmentDetailStudyBinding +import com.spot.android.ui.category.CategoryFragment_1 import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator import retrofit2.Call diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DetailStudyHomeAdapter.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DetailStudyHomeAdapter.kt index ffdbab78..e629a893 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DetailStudyHomeAdapter.kt @@ -1,9 +1,9 @@ -package com.example.spoteam_android +package com.spot.android import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.databinding.ItemDetailFragmentSceduleRvBinding +import com.spot.android.databinding.ItemDetailFragmentSceduleRvBinding class DetailStudyHomeAdapter(private val itemList: ArrayList) : RecyclerView.Adapter() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DetailStudyHomeFragment.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DetailStudyHomeFragment.kt index d256bcbe..a8285a4f 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DetailStudyHomeFragment.kt @@ -1,34 +1,24 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study -import ApplyStudyDialog import StudyApiService import StudyViewModel import android.content.Context -import android.graphics.drawable.GradientDrawable import android.os.Bundle import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast -import androidx.constraintlayout.widget.ConstraintLayout -import androidx.constraintlayout.widget.ConstraintSet -import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.DetailStudyHomeAdapter -import com.example.spoteam_android.HouseFragment -import com.example.spoteam_android.IsAppliedResponse -import com.example.spoteam_android.MemberResponse -import com.example.spoteam_android.ProfileItem -import com.example.spoteam_android.R -import com.example.spoteam_android.RecentAnnounceResponse -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.SceduleItem -import com.example.spoteam_android.ScheduleListResponse -import com.example.spoteam_android.databinding.FragmentDetailStudyHomeBinding -import com.example.spoteam_android.ui.mypage.PurposeUploadComplteDialog +import com.spot.android.DetailStudyHomeAdapter +import com.spot.android.MemberResponse +import com.spot.android.ProfileItem +import com.spot.android.RecentAnnounceResponse +import com.spot.android.RetrofitInstance +import com.spot.android.SceduleItem +import com.spot.android.ScheduleListResponse +import com.spot.android.databinding.FragmentDetailStudyHomeBinding import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeProfileAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DetailStudyHomeProfileAdapter.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeProfileAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DetailStudyHomeProfileAdapter.kt index cd53ccd3..b0607712 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyHomeProfileAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DetailStudyHomeProfileAdapter.kt @@ -1,17 +1,16 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.content.res.ColorStateList -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.ProfileItem -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemDetailStudyHomeMemberBinding +import com.spot.android.ProfileItem +import com.spot.android.R +import com.spot.android.databinding.ItemDetailStudyHomeMemberBinding class DetailStudyHomeProfileAdapter( private var profiles: MutableList, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyVPAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DetailStudyVPAdapter.kt similarity index 76% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyVPAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DetailStudyVPAdapter.kt index ff491de8..76f96900 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/DetailStudyVPAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/DetailStudyVPAdapter.kt @@ -1,12 +1,10 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.os.Bundle -import android.provider.Settings.Global.putInt import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter -import com.example.spoteam_android.ui.study.todolist.TodoListFragment -import com.example.spoteam_android.ui.study.calendar.CalendarFragment -import com.example.spoteam_android.ui.home.HomeFragment +import com.spot.android.ui.study.todolist.TodoListFragment +import com.spot.android.ui.study.calendar.CalendarFragment class DetailStudyVPAdapter(fragment: Fragment, private val studyId: Int, private val startDateTime: String?) : FragmentStateAdapter(fragment) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/FailedDeleteStudyContentDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/FailedDeleteStudyContentDialog.kt similarity index 91% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/FailedDeleteStudyContentDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/FailedDeleteStudyContentDialog.kt index 70821e11..fb081a07 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/FailedDeleteStudyContentDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/FailedDeleteStudyContentDialog.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.content.Context import android.graphics.Color @@ -6,7 +6,7 @@ import android.graphics.drawable.ColorDrawable import android.view.Window import android.widget.Button import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.R +import com.spot.android.R class FailedDeleteStudyContentDialog(private val context: Context) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/FixedRoundedSpinnerAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/FixedRoundedSpinnerAdapter.kt similarity index 81% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/FixedRoundedSpinnerAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/FixedRoundedSpinnerAdapter.kt index 12c39e9f..4bdd20ef 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/FixedRoundedSpinnerAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/FixedRoundedSpinnerAdapter.kt @@ -1,13 +1,11 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.content.Context import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter -import android.widget.TextView -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.SpinnerDropdownItemBinding +import com.spot.android.R +import com.spot.android.databinding.SpinnerDropdownItemBinding class FixedRoundedSpinnerAdapter( context: Context, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/IntroduceStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/IntroduceStudyFragment.kt similarity index 98% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/IntroduceStudyFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/IntroduceStudyFragment.kt index b6d09822..c5c11886 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/IntroduceStudyFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/IntroduceStudyFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import StudyViewModel import android.app.Activity @@ -20,8 +20,8 @@ import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import com.bumptech.glide.Glide -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentIntroduceStudyBinding +import com.spot.android.R +import com.spot.android.databinding.FragmentIntroduceStudyBinding class IntroduceStudyFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/IntroduceStudyShortFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/IntroduceStudyShortFragment.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/IntroduceStudyShortFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/IntroduceStudyShortFragment.kt index 0dd6f1b3..90d81bf0 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/IntroduceStudyShortFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/IntroduceStudyShortFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import StudyViewModel import android.content.Context @@ -10,8 +10,8 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.activityViewModels import com.bumptech.glide.Glide -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentIntroduceStudyShortBinding +import com.spot.android.R +import com.spot.android.databinding.FragmentIntroduceStudyShortBinding class IntroduceStudyShortFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/LocationStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/LocationStudyFragment.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/LocationStudyFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/LocationStudyFragment.kt index 0aa691b2..ee0a7307 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/LocationStudyFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/LocationStudyFragment.kt @@ -7,12 +7,10 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentLocationStudyBinding -import com.example.spoteam_android.login.LocationItem -import com.example.spoteam_android.ui.study.IntroduceStudyFragment -import com.example.spoteam_android.ui.study.OnlineStudyFragment -import com.example.spoteam_android.ui.study.RegisterStudyFragment +import com.spot.android.R +import com.spot.android.databinding.FragmentLocationStudyBinding +import com.spot.android.login.LocationItem +import com.spot.android.ui.study.OnlineStudyFragment import java.io.BufferedReader import java.io.InputStreamReader diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MemberNumberRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MemberNumberRVAdapter.kt similarity index 91% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MemberNumberRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MemberNumberRVAdapter.kt index 85fd7e7b..f30e1598 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MemberNumberRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MemberNumberRVAdapter.kt @@ -1,13 +1,11 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.graphics.Color -import android.graphics.Typeface import android.view.LayoutInflater import android.view.ViewGroup import android.widget.TextView -import androidx.core.content.res.ResourcesCompat import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.R +import com.spot.android.R class MemberNumberRVAdapter( private val items: List diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MemberStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MemberStudyFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MemberStudyFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MemberStudyFragment.kt index bc43d958..b644cf7b 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MemberStudyFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MemberStudyFragment.kt @@ -2,18 +2,15 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.ArrayAdapter -import android.widget.Spinner import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearSnapHelper import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentMemberStudyBinding -import com.example.spoteam_android.ui.study.FixedRoundedSpinnerAdapter -import com.example.spoteam_android.ui.study.MemberNumberRVAdapter -import com.example.spoteam_android.ui.study.OnlineStudyFragment +import com.spot.android.R +import com.spot.android.databinding.FragmentMemberStudyBinding +import com.spot.android.ui.study.FixedRoundedSpinnerAdapter +import com.spot.android.ui.study.MemberNumberRVAdapter class MemberStudyFragment : Fragment() { private lateinit var binding: FragmentMemberStudyBinding diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyCommunityFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyCommunityFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyCommunityFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyCommunityFragment.kt index f721eef1..71caa976 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyCommunityFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyCommunityFragment.kt @@ -1,20 +1,18 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import StudyViewModel import android.content.Intent -import android.graphics.PorterDuff import android.os.Bundle import android.util.Log import android.view.* import android.widget.Toast -import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentMystudyCommunityBinding -import com.example.spoteam_android.ui.community.* +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentMystudyCommunityBinding +import com.spot.android.ui.community.* import com.google.android.material.bottomsheet.BottomSheetDialogFragment import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyContentCommentMultiViewRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyContentCommentMultiViewRVAdapter.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyContentCommentMultiViewRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyContentCommentMultiViewRVAdapter.kt index 46b49180..78353c92 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyContentCommentMultiViewRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyContentCommentMultiViewRVAdapter.kt @@ -1,15 +1,14 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.compose.foundation.text2.input.TextFieldLineLimits import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemContentCommentBinding -import com.example.spoteam_android.databinding.ItemContentCommentReplyBinding -import com.example.spoteam_android.ui.community.StudyPostContentCommentDetail +import com.spot.android.R +import com.spot.android.databinding.ItemContentCommentBinding +import com.spot.android.databinding.ItemContentCommentReplyBinding +import com.spot.android.ui.community.StudyPostContentCommentDetail data class CommentItem( val commentDetail: StudyPostContentCommentDetail, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyEditContentFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyEditContentFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyEditContentFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyEditContentFragment.kt index 1e71875c..20c57360 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyEditContentFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyEditContentFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.app.Activity import android.content.Intent @@ -19,13 +19,13 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.core.content.ContextCompat import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentMystudyWriteContentBinding -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.StudyPostContentInfo -import com.example.spoteam_android.ui.community.StudyPostContentResponse -import com.example.spoteam_android.ui.community.StudyPostResponse +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentMystudyWriteContentBinding +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.StudyPostContentInfo +import com.spot.android.ui.community.StudyPostContentResponse +import com.spot.android.ui.community.StudyPostResponse import com.google.android.material.bottomsheet.BottomSheetDialogFragment import kotlinx.coroutines.launch import okhttp3.MediaType.Companion.toMediaTypeOrNull diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyGalleryFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyGalleryFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyGalleryFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyGalleryFragment.kt index 4fc6172e..d8091eb0 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyGalleryFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyGalleryFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import StudyApiService import StudyViewModel @@ -12,12 +12,11 @@ import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.GridLayoutManager -import com.example.spoteam_android.GalleryItems -import com.example.spoteam_android.GalleryResponse -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentMystudyGalleryBinding +import com.spot.android.GalleryItems +import com.spot.android.GalleryResponse +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentMystudyGalleryBinding import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyGalleryFragmentRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyGalleryFragmentRVAdapter.kt similarity index 84% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyGalleryFragmentRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyGalleryFragmentRVAdapter.kt index 205ab4e8..57345ce0 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyGalleryFragmentRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyGalleryFragmentRVAdapter.kt @@ -1,14 +1,12 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.GalleryItems -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemGalleryPictureBinding -import com.example.spoteam_android.ui.community.contentComment.ContentCommentMultiViewRVAdapter.ItemClick +import com.spot.android.GalleryItems +import com.spot.android.R +import com.spot.android.databinding.ItemGalleryPictureBinding class MyStudyGalleryFragmentRVAdapter(private val dataList: List) : RecyclerView.Adapter() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyPostContentActivity.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyPostContentActivity.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyPostContentActivity.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyPostContentActivity.kt index cb7b2e32..4ff9f61b 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyPostContentActivity.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyPostContentActivity.kt @@ -1,6 +1,5 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study -import StudyContentImageRVAdapter import android.content.Context import android.graphics.PorterDuff import android.os.Bundle @@ -22,27 +21,26 @@ import androidx.core.view.isVisible import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.LinearLayoutManager import com.bumptech.glide.Glide -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.ActivityCommunityContentBinding -import com.example.spoteam_android.databinding.ActivityMystudyCommunityContentBinding -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.DeleteStudyPostContentResponse -import com.example.spoteam_android.ui.community.DisLikeCommentResponse -import com.example.spoteam_android.ui.community.LikeCommentResponse -import com.example.spoteam_android.ui.community.PostImages -import com.example.spoteam_android.ui.community.ReportContentDialog -import com.example.spoteam_android.ui.community.ReportStudyPostResponse -import com.example.spoteam_android.ui.community.StudyContentLikeResponse -import com.example.spoteam_android.ui.community.StudyContentUnLikeResponse -import com.example.spoteam_android.ui.community.StudyPostContentCommentDetail -import com.example.spoteam_android.ui.community.StudyPostContentCommentResponse -import com.example.spoteam_android.ui.community.StudyPostContentInfo -import com.example.spoteam_android.ui.community.StudyPostContentResponse -import com.example.spoteam_android.ui.community.UnDisLikeCommentResponse -import com.example.spoteam_android.ui.community.UnLikeCommentResponse -import com.example.spoteam_android.ui.community.WriteStudyCommentRequest -import com.example.spoteam_android.ui.community.WriteStudyCommentResponse +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.ActivityCommunityContentBinding +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.DeleteStudyPostContentResponse +import com.spot.android.ui.community.DisLikeCommentResponse +import com.spot.android.ui.community.LikeCommentResponse +import com.spot.android.ui.community.PostImages +import com.spot.android.ui.community.ReportContentDialog +import com.spot.android.ui.community.ReportStudyPostResponse +import com.spot.android.ui.community.StudyContentLikeResponse +import com.spot.android.ui.community.StudyContentUnLikeResponse +import com.spot.android.ui.community.StudyPostContentCommentDetail +import com.spot.android.ui.community.StudyPostContentCommentResponse +import com.spot.android.ui.community.StudyPostContentInfo +import com.spot.android.ui.community.StudyPostContentResponse +import com.spot.android.ui.community.UnDisLikeCommentResponse +import com.spot.android.ui.community.UnLikeCommentResponse +import com.spot.android.ui.community.WriteStudyCommentRequest +import com.spot.android.ui.community.WriteStudyCommentResponse import com.google.android.material.bottomsheet.BottomSheetDialogFragment import retrofit2.Call import retrofit2.Callback diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyPostRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyPostRVAdapter.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyPostRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyPostRVAdapter.kt index be8779f9..95791470 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyPostRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyPostRVAdapter.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.view.LayoutInflater import android.view.View @@ -7,9 +7,9 @@ import android.widget.ImageView import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemMystudyCommunityContentBinding -import com.example.spoteam_android.ui.community.PostDetail +import com.spot.android.R +import com.spot.android.databinding.ItemMystudyCommunityContentBinding +import com.spot.android.ui.community.PostDetail import java.text.ParseException import java.text.SimpleDateFormat import java.util.* diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyRegisterPreviewFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyRegisterPreviewFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyRegisterPreviewFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyRegisterPreviewFragment.kt index b1ae6a36..c2bf5f4a 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyRegisterPreviewFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyRegisterPreviewFragment.kt @@ -1,6 +1,5 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study -import ActivityFeeStudyFragment import StudyApiService import StudyViewModel import UploadResponse @@ -8,7 +7,6 @@ import android.content.Context import android.content.Context.MODE_PRIVATE import android.graphics.Bitmap import android.graphics.BitmapFactory -import android.graphics.Color import android.media.ExifInterface import android.net.Uri import android.os.Bundle @@ -20,20 +18,17 @@ import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.activityViewModels import com.bumptech.glide.Glide -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentMyStudyRegisterPreviewBinding +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentMyStudyRegisterPreviewBinding import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody -import okhttp3.OkHttpClient import okhttp3.RequestBody.Companion.asRequestBody import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import retrofit2.Retrofit -import retrofit2.converter.gson.GsonConverterFactory import java.io.File import java.io.FileOutputStream diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyRegisterPreviewVPAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyRegisterPreviewVPAdapter.kt similarity index 86% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyRegisterPreviewVPAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyRegisterPreviewVPAdapter.kt index 0cca4918..545ca81c 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyRegisterPreviewVPAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyRegisterPreviewVPAdapter.kt @@ -1,8 +1,8 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter -import com.example.spoteam_android.ui.home.HomeFragment +import com.spot.android.ui.home.HomeFragment class MyStudyRegisterPreviewVPAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyWriteContentFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyWriteContentFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyWriteContentFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyWriteContentFragment.kt index 67462137..a6afe7c3 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/MyStudyWriteContentFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/MyStudyWriteContentFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import StudyViewModel import android.app.Activity @@ -18,14 +18,13 @@ import android.widget.Toast import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.core.content.ContextCompat -import androidx.databinding.adapters.AutoCompleteTextViewBindingAdapter import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentMystudyWriteContentBinding -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.StudyPostResponse +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentMystudyWriteContentBinding +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.StudyPostResponse import com.google.android.material.bottomsheet.BottomSheetDialogFragment import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/OnItemClickListener.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/OnItemClickListener.kt similarity index 100% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/OnItemClickListener.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/OnItemClickListener.kt diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/OnlineStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/OnlineStudyFragment.kt similarity index 98% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/OnlineStudyFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/OnlineStudyFragment.kt index c6fcaa7a..cc9423b0 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/OnlineStudyFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/OnlineStudyFragment.kt @@ -1,4 +1,4 @@ - package com.example.spoteam_android.ui.study + package com.spot.android.ui.study import LocationStudyFragment import MemberStudyFragment @@ -13,10 +13,9 @@ import androidx.constraintlayout.widget.ConstraintSet import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels - import com.bumptech.glide.Glide - import com.example.spoteam_android.R - import com.example.spoteam_android.databinding.FragmentOnlineStudyBinding - import com.example.spoteam_android.util.parseLocationTsv + import com.spot.android.R + import com.spot.android.databinding.FragmentOnlineStudyBinding + import com.spot.android.util.parseLocationTsv import com.google.android.material.chip.Chip class OnlineStudyFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/RegisterStudyFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/RegisterStudyFragment.kt similarity index 97% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/RegisterStudyFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/RegisterStudyFragment.kt index 60b07467..3783ad4f 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/RegisterStudyFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/RegisterStudyFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import StudyFormMode import StudyViewModel @@ -9,8 +9,8 @@ import android.view.ViewGroup import android.widget.CompoundButton import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentRegisterStudyBinding +import com.spot.android.R +import com.spot.android.databinding.FragmentRegisterStudyBinding import com.google.android.material.chip.Chip class RegisterStudyFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ReportStudyContentDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/ReportStudyContentDialog.kt similarity index 90% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ReportStudyContentDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/ReportStudyContentDialog.kt index b6793764..f238c9a0 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/ReportStudyContentDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/ReportStudyContentDialog.kt @@ -1,11 +1,11 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.view.Window import android.widget.Button -import com.example.spoteam_android.R +import com.spot.android.R class ReportStudyContentDialog(context: Context) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyAdapter.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyAdapter.kt index 2bf1be63..6e85ab9a 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyAdapter.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.view.LayoutInflater import android.view.View @@ -8,9 +8,9 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.R -import com.example.spoteam_android.StudyItem -import com.example.spoteam_android.databinding.ItemRecyclerViewBinding +import com.spot.android.R +import com.spot.android.StudyItem +import com.spot.android.databinding.ItemRecyclerViewBinding class StudyAdapter( initialItems: List, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyContentImageRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyContentImageRVAdapter.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyContentImageRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyContentImageRVAdapter.kt index dbe298d6..5af949c5 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyContentImageRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyContentImageRVAdapter.kt @@ -4,8 +4,8 @@ import android.view.ViewGroup import android.widget.ImageView import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.R -import com.example.spoteam_android.ui.community.PostImages +import com.spot.android.R +import com.spot.android.ui.community.PostImages class StudyContentImageRVAdapter(private val images: List) : RecyclerView.Adapter() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyFragment.kt index 36c3c4df..b78b8e43 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyFragment.kt @@ -1,10 +1,9 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import StudyApiService import StudyViewModel import android.content.Context.MODE_PRIVATE import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -13,12 +12,12 @@ import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.StudyItem -import com.example.spoteam_android.StudyResponse -import com.example.spoteam_android.databinding.FragmentStudyBinding +import com.spot.android.LikeResponse +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.StudyItem +import com.spot.android.StudyResponse +import com.spot.android.databinding.FragmentStudyBinding import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRegisterApiService.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyRegisterApiService.kt similarity index 81% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRegisterApiService.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyRegisterApiService.kt index 6944f429..9f8b1a8d 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRegisterApiService.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyRegisterApiService.kt @@ -1,16 +1,15 @@ -import com.example.spoteam_android.BookmarkResponse -import com.example.spoteam_android.GalleryResponse -import com.example.spoteam_android.IsAppliedResponse -import com.example.spoteam_android.LikeResponse -import com.example.spoteam_android.MemberResponse -import com.example.spoteam_android.RecentAnnounceResponse -import com.example.spoteam_android.ScheduleListResponse -import com.example.spoteam_android.ScheduleRequest -import com.example.spoteam_android.ScheduleResponse -import com.example.spoteam_android.StudyApplyResponse -import com.example.spoteam_android.StudyDetailsResponse -import com.example.spoteam_android.StudyItem -import com.example.spoteam_android.StudyResponse +import com.spot.android.BookmarkResponse +import com.spot.android.GalleryResponse +import com.spot.android.IsAppliedResponse +import com.spot.android.LikeResponse +import com.spot.android.MemberResponse +import com.spot.android.RecentAnnounceResponse +import com.spot.android.ScheduleListResponse +import com.spot.android.ScheduleRequest +import com.spot.android.ScheduleResponse +import com.spot.android.StudyApplyResponse +import com.spot.android.StudyDetailsResponse +import com.spot.android.StudyResponse import okhttp3.MultipartBody import okhttp3.RequestBody import retrofit2.Call diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRegisterCompleteDialog.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyRegisterCompleteDialog.kt similarity index 87% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRegisterCompleteDialog.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyRegisterCompleteDialog.kt index 0366622f..c951c2f4 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRegisterCompleteDialog.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyRegisterCompleteDialog.kt @@ -1,15 +1,13 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable -import android.view.View import android.view.Window import android.widget.Button import android.widget.ImageView import androidx.fragment.app.FragmentManager -import com.example.spoteam_android.R -import com.example.spoteam_android.ui.mypage.ThemePreferenceFragment +import com.spot.android.R class StudyRegisterCompleteDialog(private val context: Context) { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRequest.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyRequest.kt similarity index 100% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyRequest.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyRequest.kt diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyViewModel.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyViewModel.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyViewModel.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyViewModel.kt index 6c10d9f9..8d612dbf 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/StudyViewModel.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/StudyViewModel.kt @@ -1,22 +1,18 @@ -import android.content.Context import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.StudyDetailsResponse -import com.example.spoteam_android.StudyDetailsResult -import com.example.spoteam_android.login.LocationItem +import com.spot.android.RetrofitInstance +import com.spot.android.StudyDetailsResponse +import com.spot.android.StudyDetailsResult +import com.spot.android.login.LocationItem import com.google.gson.Gson import okhttp3.MediaType.Companion.toMediaType -import okhttp3.OkHttpClient import okhttp3.RequestBody import okhttp3.RequestBody.Companion.toRequestBody import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import retrofit2.Retrofit -import retrofit2.converter.gson.GsonConverterFactory class StudyViewModel : ViewModel() { private val _mode = MutableLiveData(StudyFormMode.CREATE) diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/WriteContentImageRVadapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/WriteContentImageRVadapter.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/WriteContentImageRVadapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/WriteContentImageRVadapter.kt index 7185c3be..71af8e54 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/WriteContentImageRVadapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/WriteContentImageRVadapter.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study +package com.spot.android.ui.study import android.net.Uri import android.view.LayoutInflater @@ -7,7 +7,7 @@ import android.view.ViewGroup import android.widget.ImageView import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.R +import com.spot.android.R class WriteContentImageRVadapter(private val images: MutableList) : RecyclerView.Adapter() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarAddEventFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CalendarAddEventFragment.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarAddEventFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CalendarAddEventFragment.kt index 7d14958b..f76ca098 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarAddEventFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CalendarAddEventFragment.kt @@ -1,11 +1,8 @@ -package com.example.spoteam_android.ui.study.calendar +package com.spot.android.ui.study.calendar import StudyApiService -import android.annotation.SuppressLint -import android.app.AlertDialog import android.app.DatePickerDialog import android.app.TimePickerDialog -import android.content.res.ColorStateList import android.graphics.Typeface import android.os.Bundle import android.text.Editable @@ -15,31 +12,23 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.AdapterView -import android.widget.ArrayAdapter import android.widget.Button import android.widget.CheckBox import android.widget.EditText -import android.widget.ImageButton import android.widget.ImageView import android.widget.Spinner import android.widget.TextView import android.widget.Toast import androidx.core.content.ContextCompat -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentManager -import androidx.fragment.app.FragmentTransaction import androidx.fragment.app.activityViewModels -import androidx.fragment.app.setFragmentResult import androidx.lifecycle.ViewModelProvider -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.ScheduleRequest -import com.example.spoteam_android.ScheduleResponse -import com.example.spoteam_android.databinding.FragmentCalendarAddEventBinding -import com.example.spoteam_android.databinding.FragmentMemberStudyBinding -import com.example.spoteam_android.ui.study.CompleteScheduleDialog -import com.example.spoteam_android.ui.study.FixedRoundedSpinnerAdapter -import com.example.spoteam_android.ui.study.StudyFragment +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.ScheduleRequest +import com.spot.android.ScheduleResponse +import com.spot.android.databinding.FragmentCalendarAddEventBinding +import com.spot.android.ui.study.CompleteScheduleDialog +import com.spot.android.ui.study.FixedRoundedSpinnerAdapter import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.gson.Gson import retrofit2.Call diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarApiService.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CalendarApiService.kt similarity index 80% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarApiService.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CalendarApiService.kt index 875bb92e..c24423a5 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarApiService.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CalendarApiService.kt @@ -1,8 +1,7 @@ -package com.example.spoteam_android.ui.study.calendar +package com.spot.android.ui.study.calendar import retrofit2.Call import retrofit2.http.GET -import retrofit2.http.Header import retrofit2.http.Path import retrofit2.http.Query diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CalendarFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CalendarFragment.kt index 80f46d03..5fff40a8 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CalendarFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CalendarFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.calendar +package com.spot.android.ui.study.calendar import StudyApiService import StudyViewModel @@ -10,27 +10,22 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageButton import android.widget.Toast -import androidx.constraintlayout.widget.ConstraintLayout -import androidx.core.content.ContextCompat import androidx.fragment.app.DialogFragment import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.MainActivity -import com.example.spoteam_android.MemberResponse -import com.example.spoteam_android.ProfileItem -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCalendarBinding -import com.example.spoteam_android.ui.study.quiz.CheckAttendanceFragment +import com.spot.android.MemberResponse +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCalendarBinding +import com.spot.android.ui.study.quiz.CheckAttendanceFragment import com.prolificinteractive.materialcalendarview.CalendarDay import com.prolificinteractive.materialcalendarview.MaterialCalendarView import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import java.text.SimpleDateFormat import java.util.* diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CheckBoxViewModel.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CheckBoxViewModel.kt similarity index 86% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CheckBoxViewModel.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CheckBoxViewModel.kt index 02d01249..f3ea2c86 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CheckBoxViewModel.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CheckBoxViewModel.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.calendar +package com.spot.android.ui.study.calendar import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CustomRectangleDecorator.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CustomRectangleDecorator.kt similarity index 89% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CustomRectangleDecorator.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CustomRectangleDecorator.kt index 5dee8bf1..5f968f43 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CustomRectangleDecorator.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CustomRectangleDecorator.kt @@ -1,7 +1,7 @@ -package com.example.spoteam_android.ui.study.calendar +package com.spot.android.ui.study.calendar import android.content.Context -import com.example.spoteam_android.R +import com.spot.android.R import com.prolificinteractive.materialcalendarview.CalendarDay import com.prolificinteractive.materialcalendarview.DayViewDecorator import com.prolificinteractive.materialcalendarview.DayViewFacade diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CustomWeekDayFormatter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CustomWeekDayFormatter.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CustomWeekDayFormatter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CustomWeekDayFormatter.kt index 04a3fa9b..7fb066f2 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/CustomWeekDayFormatter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/CustomWeekDayFormatter.kt @@ -1,11 +1,11 @@ -package com.example.spoteam_android.ui.study.calendar +package com.spot.android.ui.study.calendar import android.content.Context import android.text.Spannable import android.text.SpannableString import android.text.style.ForegroundColorSpan import androidx.core.content.ContextCompat -import com.example.spoteam_android.R +import com.spot.android.R import com.prolificinteractive.materialcalendarview.format.WeekDayFormatter import org.threeten.bp.DayOfWeek diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/Event.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/Event.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/Event.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/Event.kt index 06fca1b9..ffe31fab 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/Event.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/Event.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.calendar +package com.spot.android.ui.study.calendar import java.util.Calendar diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/EventAdapter.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/EventAdapter.kt index c99d72b1..b3e6ced3 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/EventAdapter.kt @@ -1,18 +1,14 @@ -package com.example.spoteam_android.ui.study.calendar +package com.spot.android.ui.study.calendar import android.annotation.SuppressLint -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.R +import com.spot.android.R import java.time.LocalDate -import java.time.LocalTime -import java.time.format.DateTimeFormatter -import java.util.Locale class EventAdapter( private var events: List, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventDecorator.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/EventDecorator.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventDecorator.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/EventDecorator.kt index a07deb25..786dc0b2 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventDecorator.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/EventDecorator.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.calendar +package com.spot.android.ui.study.calendar import android.graphics.Color import com.prolificinteractive.materialcalendarview.CalendarDay diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventRepository.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/EventRepository.kt similarity index 80% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventRepository.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/EventRepository.kt index 7a71c87b..67e0e30b 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventRepository.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/EventRepository.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.calendar +package com.spot.android.ui.study.calendar object EventRepository { private val events = mutableListOf() diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventViewModel.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/EventViewModel.kt similarity index 98% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventViewModel.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/EventViewModel.kt index a3c49579..8f063eb7 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/EventViewModel.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/EventViewModel.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.calendar +package com.spot.android.ui.study.calendar import android.util.Log import androidx.lifecycle.LiveData diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/ScheduleData.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/ScheduleData.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/ScheduleData.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/ScheduleData.kt index 3a5935cd..d5891c98 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/calendar/ScheduleData.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/calendar/ScheduleData.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.calendar +package com.spot.android.ui.study.calendar import com.google.gson.annotations.SerializedName diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CheckAttendanceFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CheckAttendanceFragment.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CheckAttendanceFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CheckAttendanceFragment.kt index 657a65c3..2ca9745d 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CheckAttendanceFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CheckAttendanceFragment.kt @@ -1,9 +1,8 @@ -package com.example.spoteam_android.ui.study.quiz +package com.spot.android.ui.study.quiz import StudyViewModel import android.content.Context import android.os.Bundle -import android.os.CountDownTimer import android.util.Log import android.view.LayoutInflater import android.view.View @@ -12,22 +11,19 @@ import android.widget.Toast import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentAttendanceDefaultBinding -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.GetQuizResponse -import com.example.spoteam_android.ui.community.GetScheduleResponse -import com.example.spoteam_android.ui.community.MembersDetail -import com.example.spoteam_android.ui.community.StudyMemberResponse +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentAttendanceDefaultBinding +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.GetQuizResponse +import com.spot.android.ui.community.GetScheduleResponse +import com.spot.android.ui.community.MembersDetail +import com.spot.android.ui.community.StudyMemberResponse import com.google.android.material.bottomsheet.BottomSheetDialogFragment import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import java.text.SimpleDateFormat import java.time.LocalDate -import java.util.Locale -import java.util.TimeZone class CheckAttendanceFragment : BottomSheetDialogFragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewCorrectQuizFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CrewCorrectQuizFragment.kt similarity index 57% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewCorrectQuizFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CrewCorrectQuizFragment.kt index add8e1be..cd815f38 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewCorrectQuizFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CrewCorrectQuizFragment.kt @@ -1,15 +1,11 @@ -package com.example.spoteam_android.ui.study.quiz +package com.spot.android.ui.study.quiz import android.os.Bundle -import android.os.CountDownTimer import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.spoteam_android.databinding.FragmentCrewCorrectQuizBinding -import com.example.spoteam_android.databinding.FragmentCrewSolveQuizBinding -import com.example.spoteam_android.databinding.FragmentCrewWrongQuizBinding -import com.example.spoteam_android.databinding.FragmentHostFinishMakeQuizBinding +import com.spot.android.databinding.FragmentCrewCorrectQuizBinding class CrewCorrectQuizFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewSolveQuizFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CrewSolveQuizFragment.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewSolveQuizFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CrewSolveQuizFragment.kt index 69282304..2059f61f 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewSolveQuizFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CrewSolveQuizFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.quiz +package com.spot.android.ui.study.quiz import StudyViewModel import android.os.Bundle @@ -13,17 +13,16 @@ import android.widget.TextView import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentCrewSolveQuizBinding -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.CrewAnswerRequest -import com.example.spoteam_android.ui.community.GetCrewQuizResponse +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentCrewSolveQuizBinding +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.CrewAnswerRequest +import com.spot.android.ui.community.GetCrewQuizResponse import retrofit2.Call import retrofit2.Callback import retrofit2.Response import java.time.Instant -import kotlin.concurrent.timer class CrewSolveQuizFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewTakeAttendanceFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CrewTakeAttendanceFragment.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewTakeAttendanceFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CrewTakeAttendanceFragment.kt index 87c20582..03829cbd 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewTakeAttendanceFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CrewTakeAttendanceFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.quiz +package com.spot.android.ui.study.quiz import android.os.Bundle import android.view.LayoutInflater @@ -6,8 +6,8 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentCrewTakeAttendanceBinding +import com.spot.android.R +import com.spot.android.databinding.FragmentCrewTakeAttendanceBinding class CrewTakeAttendanceFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewTimeOutFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CrewTimeOutFragment.kt similarity index 62% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewTimeOutFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CrewTimeOutFragment.kt index 5958e89b..4be5480f 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewTimeOutFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CrewTimeOutFragment.kt @@ -1,15 +1,11 @@ -package com.example.spoteam_android.ui.study.quiz +package com.spot.android.ui.study.quiz import android.os.Bundle -import android.os.CountDownTimer -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.spoteam_android.databinding.FragmentCrewWrongQuizBinding -import com.example.spoteam_android.databinding.FragmentHostFinishMakeQuizBinding -import com.example.spoteam_android.databinding.FragmentTimeOutQuizBinding +import com.spot.android.databinding.FragmentTimeOutQuizBinding class CrewTimeOutFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewWrongQuizFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CrewWrongQuizFragment.kt similarity index 89% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewWrongQuizFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CrewWrongQuizFragment.kt index 6221689a..5094558c 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/CrewWrongQuizFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/CrewWrongQuizFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.quiz +package com.spot.android.ui.study.quiz import android.os.Bundle import android.view.LayoutInflater @@ -6,8 +6,8 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentCrewWrongQuizBinding +import com.spot.android.R +import com.spot.android.databinding.FragmentCrewWrongQuizBinding class CrewWrongQuizFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostFinishMakeQuizFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/HostFinishMakeQuizFragment.kt similarity index 90% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostFinishMakeQuizFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/HostFinishMakeQuizFragment.kt index 368461a6..f5984e7c 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostFinishMakeQuizFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/HostFinishMakeQuizFragment.kt @@ -1,13 +1,12 @@ -package com.example.spoteam_android.ui.study.quiz +package com.spot.android.ui.study.quiz import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.example.spoteam_android.databinding.FragmentHostFinishMakeQuizBinding +import com.spot.android.databinding.FragmentHostFinishMakeQuizBinding class HostFinishMakeQuizFragment : Fragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizFirstFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/HostMakeQuizFirstFragment.kt similarity index 89% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizFirstFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/HostMakeQuizFirstFragment.kt index 74586309..e3c13f61 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizFirstFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/HostMakeQuizFirstFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.quiz +package com.spot.android.ui.study.quiz import StudyViewModel import android.os.Bundle @@ -7,8 +7,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.activityViewModels -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.FragmentToMakeQuizBinding +import com.spot.android.R +import com.spot.android.databinding.FragmentToMakeQuizBinding import com.google.android.material.bottomsheet.BottomSheetDialogFragment diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/HostMakeQuizFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/HostMakeQuizFragment.kt index f99170a0..ae17f7d3 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/HostMakeQuizFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.quiz +package com.spot.android.ui.study.quiz import StudyViewModel import android.os.Bundle @@ -13,17 +13,16 @@ import android.widget.TextView import android.widget.Toast import androidx.core.content.ContextCompat import androidx.fragment.app.activityViewModels -import com.example.spoteam_android.R -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentHostMakeQuizBinding -import com.example.spoteam_android.ui.community.CommunityAPIService -import com.example.spoteam_android.ui.community.QuizContentRequest -import com.example.spoteam_android.ui.community.QuizContentResponse +import com.spot.android.R +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentHostMakeQuizBinding +import com.spot.android.ui.community.CommunityAPIService +import com.spot.android.ui.community.QuizContentRequest +import com.spot.android.ui.community.QuizContentResponse import com.google.android.material.bottomsheet.BottomSheetDialogFragment import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import java.time.Instant class HostMakeQuizFragment : BottomSheetDialogFragment() { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizMemberRVAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/HostMakeQuizMemberRVAdapter.kt similarity index 90% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizMemberRVAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/HostMakeQuizMemberRVAdapter.kt index f5a3a89f..840176b8 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/HostMakeQuizMemberRVAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/HostMakeQuizMemberRVAdapter.kt @@ -1,17 +1,15 @@ -package com.example.spoteam_android.ui.study.quiz +package com.spot.android.ui.study.quiz import android.content.res.ColorStateList -import android.graphics.BlurMaskFilter import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.compose.ui.graphics.Color import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemDetailStudyHomeMemberBinding -import com.example.spoteam_android.ui.community.MembersDetail +import com.spot.android.R +import com.spot.android.databinding.ItemDetailStudyHomeMemberBinding +import com.spot.android.ui.community.MembersDetail class HostMakeQuizMemberRVAdapter( private var dataList: List, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/TimerViewModel.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/TimerViewModel.kt similarity index 97% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/TimerViewModel.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/TimerViewModel.kt index b79b3cd5..0bf0d9ef 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/quiz/TimerViewModel.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/quiz/TimerViewModel.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.quiz +package com.spot.android.ui.study.quiz import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/OtherTodoAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/OtherTodoAdapter.kt similarity index 90% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/OtherTodoAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/OtherTodoAdapter.kt index b880719e..c05956bd 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/OtherTodoAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/OtherTodoAdapter.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.todolist +package com.spot.android.ui.study.todolist import android.content.Context import android.graphics.Paint @@ -6,9 +6,8 @@ import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.ItemTodoListBinding -import com.example.spoteam_android.databinding.ItemViewTodoListBinding +import com.spot.android.R +import com.spot.android.databinding.ItemViewTodoListBinding // 다른 스터디원 Todo apapter class OtherTodoAdapter( diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/ToDoListData.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/ToDoListData.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/ToDoListData.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/ToDoListData.kt index da134274..a1ba9382 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/ToDoListData.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/ToDoListData.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.todolist +package com.spot.android.ui.study.todolist import com.google.gson.annotations.SerializedName data class TodolistResponse( diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoAdapter.kt similarity index 97% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoAdapter.kt index b0fdcbb5..0f6897e7 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoAdapter.kt @@ -1,7 +1,6 @@ -package com.example.spoteam_android.ui.study.todolist +package com.spot.android.ui.study.todolist import android.content.Context -import android.graphics.Paint import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -9,9 +8,9 @@ import android.widget.PopupWindow import android.widget.Toast import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.R -import com.example.spoteam_android.databinding.CustomPopupMenuBinding -import com.example.spoteam_android.databinding.ItemTodoListBinding +import com.spot.android.R +import com.spot.android.databinding.CustomPopupMenuBinding +import com.spot.android.databinding.ItemTodoListBinding // TodoAdapter class TodoAdapter( diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoApiService.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoApiService.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoApiService.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoApiService.kt index 3f1d92c9..5c9d2c0b 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoApiService.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoApiService.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.todolist +package com.spot.android.ui.study.todolist import retrofit2.Call import retrofit2.http.Body diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoDateAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoDateAdapter.kt similarity index 98% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoDateAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoDateAdapter.kt index 0c8eb813..9e25e7e0 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoDateAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoDateAdapter.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.todolist +package com.spot.android.ui.study.todolist import android.graphics.Color import android.util.Log @@ -8,7 +8,7 @@ import android.view.ViewGroup import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.R +import com.spot.android.R import java.time.DayOfWeek import java.time.LocalDate import java.time.format.TextStyle diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoEventAdapter.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoEventAdapter.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoEventAdapter.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoEventAdapter.kt index 02f37c7f..d2bcbce3 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoEventAdapter.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoEventAdapter.kt @@ -1,16 +1,14 @@ -package com.example.spoteam_android.ui.study.todolist +package com.spot.android.ui.study.todolist -import com.example.spoteam_android.ui.study.calendar.Event +import com.spot.android.ui.study.calendar.Event import android.annotation.SuppressLint -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.R +import com.spot.android.R import java.time.LocalDate class TodoEventAdapter( diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoListFragment.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoListFragment.kt similarity index 95% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoListFragment.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoListFragment.kt index 61992345..12db35b4 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoListFragment.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoListFragment.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.todolist +package com.spot.android.ui.study.todolist import StudyApiService import StudyViewModel @@ -10,30 +10,24 @@ import android.view.View import android.view.ViewGroup import android.view.ViewTreeObserver import android.view.inputmethod.InputMethodManager -import android.widget.ImageButton import android.widget.Toast import androidx.constraintlayout.widget.ConstraintLayout import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import com.example.spoteam_android.MemberResponse -import com.example.spoteam_android.ProfileItem -import com.example.spoteam_android.RetrofitInstance -import com.example.spoteam_android.databinding.FragmentTodoListBinding -import com.example.spoteam_android.ui.study.calendar.CalendarApiService -import com.example.spoteam_android.ui.study.calendar.Event -import com.example.spoteam_android.ui.study.calendar.EventAdapter -import com.example.spoteam_android.ui.study.calendar.EventViewModel -import com.example.spoteam_android.ui.study.calendar.ScheduleResponse -import com.example.spoteam_android.ui.study.DetailStudyHomeProfileAdapter -import com.prolificinteractive.materialcalendarview.CalendarDay +import com.spot.android.MemberResponse +import com.spot.android.ProfileItem +import com.spot.android.RetrofitInstance +import com.spot.android.databinding.FragmentTodoListBinding +import com.spot.android.ui.study.calendar.CalendarApiService +import com.spot.android.ui.study.calendar.Event +import com.spot.android.ui.study.calendar.EventViewModel +import com.spot.android.ui.study.calendar.ScheduleResponse +import com.spot.android.ui.study.DetailStudyHomeProfileAdapter import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import java.time.DayOfWeek import java.time.LocalDate import java.util.Calendar import java.time.YearMonth diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoRepository.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoRepository.kt similarity index 99% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoRepository.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoRepository.kt index da518f34..ae94d7d8 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoRepository.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoRepository.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.todolist +package com.spot.android.ui.study.todolist import android.util.Log import retrofit2.Call diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoRequest.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoRequest.kt similarity index 58% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoRequest.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoRequest.kt index dbdccd8a..c724afaa 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoRequest.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoRequest.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.todolist +package com.spot.android.ui.study.todolist data class TodoRequest( val content: String, diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoViewModel.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoViewModel.kt similarity index 98% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoViewModel.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoViewModel.kt index cbbfef01..5d6811d8 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoViewModel.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoViewModel.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.todolist +package com.spot.android.ui.study.todolist import android.util.Log import androidx.lifecycle.LiveData diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoViewModelFactory.kt b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoViewModelFactory.kt similarity index 90% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoViewModelFactory.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoViewModelFactory.kt index 61c6c692..bb69e9cc 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/ui/study/todolist/TodoViewModelFactory.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/ui/study/todolist/TodoViewModelFactory.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.ui.study.todolist +package com.spot.android.ui.study.todolist import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/util/ApiKey.kt b/SPOTeam_android/app/src/main/java/com/spot/android/util/ApiKey.kt similarity index 53% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/util/ApiKey.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/util/ApiKey.kt index ef739271..132ea3e4 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/util/ApiKey.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/util/ApiKey.kt @@ -1,6 +1,6 @@ -package com.example.spoteam_android.util +package com.spot.android.util -import com.example.spoteam_android.BuildConfig +import com.spot.android.BuildConfig class ApiKey { companion object{ diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/util/LocationParser.kt b/SPOTeam_android/app/src/main/java/com/spot/android/util/LocationParser.kt similarity index 90% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/util/LocationParser.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/util/LocationParser.kt index e57ea8ac..c64252e6 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/util/LocationParser.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/util/LocationParser.kt @@ -1,7 +1,7 @@ -package com.example.spoteam_android.util +package com.spot.android.util import android.content.Context -import com.example.spoteam_android.login.LocationItem +import com.spot.android.login.LocationItem import java.io.BufferedReader import java.io.InputStreamReader diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/Constants.kt b/SPOTeam_android/app/src/main/java/com/spot/android/weather/Constants.kt similarity index 79% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/Constants.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/weather/Constants.kt index aa2fc829..bf4e27e7 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/Constants.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/weather/Constants.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.weather +package com.spot.android.weather class Constants { diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/Weather.kt b/SPOTeam_android/app/src/main/java/com/spot/android/weather/Weather.kt similarity index 93% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/Weather.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/weather/Weather.kt index 4087bd51..58f1c13e 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/Weather.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/weather/Weather.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.weather +package com.spot.android.weather data class Weather( val response: Response diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherApi.kt b/SPOTeam_android/app/src/main/java/com/spot/android/weather/WeatherApi.kt similarity index 81% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherApi.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/weather/WeatherApi.kt index 1ba8a958..99774a62 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherApi.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/weather/WeatherApi.kt @@ -1,6 +1,6 @@ -package com.example.spoteam_android.weather +package com.spot.android.weather -import com.example.spoteam_android.util.ApiKey.Companion.API_KEY +import com.spot.android.util.ApiKey.Companion.API_KEY import retrofit2.Response import retrofit2.http.GET import retrofit2.http.Query diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherRepository.kt b/SPOTeam_android/app/src/main/java/com/spot/android/weather/WeatherRepository.kt similarity index 91% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherRepository.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/weather/WeatherRepository.kt index b3629dc8..7b4c5a41 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherRepository.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/weather/WeatherRepository.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.weather +package com.spot.android.weather import retrofit2.Response import javax.inject.Inject diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherViewModel.kt b/SPOTeam_android/app/src/main/java/com/spot/android/weather/WeatherViewModel.kt similarity index 96% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherViewModel.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/weather/WeatherViewModel.kt index 2c984e75..373dde79 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/WeatherViewModel.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/weather/WeatherViewModel.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android.weather +package com.spot.android.weather import android.util.Log import androidx.lifecycle.MutableLiveData diff --git a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/parseCsv.kt b/SPOTeam_android/app/src/main/java/com/spot/android/weather/parseCsv.kt similarity index 92% rename from SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/parseCsv.kt rename to SPOTeam_android/app/src/main/java/com/spot/android/weather/parseCsv.kt index 11467554..87bd1590 100644 --- a/SPOTeam_android/app/src/main/java/com/example/spoteam_android/weather/parseCsv.kt +++ b/SPOTeam_android/app/src/main/java/com/spot/android/weather/parseCsv.kt @@ -1,8 +1,7 @@ -package com.example.spoteam_android.weather +package com.spot.android.weather import android.content.Context -import com.example.spoteam_android.R -import com.example.spoteam_android.RegionData +import com.spot.android.RegionData import java.io.BufferedReader import java.io.InputStreamReader diff --git a/SPOTeam_android/app/src/main/res/navigation/main_navigation.xml b/SPOTeam_android/app/src/main/res/navigation/main_navigation.xml index 158c1d25..8c26b725 100644 --- a/SPOTeam_android/app/src/main/res/navigation/main_navigation.xml +++ b/SPOTeam_android/app/src/main/res/navigation/main_navigation.xml @@ -6,27 +6,27 @@ \ No newline at end of file diff --git a/SPOTeam_android/app/src/main/res/navigation/mobile_navigation.xml b/SPOTeam_android/app/src/main/res/navigation/mobile_navigation.xml index 71a3c5db..eec0e54d 100644 --- a/SPOTeam_android/app/src/main/res/navigation/mobile_navigation.xml +++ b/SPOTeam_android/app/src/main/res/navigation/mobile_navigation.xml @@ -7,19 +7,19 @@ \ No newline at end of file diff --git a/SPOTeam_android/app/src/test/java/com/example/spoteam_android/ExampleUnitTest.kt b/SPOTeam_android/app/src/test/java/com/spot/android/ExampleUnitTest.kt similarity index 89% rename from SPOTeam_android/app/src/test/java/com/example/spoteam_android/ExampleUnitTest.kt rename to SPOTeam_android/app/src/test/java/com/spot/android/ExampleUnitTest.kt index 2572cafd..13911fcf 100644 --- a/SPOTeam_android/app/src/test/java/com/example/spoteam_android/ExampleUnitTest.kt +++ b/SPOTeam_android/app/src/test/java/com/spot/android/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.example.spoteam_android +package com.spot.android import org.junit.Test