Skip to content

[fix] package name change #337

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
fredleeJH merged 1 commit into from
Aug 1, 2025
Merged

[fix] package name change #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SPOTeam_android/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...poteam_android/ExampleInstrumentedTest.kt → ...m/spot/android/ExampleInstrumentedTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...example/spoteam_android/AuthApiService.kt → ...n/java/com/spot/android/AuthApiService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spoteam_android
package com.spot.android

import retrofit2.Call
import retrofit2.http.Header
Expand Down
4 changes: 2 additions & 2 deletions .../example/spoteam_android/Authenticator.kt → ...in/java/com/spot/android/Authenticator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 2 additions & 6 deletions ...am_android/CompleteSignupStudyFragment.kt → ...ot/android/CompleteSignupStudyFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {

Expand Down
5 changes: 1 addition & 4 deletions .../java/com/example/spoteam_android/Data.kt → ...pp/src/main/java/com/spot/android/Data.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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


Expand Down
2 changes: 1 addition & 1 deletion ...mple/spoteam_android/GlobalApplication.kt → ...ava/com/spot/android/GlobalApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spoteam_android
package com.spot.android

import android.app.Application
import android.util.Log
Expand Down
47 changes: 23 additions & 24 deletions .../example/spoteam_android/HouseFragment.kt → ...in/java/com/spot/android/HouseFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spoteam_android
package com.spot.android

import StudyApiService
import StudyViewModel
Expand All @@ -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
Expand Down
64 changes: 24 additions & 40 deletions ...m/example/spoteam_android/MainActivity.kt → ...ain/java/com/spot/android/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ample/spoteam_android/RetrofitInstance.kt → ...java/com/spot/android/RetrofitInstance.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spoteam_android
package com.spot.android

import android.content.Context
import android.util.Log
Expand Down
4 changes: 1 addition & 3 deletions ...eam_android/StudyRegisterPopupFragment.kt → ...pot/android/StudyRegisterPopupFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spoteam_android
package com.spot.android

import android.app.Dialog
import android.content.Context
Expand All @@ -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) {

Expand Down
6 changes: 3 additions & 3 deletions ...id/checklist/CheckListCategoryActivity.kt → ...id/checklist/CheckListCategoryActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
10 changes: 5 additions & 5 deletions ...id/checklist/CheckListLocationActivity.kt → ...id/checklist/CheckListLocationActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spoteam_android.checklist
package com.spot.android.checklist

import android.content.Intent
import android.os.Bundle
Expand All @@ -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

Expand Down
9 changes: 4 additions & 5 deletions ...hecklist/CheckListStudyPurposeActivity.kt → ...hecklist/CheckListStudyPurposeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion ...example/spoteam_android/data/ApiModels.kt → ...n/java/com/spot/android/data/ApiModels.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spoteam_android.data
package com.spot.android.data

class ApiModels {

Expand Down
6 changes: 3 additions & 3 deletions ...m/example/spoteam_android/di/AppModule.kt → ...ain/java/com/spot/android/di/AppModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...m_android/login/CategorySpinnerAdapter.kt → ...t/android/login/CategorySpinnerAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
6 changes: 3 additions & 3 deletions ...m_android/login/CellPhoneLoginActivity.kt → ...t/android/login/CellPhoneLoginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spoteam_android.login
package com.spot.android.login

import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
Expand All @@ -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() {

Expand Down
12 changes: 6 additions & 6 deletions ...ndroid/login/EmailVerificationActivity.kt → ...ndroid/login/EmailVerificationActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spoteam_android.login
package com.spot.android.login

import android.content.Intent
import android.os.Bundle
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...oteam_android/login/LocationApiService.kt → .../spot/android/login/LocationApiService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spoteam_android.login
package com.spot.android.login

import StudyRequest
import retrofit2.Call
Expand Down
2 changes: 1 addition & 1 deletion ...ple/spoteam_android/login/LocationItem.kt → ...va/com/spot/android/login/LocationItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spoteam_android.login
package com.spot.android.login

data class LocationItem(
val code: String,
Expand Down
Loading