diff --git a/.github/workflows/android-ci b/.github/workflows/android-ci.yml similarity index 81% rename from .github/workflows/android-ci rename to .github/workflows/android-ci.yml index 5ca966da..10f3a0a3 100644 --- a/.github/workflows/android-ci +++ b/.github/workflows/android-ci.yml @@ -34,5 +34,12 @@ jobs: # CI에서 수행할 작업을 정의한다. run: | echo '${{ secrets.LOCAL_PROPERTIES }}' >> ./local.properties + - name: Generate keystore.properties + run: | + echo '${{ secrets.KEYSTORE_PROPERTIES }}' >> ./keystore.properties + + - name: Generate google-services.json + run: echo '${{ secrets.GOOGLE_SERVICES }}' | base64 -d > ./app/google-services.json + - name: Run build run: ./gradlew buildDebug --stacktrace \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1ba006d8..db2465e4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,15 +15,15 @@ val properties = Properties().apply { } android { - namespace = "com.example.findu" + namespace = "com.kuit.findu" compileSdk = 35 defaultConfig { - applicationId = "com.example.findu" + applicationId = "com.kuit.findu" minSdk = 28 - targetSdk = 34 - versionCode = 1 - versionName = "1.0" + targetSdk = 35 + versionCode = 2 + versionName = "1.0.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" buildConfigField("String", "GPT_KEY", properties["GPT_KEY"].toString()) @@ -35,6 +35,18 @@ android { manifestPlaceholders["KAKAO_NATIVE_APP_KEY_MANIFEST"] = properties["kakao.native.app.key.manifest"].toString() } + signingConfigs { + create("release") { + val propertiesFile = rootProject.file("keystore.properties") + val properties = Properties() + properties.load(propertiesFile.inputStream()) + storeFile = file(properties["STORE_FILE"] as String) + storePassword = properties["STORE_PASSWORD"] as String + keyAlias = properties["KEY_ALIAS"] as String + keyPassword = properties["KEY_PASSWORD"] as String + } + } + buildTypes { release { isMinifyEnabled = false diff --git a/app/src/androidTest/java/com/example/findu/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/kuit/findu/ExampleInstrumentedTest.kt similarity index 86% rename from app/src/androidTest/java/com/example/findu/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/com/kuit/findu/ExampleInstrumentedTest.kt index 237fa78d..bf335346 100644 --- a/app/src/androidTest/java/com/example/findu/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/kuit/findu/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.example.findu +package com.kuit.findu import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.example.findu", appContext.packageName) + assertEquals("com.kuit.findu", appContext.packageName) } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b1d77a00..c5e84539 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ + xmlns:tools="http://schemas.android.com/tools" + package="com.kuit.findu"> + + - - + - diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasource/AuthRemoteDataSource.kt b/app/src/main/java/com/example/findu/data/dataremote/datasource/AuthRemoteDataSource.kt deleted file mode 100644 index ff8acf85..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/datasource/AuthRemoteDataSource.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.example.findu.data.dataremote.datasource - -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.base.NullableBaseResponse -import com.example.findu.data.dataremote.model.request.GuestLoginRequestDto -import com.example.findu.data.dataremote.model.request.LoginRequestDto -import com.example.findu.data.dataremote.model.response.CheckNicknameResponseDto -import com.example.findu.data.dataremote.model.response.auth.GuestLoginResponseDto -import com.example.findu.data.dataremote.model.response.auth.LoginResponseDto -import com.example.findu.data.dataremote.model.response.auth.UserInfoDto -import retrofit2.Response -import java.io.File - -interface AuthRemoteDataSource { - suspend fun postLogin( - loginRequestDto: LoginRequestDto - ): NullableBaseResponse - - suspend fun postGuestLogin( - guestLoginRequestDto: GuestLoginRequestDto - ): NullableBaseResponse - - suspend fun postCheckNickname( - nickname: String - ): BaseResponse - - suspend fun postSignup( - profileImageFile: File?, - defaultImageName: String?, - nickname: String, - kakaoId: Long, - deviceId: String - ): NullableBaseResponse -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasource/BreedRemoteDataSource.kt b/app/src/main/java/com/example/findu/data/dataremote/datasource/BreedRemoteDataSource.kt deleted file mode 100644 index 9f26d038..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/datasource/BreedRemoteDataSource.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.findu.data.dataremote.datasource - -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.request.AiDetectionRequestDto -import com.example.findu.data.dataremote.model.response.breed.AiDetectionResponseDto -import com.example.findu.data.dataremote.model.response.breed.BreedResponseDto -import com.example.findu.data.dataremote.model.response.breed.BreedValidationResponseDto - - -interface BreedRemoteDataSource { - suspend fun getBreed(): BaseResponse - - suspend fun getBreedValidation(breedName: String): BaseResponse - - suspend fun postAiDetection(request: AiDetectionRequestDto): BaseResponse -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasource/DetailSearchRemoteDataSource.kt b/app/src/main/java/com/example/findu/data/dataremote/datasource/DetailSearchRemoteDataSource.kt deleted file mode 100644 index e583fb82..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/datasource/DetailSearchRemoteDataSource.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.example.findu.data.dataremote.datasource - -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.response.search.DetailMissingResponseDto -import com.example.findu.data.dataremote.model.response.search.DetailProtectResponseDto -import com.example.findu.data.dataremote.model.response.search.DetailWitnessResponseDto - -interface DetailSearchRemoteDataSource { - suspend fun getDetailSearchProtect(reportId: Long): BaseResponse - suspend fun getDetailSearchMissing(reportId: Long): BaseResponse - suspend fun getDetailSearchWitness(reportId: Long): BaseResponse -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasource/DummyRemoteDataSource.kt b/app/src/main/java/com/example/findu/data/dataremote/datasource/DummyRemoteDataSource.kt deleted file mode 100644 index 612f821f..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/datasource/DummyRemoteDataSource.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.findu.data.dataremote.datasource - -import com.example.findu.data.dataremote.model.response.DummyResponseDto - -interface DummyRemoteDataSource { - suspend fun dummy(): DummyResponseDto -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasource/GptRemoteDataSource.kt b/app/src/main/java/com/example/findu/data/dataremote/datasource/GptRemoteDataSource.kt deleted file mode 100644 index 5b0aea39..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/datasource/GptRemoteDataSource.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.findu.data.dataremote.datasource - -import com.example.findu.data.dataremote.model.request.GptRequestDto -import com.example.findu.data.dataremote.model.response.GptResponseDto - -interface GptRemoteDataSource { - suspend fun postImagePrompt( - request: GptRequestDto - ) : GptResponseDto -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasource/HomeRemoteDataSource.kt b/app/src/main/java/com/example/findu/data/dataremote/datasource/HomeRemoteDataSource.kt deleted file mode 100644 index d0509a51..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/datasource/HomeRemoteDataSource.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.findu.data.dataremote.datasource - -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.response.home.HomeResponseDto - -interface HomeRemoteDataSource { - suspend fun getHome( - lat: Double? = null, - lon: Double? = null - ): BaseResponse -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasource/InquiryRemoteDataSource.kt b/app/src/main/java/com/example/findu/data/dataremote/datasource/InquiryRemoteDataSource.kt deleted file mode 100644 index d9a14652..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/datasource/InquiryRemoteDataSource.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.example.findu.data.dataremote.datasource - -import com.example.findu.data.dataremote.model.base.NullableBaseResponse -import com.example.findu.data.dataremote.model.request.PostInquiryRequestDto - -interface InquiryRemoteDataSource { - suspend fun postInquiry( request: PostInquiryRequestDto): NullableBaseResponse -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasource/NaverRemoteDataSource.kt b/app/src/main/java/com/example/findu/data/dataremote/datasource/NaverRemoteDataSource.kt deleted file mode 100644 index 3cbb4a62..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/datasource/NaverRemoteDataSource.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.findu.data.dataremote.datasource - -import com.example.findu.data.dataremote.model.response.report.GeocodeResponseDto -import com.example.findu.data.dataremote.model.response.report.ReverseGeocodeResponseDto - -interface NaverRemoteDataSource { - suspend fun getAddress( - coords: String - ) : ReverseGeocodeResponseDto - - suspend fun getLatLng( - address: String - ) : GeocodeResponseDto -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasource/SearchRemoteDataSource.kt b/app/src/main/java/com/example/findu/data/dataremote/datasource/SearchRemoteDataSource.kt deleted file mode 100644 index d9093c33..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/datasource/SearchRemoteDataSource.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.findu.data.dataremote.datasource - -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.response.search.SearchResponseDto -import com.example.findu.domain.model.search.SearchFilterData - -interface SearchRemoteDataSource { - suspend fun getReports( - type: String, - searchFilterData: SearchFilterData?, - lastId: Long = Long.MAX_VALUE, - ): BaseResponse -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/BreedRemoteDataSourceImpl.kt b/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/BreedRemoteDataSourceImpl.kt deleted file mode 100644 index e66f0711..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/BreedRemoteDataSourceImpl.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.findu.data.dataremote.datasourceimpl - -import com.example.findu.data.dataremote.datasource.BreedRemoteDataSource -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.request.AiDetectionRequestDto -import com.example.findu.data.dataremote.model.response.breed.AiDetectionResponseDto -import com.example.findu.data.dataremote.model.response.breed.BreedResponseDto -import com.example.findu.data.dataremote.model.response.breed.BreedValidationResponseDto -import com.example.findu.data.dataremote.service.BreedService -import javax.inject.Inject - -class BreedRemoteDataSourceImpl @Inject constructor( - private val service: BreedService -) : BreedRemoteDataSource { - override suspend fun getBreed(): BaseResponse = - service.getBreeds() - - override suspend fun getBreedValidation(breedName: String): BaseResponse = - service.getBreedValidation(breedName) - - override suspend fun postAiDetection(request: AiDetectionRequestDto): BaseResponse = - service.postAiDetection(request) -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/DummyRemoteDataSourceImpl.kt b/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/DummyRemoteDataSourceImpl.kt deleted file mode 100644 index 98149868..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/DummyRemoteDataSourceImpl.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.findu.data.dataremote.datasourceimpl - -import com.example.findu.data.dataremote.datasource.DummyRemoteDataSource -import com.example.findu.data.dataremote.model.response.DummyResponseDto -import com.example.findu.data.dataremote.service.DummyService -import javax.inject.Inject - -class DummyRemoteDataSourceImpl @Inject constructor( - private val service: DummyService -) : DummyRemoteDataSource { - override suspend fun dummy(): DummyResponseDto = - service.dummy() -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/GptRemoteDataSourceImpl.kt b/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/GptRemoteDataSourceImpl.kt deleted file mode 100644 index 6cf14791..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/GptRemoteDataSourceImpl.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.findu.data.dataremote.datasourceimpl - -import com.example.findu.data.dataremote.datasource.GptRemoteDataSource -import com.example.findu.data.dataremote.model.request.GptRequestDto -import com.example.findu.data.dataremote.model.response.GptResponseDto -import com.example.findu.data.dataremote.service.GptService -import javax.inject.Inject - -class GptRemoteDataSourceImpl @Inject constructor( - private val gptService: GptService -) : GptRemoteDataSource { - override suspend fun postImagePrompt( - request: GptRequestDto - ): GptResponseDto = - gptService.recognizeImage(request = request) -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/HomeRemoteDataSourceImpl.kt b/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/HomeRemoteDataSourceImpl.kt deleted file mode 100644 index cebdb5b8..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/HomeRemoteDataSourceImpl.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.findu.data.dataremote.datasourceimpl - -import com.example.findu.data.dataremote.datasource.HomeRemoteDataSource -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.response.home.HomeResponseDto -import com.example.findu.data.dataremote.service.HomeService -import javax.inject.Inject - -class HomeRemoteDataSourceImpl @Inject constructor( - private val homeService: HomeService -): HomeRemoteDataSource { - override suspend fun getHome( - lat: Double?, - lon: Double? - ): BaseResponse = - homeService.getHome(lat, lon) -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/InquiryRemoteDataSourceImpl.kt b/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/InquiryRemoteDataSourceImpl.kt deleted file mode 100644 index c802fe65..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/InquiryRemoteDataSourceImpl.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.example.findu.data.dataremote.datasourceimpl - -import com.example.findu.data.dataremote.datasource.InquiryRemoteDataSource -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.base.NullableBaseResponse -import com.example.findu.data.dataremote.model.request.PostInquiryRequestDto -import com.example.findu.data.dataremote.service.InquiryService -import com.example.findu.data.dataremote.util.handleBaseResponse -import com.example.findu.domain.repository.InquiryRepository -import javax.inject.Inject - - -class InquiryRemoteDataSourceImpl @Inject constructor( - private val inquiryService: InquiryService -) : InquiryRemoteDataSource { - override suspend fun postInquiry(request: PostInquiryRequestDto) - = inquiryService.postInquiry(request) -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/service/DummyService.kt b/app/src/main/java/com/example/findu/data/dataremote/service/DummyService.kt deleted file mode 100644 index 434ea11d..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/service/DummyService.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.example.findu.data.dataremote.service - -import com.example.findu.data.dataremote.model.response.DummyResponseDto -import retrofit2.http.GET - -interface DummyService { - @GET("/API") - suspend fun dummy(): DummyResponseDto -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/service/HomeService.kt b/app/src/main/java/com/example/findu/data/dataremote/service/HomeService.kt deleted file mode 100644 index 04849328..00000000 --- a/app/src/main/java/com/example/findu/data/dataremote/service/HomeService.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.findu.data.dataremote.service - -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.response.home.HomeResponseDto -import com.example.findu.data.dataremote.util.ApiConstraints.API -import com.example.findu.data.dataremote.util.ApiConstraints.HOME -import com.example.findu.data.dataremote.util.ApiConstraints.VERSION -import retrofit2.http.GET -import retrofit2.http.Query - -interface HomeService { - @GET("/$API/$VERSION/$HOME") - suspend fun getHome( - @Query("lat") lat: Double? = null, - @Query("lon") lon: Double? = null - ): BaseResponse -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/mapper/DataMapper.kt b/app/src/main/java/com/example/findu/data/mapper/DataMapper.kt deleted file mode 100644 index 77079daa..00000000 --- a/app/src/main/java/com/example/findu/data/mapper/DataMapper.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.findu.data.mapper - -import com.example.findu.data.dataremote.model.response.DummyResponseDto -import com.example.findu.domain.model.DummyData - -fun DummyResponseDto.toDomainModel(): DummyData { - return DummyData( - description = this.dummy + "입니다 " - ) -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/mapper/toDomain/extra/SidoListDtoMapper.kt b/app/src/main/java/com/example/findu/data/mapper/toDomain/extra/SidoListDtoMapper.kt deleted file mode 100644 index 165532e5..00000000 --- a/app/src/main/java/com/example/findu/data/mapper/toDomain/extra/SidoListDtoMapper.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.example.findu.data.mapper.todomain.extra - -import com.example.findu.data.dataremote.model.response.information.SidoListDto -import com.example.findu.domain.model.extra.Sido - -fun SidoListDto.toDomain(): List = - sidoList.map { sidoItemDto -> - Sido( - id = sidoItemDto.id, - name = sidoItemDto.name - ) - } diff --git a/app/src/main/java/com/example/findu/data/mapper/todomain/GuestLoginResponseDtoMapper.kt b/app/src/main/java/com/example/findu/data/mapper/todomain/GuestLoginResponseDtoMapper.kt deleted file mode 100644 index 3ce1a97a..00000000 --- a/app/src/main/java/com/example/findu/data/mapper/todomain/GuestLoginResponseDtoMapper.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.findu.data.mapper.todomain - -import com.example.findu.data.dataremote.model.response.auth.GuestLoginResponseDto -import com.example.findu.domain.model.GuestLoginData - -fun GuestLoginResponseDto.toDomain(): GuestLoginData = - GuestLoginData( - userId = this.userId, - accessToken = this.accessToken - ) \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/mapper/todomain/LoginResponseDtoMapper.kt b/app/src/main/java/com/example/findu/data/mapper/todomain/LoginResponseDtoMapper.kt deleted file mode 100644 index f53d1e7b..00000000 --- a/app/src/main/java/com/example/findu/data/mapper/todomain/LoginResponseDtoMapper.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.findu.data.mapper.todomain - -import com.example.findu.data.dataremote.model.response.auth.LoginResponseDto -import com.example.findu.data.mapper.todomain.home.toDomain -import com.example.findu.domain.model.LoginData - -fun LoginResponseDto.toDomain(): LoginData = - LoginData( - isFirstLogin = isFirstLogin, - userInfo = userInfo?.toDomain() - ) \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/mapper/todomain/UserInfoDtoMapper.kt b/app/src/main/java/com/example/findu/data/mapper/todomain/UserInfoDtoMapper.kt deleted file mode 100644 index f988ce28..00000000 --- a/app/src/main/java/com/example/findu/data/mapper/todomain/UserInfoDtoMapper.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.findu.data.mapper.todomain - -import com.example.findu.data.dataremote.model.response.auth.UserInfoDto -import com.example.findu.domain.model.UserInfo - -fun UserInfoDto.toDomain(): UserInfo = - UserInfo( - userId = this.userId, - nickname = this.nickname, - accessToken = this.accessToken - ) \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/mapper/todomain/breed/AiDetectionResponseDtoMapper.kt b/app/src/main/java/com/example/findu/data/mapper/todomain/breed/AiDetectionResponseDtoMapper.kt deleted file mode 100644 index fd174e03..00000000 --- a/app/src/main/java/com/example/findu/data/mapper/todomain/breed/AiDetectionResponseDtoMapper.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.findu.data.mapper.todomain.breed - -import com.example.findu.data.dataremote.model.response.breed.AiDetectionResponseDto -import com.example.findu.domain.model.breed.AiDetectionData - -fun AiDetectionResponseDto.toDomain() = AiDetectionData( - species = species, - breed = breed, - furColors = furColors -) \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/mapper/todomain/my/MyProfileMapper.kt b/app/src/main/java/com/example/findu/data/mapper/todomain/my/MyProfileMapper.kt deleted file mode 100644 index 30222a7d..00000000 --- a/app/src/main/java/com/example/findu/data/mapper/todomain/my/MyProfileMapper.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.findu.data.mapper.todomain.my - -import com.example.findu.data.dataremote.model.response.my.MyNickNameResponseDto -import com.example.findu.domain.model.my.MyProfileData - -fun MyNickNameResponseDto.toDomain(): MyProfileData = - MyProfileData( - nickname = nickname, - profileImage = profileImage - ) \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/mapper/todomain/report/ReportResponseDtoMapper.kt b/app/src/main/java/com/example/findu/data/mapper/todomain/report/ReportResponseDtoMapper.kt deleted file mode 100644 index 9e5c6c0a..00000000 --- a/app/src/main/java/com/example/findu/data/mapper/todomain/report/ReportResponseDtoMapper.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.findu.data.mapper.todomain.report - -import com.example.findu.data.dataremote.model.response.report.ImageUploadResponseDto - -fun ImageUploadResponseDto.toList() = this.urls \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/mapper/torequest/AiDetectionRequestDtoMapper.kt b/app/src/main/java/com/example/findu/data/mapper/torequest/AiDetectionRequestDtoMapper.kt deleted file mode 100644 index 529290fe..00000000 --- a/app/src/main/java/com/example/findu/data/mapper/torequest/AiDetectionRequestDtoMapper.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.findu.data.mapper.torequest - -import com.example.findu.data.dataremote.model.request.AiDetectionRequestDto - -fun String.toAiDetectionRequest() = AiDetectionRequestDto( - base64Image = this -) \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/mapper/torequest/GuestLoginRequestDtoMapper.kt b/app/src/main/java/com/example/findu/data/mapper/torequest/GuestLoginRequestDtoMapper.kt deleted file mode 100644 index cfc13187..00000000 --- a/app/src/main/java/com/example/findu/data/mapper/torequest/GuestLoginRequestDtoMapper.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.example.findu.data.mapper.torequest - -import com.example.findu.data.dataremote.model.request.GuestLoginRequestDto -import com.example.findu.data.dataremote.model.request.LoginRequestDto -import com.example.findu.domain.model.LoginInfo - - -fun String.toRequestDto() = - GuestLoginRequestDto(deviceId = this) \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/mapper/torequest/LoginRequestDtoMapper.kt b/app/src/main/java/com/example/findu/data/mapper/torequest/LoginRequestDtoMapper.kt deleted file mode 100644 index 24a6e6c0..00000000 --- a/app/src/main/java/com/example/findu/data/mapper/torequest/LoginRequestDtoMapper.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.example.findu.data.mapper.torequest - -import com.example.findu.data.dataremote.model.request.LoginRequestDto -import com.example.findu.domain.model.LoginInfo - - -fun LoginInfo.toRequestDto() = - LoginRequestDto(kakaoId = this.kakaoId, deviceId = this.deviceId) \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/domain/repository/DummyRepository.kt b/app/src/main/java/com/example/findu/domain/repository/DummyRepository.kt deleted file mode 100644 index 88d2e362..00000000 --- a/app/src/main/java/com/example/findu/domain/repository/DummyRepository.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.findu.domain.repository - -import com.example.findu.domain.model.DummyData - -interface DummyRepository{ - suspend fun dummy():Result -} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/presentation/mapper/todomain/SearchFilterToDomainMapper.kt b/app/src/main/java/com/example/findu/presentation/mapper/todomain/SearchFilterToDomainMapper.kt deleted file mode 100644 index 0e916e9a..00000000 --- a/app/src/main/java/com/example/findu/presentation/mapper/todomain/SearchFilterToDomainMapper.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.example.findu.presentation.mapper.todomain - -import com.example.findu.domain.model.search.SearchFilterData -import com.example.findu.presentation.ui.search.model.SearchFilterUiModel - -fun SearchFilterUiModel.toDomain() = SearchFilterData( - breeds = breeds, - location = location, - species = species, - startDate = startDate, - endDate = endDate -) \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/model/SearchDate.kt b/app/src/main/java/com/example/findu/presentation/ui/search/model/SearchDate.kt deleted file mode 100644 index e56a85ee..00000000 --- a/app/src/main/java/com/example/findu/presentation/ui/search/model/SearchDate.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.example.findu.presentation.ui.search.model - -enum class Type { DATE_START, DATE_END } \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/FindUApp.kt b/app/src/main/java/com/kuit/findu/FindUApp.kt similarity index 50% rename from app/src/main/java/com/example/findu/FindUApp.kt rename to app/src/main/java/com/kuit/findu/FindUApp.kt index c6858659..e3f3d5a0 100644 --- a/app/src/main/java/com/example/findu/FindUApp.kt +++ b/app/src/main/java/com/kuit/findu/FindUApp.kt @@ -1,16 +1,9 @@ -package com.example.findu +package com.kuit.findu import android.app.Application -import android.content.pm.PackageManager -import android.os.Build -import android.util.Base64 -import android.util.Log -import com.example.findu.BuildConfig.KAKAO_NATIVE_APP_KEY +import com.kuit.findu.BuildConfig.KAKAO_NATIVE_APP_KEY import dagger.hilt.android.HiltAndroidApp -import java.security.MessageDigest -import java.security.NoSuchAlgorithmException import com.kakao.sdk.common.KakaoSdk -import com.kakao.sdk.common.util.Utility @HiltAndroidApp class FindUApp : Application() { diff --git a/app/src/main/java/com/example/findu/data/datalocal/datasource/DeviceLocalDataSource.kt b/app/src/main/java/com/kuit/findu/data/datalocal/datasource/DeviceLocalDataSource.kt similarity index 66% rename from app/src/main/java/com/example/findu/data/datalocal/datasource/DeviceLocalDataSource.kt rename to app/src/main/java/com/kuit/findu/data/datalocal/datasource/DeviceLocalDataSource.kt index ef778462..4a454114 100644 --- a/app/src/main/java/com/example/findu/data/datalocal/datasource/DeviceLocalDataSource.kt +++ b/app/src/main/java/com/kuit/findu/data/datalocal/datasource/DeviceLocalDataSource.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.datalocal.datasource +package com.kuit.findu.data.datalocal.datasource interface DeviceLocalDataSource { var deviceId: String diff --git a/app/src/main/java/com/example/findu/data/datalocal/datasource/DummyLocalDataSource.kt b/app/src/main/java/com/kuit/findu/data/datalocal/datasource/DummyLocalDataSource.kt similarity index 65% rename from app/src/main/java/com/example/findu/data/datalocal/datasource/DummyLocalDataSource.kt rename to app/src/main/java/com/kuit/findu/data/datalocal/datasource/DummyLocalDataSource.kt index 6392fbd0..c38b47af 100644 --- a/app/src/main/java/com/example/findu/data/datalocal/datasource/DummyLocalDataSource.kt +++ b/app/src/main/java/com/kuit/findu/data/datalocal/datasource/DummyLocalDataSource.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.datalocal.datasource +package com.kuit.findu.data.datalocal.datasource interface DummyLocalDataSource { var token: String diff --git a/app/src/main/java/com/example/findu/data/datalocal/datasource/TokenLocalDataSource.kt b/app/src/main/java/com/kuit/findu/data/datalocal/datasource/TokenLocalDataSource.kt similarity index 68% rename from app/src/main/java/com/example/findu/data/datalocal/datasource/TokenLocalDataSource.kt rename to app/src/main/java/com/kuit/findu/data/datalocal/datasource/TokenLocalDataSource.kt index b6d52bfe..0a51f28e 100644 --- a/app/src/main/java/com/example/findu/data/datalocal/datasource/TokenLocalDataSource.kt +++ b/app/src/main/java/com/kuit/findu/data/datalocal/datasource/TokenLocalDataSource.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.datalocal.datasource +package com.kuit.findu.data.datalocal.datasource interface TokenLocalDataSource { var accessToken: String diff --git a/app/src/main/java/com/example/findu/data/datalocal/datasourceimpl/DeviceLocalDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/datalocal/datasourceimpl/DeviceLocalDataSourceImpl.kt similarity index 90% rename from app/src/main/java/com/example/findu/data/datalocal/datasourceimpl/DeviceLocalDataSourceImpl.kt rename to app/src/main/java/com/kuit/findu/data/datalocal/datasourceimpl/DeviceLocalDataSourceImpl.kt index da799e89..09885d8e 100644 --- a/app/src/main/java/com/example/findu/data/datalocal/datasourceimpl/DeviceLocalDataSourceImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/datalocal/datasourceimpl/DeviceLocalDataSourceImpl.kt @@ -1,9 +1,9 @@ -package com.example.findu.data.datalocal.datasourceimpl +package com.kuit.findu.data.datalocal.datasourceimpl import android.content.Context import android.content.SharedPreferences import androidx.core.content.edit -import com.example.findu.data.datalocal.datasource.DeviceLocalDataSource +import com.kuit.findu.data.datalocal.datasource.DeviceLocalDataSource import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject diff --git a/app/src/main/java/com/example/findu/data/datalocal/datasourceimpl/DummyLocalDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/datalocal/datasourceimpl/DummyLocalDataSourceImpl.kt similarity index 89% rename from app/src/main/java/com/example/findu/data/datalocal/datasourceimpl/DummyLocalDataSourceImpl.kt rename to app/src/main/java/com/kuit/findu/data/datalocal/datasourceimpl/DummyLocalDataSourceImpl.kt index 1547cb79..64aff76b 100644 --- a/app/src/main/java/com/example/findu/data/datalocal/datasourceimpl/DummyLocalDataSourceImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/datalocal/datasourceimpl/DummyLocalDataSourceImpl.kt @@ -1,9 +1,9 @@ -package com.example.findu.data.datalocal.datasourceimpl +package com.kuit.findu.data.datalocal.datasourceimpl import android.content.Context import android.content.SharedPreferences import androidx.core.content.edit -import com.example.findu.data.datalocal.datasource.DummyLocalDataSource +import com.kuit.findu.data.datalocal.datasource.DummyLocalDataSource import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject diff --git a/app/src/main/java/com/example/findu/data/datalocal/datasourceimpl/TokenLocalDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/datalocal/datasourceimpl/TokenLocalDataSourceImpl.kt similarity index 84% rename from app/src/main/java/com/example/findu/data/datalocal/datasourceimpl/TokenLocalDataSourceImpl.kt rename to app/src/main/java/com/kuit/findu/data/datalocal/datasourceimpl/TokenLocalDataSourceImpl.kt index 9528b63c..09ab8bb0 100644 --- a/app/src/main/java/com/example/findu/data/datalocal/datasourceimpl/TokenLocalDataSourceImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/datalocal/datasourceimpl/TokenLocalDataSourceImpl.kt @@ -1,9 +1,9 @@ -package com.example.findu.data.datalocal.datasourceimpl +package com.kuit.findu.data.datalocal.datasourceimpl import android.content.SharedPreferences import androidx.core.content.edit -import com.example.findu.data.datalocal.datasource.TokenLocalDataSource -import com.example.findu.di.qualifier.TokenPrefs +import com.kuit.findu.data.datalocal.datasource.TokenLocalDataSource +import com.kuit.findu.di.qualifier.TokenPrefs import javax.inject.Inject class TokenLocalDataSourceImpl @Inject constructor( diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/datasource/AuthRemoteDataSource.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/AuthRemoteDataSource.kt new file mode 100644 index 00000000..12fc99a9 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/AuthRemoteDataSource.kt @@ -0,0 +1,33 @@ +package com.kuit.findu.data.dataremote.datasource + +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.request.GuestLoginRequestDto +import com.kuit.findu.data.dataremote.model.request.LoginRequestDto +import com.kuit.findu.data.dataremote.model.response.CheckNicknameResponseDto +import com.kuit.findu.data.dataremote.model.response.auth.GuestLoginResponseDto +import com.kuit.findu.data.dataremote.model.response.auth.LoginResponseDto +import com.kuit.findu.data.dataremote.model.response.auth.UserInfoDto +import java.io.File + +interface AuthRemoteDataSource { + suspend fun postLogin( + loginRequestDto: LoginRequestDto + ): NullableBaseResponse + + suspend fun postGuestLogin( + guestLoginRequestDto: GuestLoginRequestDto + ): NullableBaseResponse + + suspend fun postCheckNickname( + nickname: String + ): BaseResponse + + suspend fun postSignup( + profileImageFile: File?, + defaultImageName: String?, + nickname: String, + kakaoId: Long, + deviceId: String + ): NullableBaseResponse +} \ No newline at end of file diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/datasource/BreedRemoteDataSource.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/BreedRemoteDataSource.kt new file mode 100644 index 00000000..07331de1 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/BreedRemoteDataSource.kt @@ -0,0 +1,16 @@ +package com.kuit.findu.data.dataremote.datasource + +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.request.AiDetectionRequestDto +import com.kuit.findu.data.dataremote.model.response.breed.AiDetectionResponseDto +import com.kuit.findu.data.dataremote.model.response.breed.BreedResponseDto +import com.kuit.findu.data.dataremote.model.response.breed.BreedValidationResponseDto + + +interface BreedRemoteDataSource { + suspend fun getBreed(): BaseResponse + + suspend fun getBreedValidation(breedName: String): BaseResponse + + suspend fun postAiDetection(request: AiDetectionRequestDto): BaseResponse +} \ No newline at end of file diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/datasource/DetailSearchRemoteDataSource.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/DetailSearchRemoteDataSource.kt new file mode 100644 index 00000000..8ad0d55d --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/DetailSearchRemoteDataSource.kt @@ -0,0 +1,12 @@ +package com.kuit.findu.data.dataremote.datasource + +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.response.search.DetailMissingResponseDto +import com.kuit.findu.data.dataremote.model.response.search.DetailProtectResponseDto +import com.kuit.findu.data.dataremote.model.response.search.DetailWitnessResponseDto + +interface DetailSearchRemoteDataSource { + suspend fun getDetailSearchProtect(reportId: Long): BaseResponse + suspend fun getDetailSearchMissing(reportId: Long): BaseResponse + suspend fun getDetailSearchWitness(reportId: Long): BaseResponse +} \ No newline at end of file diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/datasource/DummyRemoteDataSource.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/DummyRemoteDataSource.kt new file mode 100644 index 00000000..da465704 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/DummyRemoteDataSource.kt @@ -0,0 +1,7 @@ +package com.kuit.findu.data.dataremote.datasource + +import com.kuit.findu.data.dataremote.model.response.DummyResponseDto + +interface DummyRemoteDataSource { + suspend fun dummy(): DummyResponseDto +} \ No newline at end of file diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/datasource/GptRemoteDataSource.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/GptRemoteDataSource.kt new file mode 100644 index 00000000..ad8dfdd2 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/GptRemoteDataSource.kt @@ -0,0 +1,10 @@ +package com.kuit.findu.data.dataremote.datasource + +import com.kuit.findu.data.dataremote.model.request.GptRequestDto +import com.kuit.findu.data.dataremote.model.response.GptResponseDto + +interface GptRemoteDataSource { + suspend fun postImagePrompt( + request: GptRequestDto + ) : GptResponseDto +} \ No newline at end of file diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/datasource/HomeRemoteDataSource.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/HomeRemoteDataSource.kt new file mode 100644 index 00000000..c01329e4 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/HomeRemoteDataSource.kt @@ -0,0 +1,11 @@ +package com.kuit.findu.data.dataremote.datasource + +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.response.home.HomeResponseDto + +interface HomeRemoteDataSource { + suspend fun getHome( + lat: Double? = null, + lon: Double? = null, + ): BaseResponse +} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasource/InformationRemoteDataSource.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/InformationRemoteDataSource.kt similarity index 53% rename from app/src/main/java/com/example/findu/data/dataremote/datasource/InformationRemoteDataSource.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/datasource/InformationRemoteDataSource.kt index 9fc3e30b..942566af 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/datasource/InformationRemoteDataSource.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/InformationRemoteDataSource.kt @@ -1,11 +1,11 @@ -package com.example.findu.data.dataremote.datasource +package com.kuit.findu.data.dataremote.datasource -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.response.information.VolunteersResponseDto -import com.example.findu.data.dataremote.model.response.information.CentersResponseDto -import com.example.findu.data.dataremote.model.response.information.DepartmentsResponseDto -import com.example.findu.data.dataremote.model.response.information.SidoListDto -import com.example.findu.data.dataremote.model.response.information.SigunguListDto +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.response.information.VolunteersResponseDto +import com.kuit.findu.data.dataremote.model.response.information.CentersResponseDto +import com.kuit.findu.data.dataremote.model.response.information.DepartmentsResponseDto +import com.kuit.findu.data.dataremote.model.response.information.SidoListDto +import com.kuit.findu.data.dataremote.model.response.information.SigunguListDto interface InformationRemoteDataSource { suspend fun getVolunteers( diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/datasource/InquiryRemoteDataSource.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/InquiryRemoteDataSource.kt new file mode 100644 index 00000000..d151baf8 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/InquiryRemoteDataSource.kt @@ -0,0 +1,8 @@ +package com.kuit.findu.data.dataremote.datasource + +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.request.PostInquiryRequestDto + +interface InquiryRemoteDataSource { + suspend fun postInquiry( request: PostInquiryRequestDto): NullableBaseResponse +} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasource/InterestRemoteDataSource.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/InterestRemoteDataSource.kt similarity index 59% rename from app/src/main/java/com/example/findu/data/dataremote/datasource/InterestRemoteDataSource.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/datasource/InterestRemoteDataSource.kt index 2f36c43c..68a0e53f 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/datasource/InterestRemoteDataSource.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/InterestRemoteDataSource.kt @@ -1,7 +1,7 @@ -package com.example.findu.data.dataremote.datasource +package com.kuit.findu.data.dataremote.datasource -import com.example.findu.data.dataremote.model.base.NullableBaseResponse -import com.example.findu.data.dataremote.model.response.my.MyInterestResponseDto +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.response.my.MyInterestResponseDto interface InterestRemoteDataSource { suspend fun getInterestAnimals(lastId: Long): NullableBaseResponse diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasource/MyRemoteDataSource.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/MyRemoteDataSource.kt similarity index 56% rename from app/src/main/java/com/example/findu/data/dataremote/datasource/MyRemoteDataSource.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/datasource/MyRemoteDataSource.kt index dac48e06..ff62a3ac 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/datasource/MyRemoteDataSource.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/MyRemoteDataSource.kt @@ -1,12 +1,12 @@ -package com.example.findu.data.dataremote.datasource - -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.base.NullableBaseResponse -import com.example.findu.data.dataremote.model.request.PatchNicknameRequestDto -import com.example.findu.data.dataremote.model.response.my.MyInterestResponseDto -import com.example.findu.data.dataremote.model.response.my.MyNickNameResponseDto -import com.example.findu.data.dataremote.model.response.my.MyReportHistoryResponseDto -import com.example.findu.data.dataremote.model.response.my.MyViewedAnimalsResponseDto +package com.kuit.findu.data.dataremote.datasource + +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.request.PatchNicknameRequestDto +import com.kuit.findu.data.dataremote.model.response.my.MyInterestResponseDto +import com.kuit.findu.data.dataremote.model.response.my.MyNickNameResponseDto +import com.kuit.findu.data.dataremote.model.response.my.MyReportHistoryResponseDto +import com.kuit.findu.data.dataremote.model.response.my.MyViewedAnimalsResponseDto import okhttp3.MultipartBody import okhttp3.RequestBody import java.io.File diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/datasource/NaverRemoteDataSource.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/NaverRemoteDataSource.kt new file mode 100644 index 00000000..ef2f3d08 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/NaverRemoteDataSource.kt @@ -0,0 +1,14 @@ +package com.kuit.findu.data.dataremote.datasource + +import com.kuit.findu.data.dataremote.model.response.report.GeocodeResponseDto +import com.kuit.findu.data.dataremote.model.response.report.ReverseGeocodeResponseDto + +interface NaverRemoteDataSource { + suspend fun getAddress( + coords: String + ) : ReverseGeocodeResponseDto + + suspend fun getLatLng( + address: String + ) : GeocodeResponseDto +} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasource/ReportRemoteDataSource.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/ReportRemoteDataSource.kt similarity index 50% rename from app/src/main/java/com/example/findu/data/dataremote/datasource/ReportRemoteDataSource.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/datasource/ReportRemoteDataSource.kt index ee6c8015..58c22626 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/datasource/ReportRemoteDataSource.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/ReportRemoteDataSource.kt @@ -1,10 +1,10 @@ -package com.example.findu.data.dataremote.datasource +package com.kuit.findu.data.dataremote.datasource -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.base.NullableBaseResponse -import com.example.findu.data.dataremote.model.request.MissingReportRequestDto -import com.example.findu.data.dataremote.model.request.WitnessReportRequestDto -import com.example.findu.data.dataremote.model.response.report.ImageUploadResponseDto +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.request.MissingReportRequestDto +import com.kuit.findu.data.dataremote.model.request.WitnessReportRequestDto +import com.kuit.findu.data.dataremote.model.response.report.ImageUploadResponseDto import okhttp3.MultipartBody interface ReportRemoteDataSource { diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/datasource/SearchRemoteDataSource.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/SearchRemoteDataSource.kt new file mode 100644 index 00000000..4a665db8 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasource/SearchRemoteDataSource.kt @@ -0,0 +1,13 @@ +package com.kuit.findu.data.dataremote.datasource + +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.response.search.SearchResponseDto +import com.kuit.findu.domain.model.search.SearchFilterData + +interface SearchRemoteDataSource { + suspend fun getReports( + type: String, + searchFilterData: SearchFilterData?, + lastId: Long = Long.MAX_VALUE, + ): BaseResponse +} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/AuthRemoteDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/AuthRemoteDataSourceImpl.kt similarity index 56% rename from app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/AuthRemoteDataSourceImpl.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/AuthRemoteDataSourceImpl.kt index 47503070..13b6c354 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/AuthRemoteDataSourceImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/AuthRemoteDataSourceImpl.kt @@ -1,18 +1,18 @@ -package com.example.findu.data.dataremote.datasourceimpl +package com.kuit.findu.data.dataremote.datasourceimpl -import com.example.findu.data.dataremote.datasource.AuthRemoteDataSource -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.base.NullableBaseResponse -import com.example.findu.data.dataremote.model.request.CheckNicknameRequestDto -import com.example.findu.data.dataremote.model.request.GuestLoginRequestDto -import com.example.findu.data.dataremote.model.request.LoginRequestDto -import com.example.findu.data.dataremote.model.response.CheckNicknameResponseDto -import com.example.findu.data.dataremote.model.response.auth.GuestLoginResponseDto -import com.example.findu.data.dataremote.model.response.auth.LoginResponseDto -import com.example.findu.data.dataremote.model.response.auth.UserInfoDto -import com.example.findu.data.dataremote.service.AuthService -import com.example.findu.data.mapper.torequest.toImageMultipart -import com.example.findu.data.mapper.torequest.toPlainTextRequestBody +import com.kuit.findu.data.dataremote.datasource.AuthRemoteDataSource +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.request.CheckNicknameRequestDto +import com.kuit.findu.data.dataremote.model.request.GuestLoginRequestDto +import com.kuit.findu.data.dataremote.model.request.LoginRequestDto +import com.kuit.findu.data.dataremote.model.response.CheckNicknameResponseDto +import com.kuit.findu.data.dataremote.model.response.auth.GuestLoginResponseDto +import com.kuit.findu.data.dataremote.model.response.auth.LoginResponseDto +import com.kuit.findu.data.dataremote.model.response.auth.UserInfoDto +import com.kuit.findu.data.dataremote.service.AuthService +import com.kuit.findu.data.mapper.torequest.toImageMultipart +import com.kuit.findu.data.mapper.torequest.toPlainTextRequestBody import java.io.File import javax.inject.Inject diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/BreedRemoteDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/BreedRemoteDataSourceImpl.kt new file mode 100644 index 00000000..5c8bcacd --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/BreedRemoteDataSourceImpl.kt @@ -0,0 +1,23 @@ +package com.kuit.findu.data.dataremote.datasourceimpl + +import com.kuit.findu.data.dataremote.datasource.BreedRemoteDataSource +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.request.AiDetectionRequestDto +import com.kuit.findu.data.dataremote.model.response.breed.AiDetectionResponseDto +import com.kuit.findu.data.dataremote.model.response.breed.BreedResponseDto +import com.kuit.findu.data.dataremote.model.response.breed.BreedValidationResponseDto +import com.kuit.findu.data.dataremote.service.BreedService +import javax.inject.Inject + +class BreedRemoteDataSourceImpl @Inject constructor( + private val service: BreedService +) : BreedRemoteDataSource { + override suspend fun getBreed(): BaseResponse = + service.getBreeds() + + override suspend fun getBreedValidation(breedName: String): BaseResponse = + service.getBreedValidation(breedName) + + override suspend fun postAiDetection(request: AiDetectionRequestDto): BaseResponse = + service.postAiDetection(request) +} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/DetailSearchRemoteDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/DetailSearchRemoteDataSourceImpl.kt similarity index 55% rename from app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/DetailSearchRemoteDataSourceImpl.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/DetailSearchRemoteDataSourceImpl.kt index f132631c..58b88af6 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/DetailSearchRemoteDataSourceImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/DetailSearchRemoteDataSourceImpl.kt @@ -1,11 +1,11 @@ -package com.example.findu.data.dataremote.datasourceimpl +package com.kuit.findu.data.dataremote.datasourceimpl -import com.example.findu.data.dataremote.datasource.DetailSearchRemoteDataSource -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.response.search.DetailMissingResponseDto -import com.example.findu.data.dataremote.model.response.search.DetailProtectResponseDto -import com.example.findu.data.dataremote.model.response.search.DetailWitnessResponseDto -import com.example.findu.data.dataremote.service.DetailSearchService +import com.kuit.findu.data.dataremote.datasource.DetailSearchRemoteDataSource +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.response.search.DetailMissingResponseDto +import com.kuit.findu.data.dataremote.model.response.search.DetailProtectResponseDto +import com.kuit.findu.data.dataremote.model.response.search.DetailWitnessResponseDto +import com.kuit.findu.data.dataremote.service.DetailSearchService import javax.inject.Inject class DetailSearchRemoteDataSourceImpl @Inject constructor( diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/DummyRemoteDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/DummyRemoteDataSourceImpl.kt new file mode 100644 index 00000000..e7b3a756 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/DummyRemoteDataSourceImpl.kt @@ -0,0 +1,13 @@ +package com.kuit.findu.data.dataremote.datasourceimpl + +import com.kuit.findu.data.dataremote.datasource.DummyRemoteDataSource +import com.kuit.findu.data.dataremote.model.response.DummyResponseDto +import com.kuit.findu.data.dataremote.service.DummyService +import javax.inject.Inject + +class DummyRemoteDataSourceImpl @Inject constructor( + private val service: DummyService +) : DummyRemoteDataSource { + override suspend fun dummy(): DummyResponseDto = + service.dummy() +} \ No newline at end of file diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/GptRemoteDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/GptRemoteDataSourceImpl.kt new file mode 100644 index 00000000..705cb2a9 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/GptRemoteDataSourceImpl.kt @@ -0,0 +1,16 @@ +package com.kuit.findu.data.dataremote.datasourceimpl + +import com.kuit.findu.data.dataremote.datasource.GptRemoteDataSource +import com.kuit.findu.data.dataremote.model.request.GptRequestDto +import com.kuit.findu.data.dataremote.model.response.GptResponseDto +import com.kuit.findu.data.dataremote.service.GptService +import javax.inject.Inject + +class GptRemoteDataSourceImpl @Inject constructor( + private val gptService: GptService +) : GptRemoteDataSource { + override suspend fun postImagePrompt( + request: GptRequestDto + ): GptResponseDto = + gptService.recognizeImage(request = request) +} \ No newline at end of file diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/HomeRemoteDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/HomeRemoteDataSourceImpl.kt new file mode 100644 index 00000000..6f92b2bb --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/HomeRemoteDataSourceImpl.kt @@ -0,0 +1,17 @@ +package com.kuit.findu.data.dataremote.datasourceimpl + +import com.kuit.findu.data.dataremote.datasource.HomeRemoteDataSource +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.response.home.HomeResponseDto +import com.kuit.findu.data.dataremote.service.HomeService +import javax.inject.Inject + +class HomeRemoteDataSourceImpl @Inject constructor( + private val homeService: HomeService, +) : HomeRemoteDataSource { + override suspend fun getHome( + lat: Double?, + lon: Double?, + ): BaseResponse = + homeService.getHome(lat, lon) +} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/InformationRemoteDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/InformationRemoteDataSourceImpl.kt similarity index 59% rename from app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/InformationRemoteDataSourceImpl.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/InformationRemoteDataSourceImpl.kt index 9869cca3..9a79ed4d 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/InformationRemoteDataSourceImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/InformationRemoteDataSourceImpl.kt @@ -1,13 +1,13 @@ -package com.example.findu.data.dataremote.datasourceimpl - -import com.example.findu.data.dataremote.datasource.InformationRemoteDataSource -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.response.information.CentersResponseDto -import com.example.findu.data.dataremote.model.response.information.DepartmentsResponseDto -import com.example.findu.data.dataremote.model.response.information.SidoListDto -import com.example.findu.data.dataremote.model.response.information.SigunguListDto -import com.example.findu.data.dataremote.model.response.information.VolunteersResponseDto -import com.example.findu.data.dataremote.service.InformationService +package com.kuit.findu.data.dataremote.datasourceimpl + +import com.kuit.findu.data.dataremote.datasource.InformationRemoteDataSource +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.response.information.CentersResponseDto +import com.kuit.findu.data.dataremote.model.response.information.DepartmentsResponseDto +import com.kuit.findu.data.dataremote.model.response.information.SidoListDto +import com.kuit.findu.data.dataremote.model.response.information.SigunguListDto +import com.kuit.findu.data.dataremote.model.response.information.VolunteersResponseDto +import com.kuit.findu.data.dataremote.service.InformationService import javax.inject.Inject class InformationRemoteDataSourceImpl @Inject constructor( diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/InquiryRemoteDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/InquiryRemoteDataSourceImpl.kt new file mode 100644 index 00000000..7ef494de --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/InquiryRemoteDataSourceImpl.kt @@ -0,0 +1,18 @@ +package com.kuit.findu.data.dataremote.datasourceimpl + +import com.kuit.findu.data.dataremote.datasource.InquiryRemoteDataSource +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.request.PostInquiryRequestDto +import com.kuit.findu.data.dataremote.service.InquiryService +import com.kuit.findu.data.dataremote.util.handleBaseResponse +import com.kuit.findu.domain.repository.InquiryRepository +import javax.inject.Inject + + +class InquiryRemoteDataSourceImpl @Inject constructor( + private val inquiryService: InquiryService +) : InquiryRemoteDataSource { + override suspend fun postInquiry(request: PostInquiryRequestDto) + = inquiryService.postInquiry(request) +} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/InterestRemoteDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/InterestRemoteDataSourceImpl.kt similarity index 57% rename from app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/InterestRemoteDataSourceImpl.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/InterestRemoteDataSourceImpl.kt index a4d58862..d8583d3d 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/InterestRemoteDataSourceImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/InterestRemoteDataSourceImpl.kt @@ -1,10 +1,9 @@ -package com.example.findu.data.dataremote.datasourceimpl +package com.kuit.findu.data.dataremote.datasourceimpl -import com.example.findu.data.dataremote.datasource.InterestRemoteDataSource -import com.example.findu.data.dataremote.model.base.NullableBaseResponse -import com.example.findu.data.dataremote.model.request.MyInterestRequestDto -import com.example.findu.data.dataremote.model.response.my.MyInterestResponseDto -import com.example.findu.data.dataremote.service.InterestService +import com.kuit.findu.data.dataremote.datasource.InterestRemoteDataSource +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.request.MyInterestRequestDto +import com.kuit.findu.data.dataremote.service.InterestService import javax.inject.Inject class InterestRemoteDataSourceImpl @Inject constructor( diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/MyRemoteDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/MyRemoteDataSourceImpl.kt similarity index 56% rename from app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/MyRemoteDataSourceImpl.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/MyRemoteDataSourceImpl.kt index 3929e312..d94f1cec 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/MyRemoteDataSourceImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/MyRemoteDataSourceImpl.kt @@ -1,19 +1,16 @@ -package com.example.findu.data.dataremote.datasourceimpl - -import com.example.findu.data.dataremote.datasource.MyRemoteDataSource -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.base.NullableBaseResponse -import com.example.findu.data.dataremote.model.request.PatchNicknameRequestDto -import com.example.findu.data.dataremote.model.response.my.MyInterestResponseDto -import com.example.findu.data.dataremote.model.response.my.MyNickNameResponseDto -import com.example.findu.data.dataremote.model.response.my.MyReportHistoryResponseDto -import com.example.findu.data.dataremote.model.response.my.MyViewedAnimalsResponseDto -import com.example.findu.data.dataremote.service.MyService -import com.example.findu.data.dataremote.util.handleBaseResponse -import com.example.findu.data.mapper.torequest.toImageMultipart -import com.example.findu.data.mapper.torequest.toPlainTextRequestBody -import okhttp3.MultipartBody -import okhttp3.RequestBody +package com.kuit.findu.data.dataremote.datasourceimpl + +import com.kuit.findu.data.dataremote.datasource.MyRemoteDataSource +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.request.PatchNicknameRequestDto +import com.kuit.findu.data.dataremote.model.response.my.MyInterestResponseDto +import com.kuit.findu.data.dataremote.model.response.my.MyNickNameResponseDto +import com.kuit.findu.data.dataremote.model.response.my.MyReportHistoryResponseDto +import com.kuit.findu.data.dataremote.model.response.my.MyViewedAnimalsResponseDto +import com.kuit.findu.data.dataremote.service.MyService +import com.kuit.findu.data.mapper.torequest.toImageMultipart +import com.kuit.findu.data.mapper.torequest.toPlainTextRequestBody import java.io.File import javax.inject.Inject @@ -44,7 +41,7 @@ class MyRemoteDataSourceImpl @Inject constructor( override suspend fun patchProfileImage( profileImageFile: File?, - defaultImageName: String? + defaultImageName: String?, ): NullableBaseResponse = myService.patchProfileImage( profileImageFile = profileImageFile?.toImageMultipart("profileImageFile"), diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/NaverRemoteDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/NaverRemoteDataSourceImpl.kt similarity index 52% rename from app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/NaverRemoteDataSourceImpl.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/NaverRemoteDataSourceImpl.kt index 11e43007..9fbdd82f 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/NaverRemoteDataSourceImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/NaverRemoteDataSourceImpl.kt @@ -1,9 +1,9 @@ -package com.example.findu.data.dataremote.datasourceimpl +package com.kuit.findu.data.dataremote.datasourceimpl -import com.example.findu.data.dataremote.datasource.NaverRemoteDataSource -import com.example.findu.data.dataremote.model.response.report.GeocodeResponseDto -import com.example.findu.data.dataremote.model.response.report.ReverseGeocodeResponseDto -import com.example.findu.data.dataremote.service.NaverService +import com.kuit.findu.data.dataremote.datasource.NaverRemoteDataSource +import com.kuit.findu.data.dataremote.model.response.report.GeocodeResponseDto +import com.kuit.findu.data.dataremote.model.response.report.ReverseGeocodeResponseDto +import com.kuit.findu.data.dataremote.service.NaverService import javax.inject.Inject class NaverRemoteDataSourceImpl @Inject constructor( diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/ReportRemoteDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/ReportRemoteDataSourceImpl.kt similarity index 57% rename from app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/ReportRemoteDataSourceImpl.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/ReportRemoteDataSourceImpl.kt index a50ee3b5..22563c42 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/ReportRemoteDataSourceImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/ReportRemoteDataSourceImpl.kt @@ -1,12 +1,12 @@ -package com.example.findu.data.dataremote.datasourceimpl +package com.kuit.findu.data.dataremote.datasourceimpl -import com.example.findu.data.dataremote.datasource.ReportRemoteDataSource -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.base.NullableBaseResponse -import com.example.findu.data.dataremote.model.request.MissingReportRequestDto -import com.example.findu.data.dataremote.model.request.WitnessReportRequestDto -import com.example.findu.data.dataremote.model.response.report.ImageUploadResponseDto -import com.example.findu.data.dataremote.service.ReportService +import com.kuit.findu.data.dataremote.datasource.ReportRemoteDataSource +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.request.MissingReportRequestDto +import com.kuit.findu.data.dataremote.model.request.WitnessReportRequestDto +import com.kuit.findu.data.dataremote.model.response.report.ImageUploadResponseDto +import com.kuit.findu.data.dataremote.service.ReportService import okhttp3.MultipartBody import javax.inject.Inject diff --git a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/SearchRemoteDataSourceImpl.kt b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/SearchRemoteDataSourceImpl.kt similarity index 62% rename from app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/SearchRemoteDataSourceImpl.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/SearchRemoteDataSourceImpl.kt index 4e62554f..0b002096 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/SearchRemoteDataSourceImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/SearchRemoteDataSourceImpl.kt @@ -1,10 +1,10 @@ -package com.example.findu.data.dataremote.datasourceimpl +package com.kuit.findu.data.dataremote.datasourceimpl -import com.example.findu.data.dataremote.datasource.SearchRemoteDataSource -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.response.search.SearchResponseDto -import com.example.findu.data.dataremote.service.SearchService -import com.example.findu.domain.model.search.SearchFilterData +import com.kuit.findu.data.dataremote.datasource.SearchRemoteDataSource +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.response.search.SearchResponseDto +import com.kuit.findu.data.dataremote.service.SearchService +import com.kuit.findu.domain.model.search.SearchFilterData import javax.inject.Inject class SearchRemoteDataSourceImpl @Inject constructor( diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/base/BaseResponse.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/base/BaseResponse.kt similarity index 84% rename from app/src/main/java/com/example/findu/data/dataremote/model/base/BaseResponse.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/base/BaseResponse.kt index 8fd66776..8dac275a 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/base/BaseResponse.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/base/BaseResponse.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.base +package com.kuit.findu.data.dataremote.model.base import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/base/NullableBaseResponse.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/base/NullableBaseResponse.kt similarity index 85% rename from app/src/main/java/com/example/findu/data/dataremote/model/base/NullableBaseResponse.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/base/NullableBaseResponse.kt index 42643af9..21b79472 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/base/NullableBaseResponse.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/base/NullableBaseResponse.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.base +package com.kuit.findu.data.dataremote.model.base import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/request/AiDetectionRequestDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/AiDetectionRequestDto.kt similarity index 77% rename from app/src/main/java/com/example/findu/data/dataremote/model/request/AiDetectionRequestDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/request/AiDetectionRequestDto.kt index 59859d23..24e90f84 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/request/AiDetectionRequestDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/AiDetectionRequestDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.request +package com.kuit.findu.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/request/CheckEmailRequestDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/CheckEmailRequestDto.kt similarity index 77% rename from app/src/main/java/com/example/findu/data/dataremote/model/request/CheckEmailRequestDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/request/CheckEmailRequestDto.kt index 0757b4e1..af6d12a3 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/request/CheckEmailRequestDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/CheckEmailRequestDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.request +package com.kuit.findu.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/request/GptRequestDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/GptRequestDto.kt similarity index 85% rename from app/src/main/java/com/example/findu/data/dataremote/model/request/GptRequestDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/request/GptRequestDto.kt index 809ce4a8..db71d89f 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/request/GptRequestDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/GptRequestDto.kt @@ -1,10 +1,10 @@ -package com.example.findu.data.dataremote.model.request +package com.kuit.findu.data.dataremote.model.request -import com.example.findu.data.dataremote.model.request.GptRequestConstants.GPT_MAX_TOKENS -import com.example.findu.data.dataremote.model.request.GptRequestConstants.GPT_MODEL -import com.example.findu.data.dataremote.model.request.GptRequestConstants.IMAGE_URL_TYPE -import com.example.findu.data.dataremote.model.request.GptRequestConstants.ROLE_USER -import com.example.findu.data.dataremote.model.request.GptRequestConstants.TEXT_TYPE +import com.kuit.findu.data.dataremote.model.request.GptRequestConstants.GPT_MAX_TOKENS +import com.kuit.findu.data.dataremote.model.request.GptRequestConstants.GPT_MODEL +import com.kuit.findu.data.dataremote.model.request.GptRequestConstants.IMAGE_URL_TYPE +import com.kuit.findu.data.dataremote.model.request.GptRequestConstants.ROLE_USER +import com.kuit.findu.data.dataremote.model.request.GptRequestConstants.TEXT_TYPE import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/request/GuestLoginRequestDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/GuestLoginRequestDto.kt similarity index 76% rename from app/src/main/java/com/example/findu/data/dataremote/model/request/GuestLoginRequestDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/request/GuestLoginRequestDto.kt index 4e94580c..14772e43 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/request/GuestLoginRequestDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/GuestLoginRequestDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.request +package com.kuit.findu.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/request/InquiryRequestDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/InquiryRequestDto.kt similarity index 84% rename from app/src/main/java/com/example/findu/data/dataremote/model/request/InquiryRequestDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/request/InquiryRequestDto.kt index 1eac9288..0aa59553 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/request/InquiryRequestDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/InquiryRequestDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.request +package com.kuit.findu.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/request/LoginRequestDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/LoginRequestDto.kt similarity index 80% rename from app/src/main/java/com/example/findu/data/dataremote/model/request/LoginRequestDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/request/LoginRequestDto.kt index 69984276..6fb3bb50 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/request/LoginRequestDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/LoginRequestDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.request +package com.kuit.findu.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/request/MyInterestRequestDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/MyInterestRequestDto.kt similarity index 76% rename from app/src/main/java/com/example/findu/data/dataremote/model/request/MyInterestRequestDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/request/MyInterestRequestDto.kt index f28e74e2..3ce359b5 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/request/MyInterestRequestDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/MyInterestRequestDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.request +package com.kuit.findu.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/request/PatchNicknameRequestDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/PatchNicknameRequestDto.kt similarity index 68% rename from app/src/main/java/com/example/findu/data/dataremote/model/request/PatchNicknameRequestDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/request/PatchNicknameRequestDto.kt index 5a34d621..66183f28 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/request/PatchNicknameRequestDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/PatchNicknameRequestDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.request +package com.kuit.findu.data.dataremote.model.request import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/request/ReportRequestDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/ReportRequestDto.kt similarity index 93% rename from app/src/main/java/com/example/findu/data/dataremote/model/request/ReportRequestDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/request/ReportRequestDto.kt index 4b1b0d8f..d9a92bcb 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/request/ReportRequestDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/ReportRequestDto.kt @@ -1,6 +1,5 @@ -package com.example.findu.data.dataremote.model.request +package com.kuit.findu.data.dataremote.model.request -import kotlinx.datetime.Instant import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/request/SignupRequestDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/SignupRequestDto.kt similarity index 83% rename from app/src/main/java/com/example/findu/data/dataremote/model/request/SignupRequestDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/request/SignupRequestDto.kt index 0181c5dc..dd2b3bec 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/request/SignupRequestDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/request/SignupRequestDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.request +package com.kuit.findu.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/CheckEmailResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/CheckEmailResponseDto.kt similarity index 77% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/CheckEmailResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/CheckEmailResponseDto.kt index 6d641233..837cd2aa 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/CheckEmailResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/CheckEmailResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response +package com.kuit.findu.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/DummyResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/DummyResponseDto.kt similarity index 75% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/DummyResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/DummyResponseDto.kt index d869c5e4..8b19797e 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/DummyResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/DummyResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response +package com.kuit.findu.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/GptResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/GptResponseDto.kt similarity index 97% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/GptResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/GptResponseDto.kt index 9b242e1a..c46262a4 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/GptResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/GptResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response +package com.kuit.findu.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/auth/GuestLoginResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/auth/GuestLoginResponseDto.kt similarity index 79% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/auth/GuestLoginResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/auth/GuestLoginResponseDto.kt index ce46fe90..3a973259 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/auth/GuestLoginResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/auth/GuestLoginResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.auth +package com.kuit.findu.data.dataremote.model.response.auth import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/auth/LoginResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/auth/LoginResponseDto.kt similarity index 88% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/auth/LoginResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/auth/LoginResponseDto.kt index a1b4ef88..b8ee05f0 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/auth/LoginResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/auth/LoginResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.auth +package com.kuit.findu.data.dataremote.model.response.auth import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/breed/AiDetectionResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/breed/AiDetectionResponseDto.kt similarity index 82% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/breed/AiDetectionResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/breed/AiDetectionResponseDto.kt index d4aaef57..edd6c976 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/breed/AiDetectionResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/breed/AiDetectionResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.breed +package com.kuit.findu.data.dataremote.model.response.breed import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/breed/BreedResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/breed/BreedResponseDto.kt similarity index 88% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/breed/BreedResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/breed/BreedResponseDto.kt index 9d86ae58..ebef68ab 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/breed/BreedResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/breed/BreedResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.breed +package com.kuit.findu.data.dataremote.model.response.breed import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/home/HomeResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/home/HomeResponseDto.kt similarity index 96% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/home/HomeResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/home/HomeResponseDto.kt index 80ea45d0..29fca35d 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/home/HomeResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/home/HomeResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.home +package com.kuit.findu.data.dataremote.model.response.home import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/information/CentersResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/information/CentersResponseDto.kt similarity index 90% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/information/CentersResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/information/CentersResponseDto.kt index 2d62eeca..9845a39d 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/information/CentersResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/information/CentersResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.information +package com.kuit.findu.data.dataremote.model.response.information import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/information/DepartmentsResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/information/DepartmentsResponseDto.kt similarity index 88% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/information/DepartmentsResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/information/DepartmentsResponseDto.kt index ee710234..4d9c473e 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/information/DepartmentsResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/information/DepartmentsResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.information +package com.kuit.findu.data.dataremote.model.response.information import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/information/SidoListDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/information/SidoListDto.kt similarity index 81% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/information/SidoListDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/information/SidoListDto.kt index 60f6c7d8..def078bc 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/information/SidoListDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/information/SidoListDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.information +package com.kuit.findu.data.dataremote.model.response.information import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/information/SigunguListDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/information/SigunguListDto.kt similarity index 73% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/information/SigunguListDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/information/SigunguListDto.kt index 57400f54..a98001bc 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/information/SigunguListDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/information/SigunguListDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.information +package com.kuit.findu.data.dataremote.model.response.information import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/information/VolunteersResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/information/VolunteersResponseDto.kt similarity index 91% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/information/VolunteersResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/information/VolunteersResponseDto.kt index 0d48c29a..7142f028 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/information/VolunteersResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/information/VolunteersResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.information +package com.kuit.findu.data.dataremote.model.response.information import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/my/MyInterestResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/my/MyInterestResponseDto.kt similarity index 92% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/my/MyInterestResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/my/MyInterestResponseDto.kt index 4b22d551..20b517a3 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/my/MyInterestResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/my/MyInterestResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.my +package com.kuit.findu.data.dataremote.model.response.my import kotlinx.serialization.SerialName diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/my/MyNickNameResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/my/MyNickNameResponseDto.kt similarity index 80% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/my/MyNickNameResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/my/MyNickNameResponseDto.kt index 7d7c0fd0..b8371af3 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/my/MyNickNameResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/my/MyNickNameResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.my +package com.kuit.findu.data.dataremote.model.response.my import kotlinx.serialization.SerialName diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/my/MyReportHistoryResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/my/MyReportHistoryResponseDto.kt similarity index 92% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/my/MyReportHistoryResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/my/MyReportHistoryResponseDto.kt index 0e9d1f67..84217f0b 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/my/MyReportHistoryResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/my/MyReportHistoryResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.my +package com.kuit.findu.data.dataremote.model.response.my import kotlinx.serialization.SerialName diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/my/MyViewedAnimalsResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/my/MyViewedAnimalsResponseDto.kt similarity index 92% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/my/MyViewedAnimalsResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/my/MyViewedAnimalsResponseDto.kt index 952a14b0..0c07681a 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/my/MyViewedAnimalsResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/my/MyViewedAnimalsResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.my +package com.kuit.findu.data.dataremote.model.response.my import kotlinx.serialization.SerialName diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/report/ImageUploadResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/report/ImageUploadResponseDto.kt similarity index 74% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/report/ImageUploadResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/report/ImageUploadResponseDto.kt index f5268a10..925b2275 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/report/ImageUploadResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/report/ImageUploadResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.report +package com.kuit.findu.data.dataremote.model.response.report import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/report/ReverseGeocodeResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/report/ReverseGeocodeResponseDto.kt similarity index 98% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/report/ReverseGeocodeResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/report/ReverseGeocodeResponseDto.kt index d0ba8b94..bcb044c7 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/report/ReverseGeocodeResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/report/ReverseGeocodeResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.report +package com.kuit.findu.data.dataremote.model.response.report import kotlinx.serialization.SerialName diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/search/DetailMissingResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/DetailMissingResponseDto.kt similarity index 93% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/search/DetailMissingResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/DetailMissingResponseDto.kt index cc71e478..dd277f58 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/search/DetailMissingResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/DetailMissingResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.search +package com.kuit.findu.data.dataremote.model.response.search import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/search/DetailProtectResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/DetailProtectResponseDto.kt similarity index 95% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/search/DetailProtectResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/DetailProtectResponseDto.kt index cdf927cd..ddce9e30 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/search/DetailProtectResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/DetailProtectResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.search +package com.kuit.findu.data.dataremote.model.response.search import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/search/DetailWitnessResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/DetailWitnessResponseDto.kt similarity index 92% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/search/DetailWitnessResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/DetailWitnessResponseDto.kt index 50138181..d2ee4a00 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/search/DetailWitnessResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/DetailWitnessResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.search +package com.kuit.findu.data.dataremote.model.response.search import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/model/response/search/SearchResponseDto.kt b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/SearchResponseDto.kt similarity index 91% rename from app/src/main/java/com/example/findu/data/dataremote/model/response/search/SearchResponseDto.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/SearchResponseDto.kt index f1777f8a..6fc1c066 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/model/response/search/SearchResponseDto.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/SearchResponseDto.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.model.response.search +package com.kuit.findu.data.dataremote.model.response.search import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/data/dataremote/service/AuthService.kt b/app/src/main/java/com/kuit/findu/data/dataremote/service/AuthService.kt similarity index 52% rename from app/src/main/java/com/example/findu/data/dataremote/service/AuthService.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/service/AuthService.kt index f79f895d..1142f17f 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/service/AuthService.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/service/AuthService.kt @@ -1,21 +1,19 @@ -package com.example.findu.data.dataremote.service +package com.kuit.findu.data.dataremote.service -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.base.NullableBaseResponse -import com.example.findu.data.dataremote.model.request.CheckNicknameRequestDto -import com.example.findu.data.dataremote.model.request.GuestLoginRequestDto -import com.example.findu.data.dataremote.model.request.LoginRequestDto -import com.example.findu.data.dataremote.model.request.SignupRequestDto -import com.example.findu.data.dataremote.model.response.CheckNicknameResponseDto -import com.example.findu.data.dataremote.model.response.auth.GuestLoginResponseDto -import com.example.findu.data.dataremote.model.response.auth.LoginResponseDto -import com.example.findu.data.dataremote.model.response.auth.UserInfoDto -import com.example.findu.data.dataremote.util.ApiConstraints.API -import com.example.findu.data.dataremote.util.ApiConstraints.AUTH -import com.example.findu.data.dataremote.util.ApiConstraints.VERSION +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.request.CheckNicknameRequestDto +import com.kuit.findu.data.dataremote.model.request.GuestLoginRequestDto +import com.kuit.findu.data.dataremote.model.request.LoginRequestDto +import com.kuit.findu.data.dataremote.model.response.CheckNicknameResponseDto +import com.kuit.findu.data.dataremote.model.response.auth.GuestLoginResponseDto +import com.kuit.findu.data.dataremote.model.response.auth.LoginResponseDto +import com.kuit.findu.data.dataremote.model.response.auth.UserInfoDto +import com.kuit.findu.data.dataremote.util.ApiConstraints.API +import com.kuit.findu.data.dataremote.util.ApiConstraints.AUTH +import com.kuit.findu.data.dataremote.util.ApiConstraints.VERSION import okhttp3.MultipartBody import okhttp3.RequestBody -import retrofit2.Response import retrofit2.http.Body import retrofit2.http.Multipart import retrofit2.http.POST diff --git a/app/src/main/java/com/example/findu/data/dataremote/service/BreedService.kt b/app/src/main/java/com/kuit/findu/data/dataremote/service/BreedService.kt similarity index 55% rename from app/src/main/java/com/example/findu/data/dataremote/service/BreedService.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/service/BreedService.kt index d920217b..4d22490f 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/service/BreedService.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/service/BreedService.kt @@ -1,10 +1,10 @@ -package com.example.findu.data.dataremote.service +package com.kuit.findu.data.dataremote.service -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.request.AiDetectionRequestDto -import com.example.findu.data.dataremote.model.response.breed.AiDetectionResponseDto -import com.example.findu.data.dataremote.model.response.breed.BreedResponseDto -import com.example.findu.data.dataremote.model.response.breed.BreedValidationResponseDto +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.request.AiDetectionRequestDto +import com.kuit.findu.data.dataremote.model.response.breed.AiDetectionResponseDto +import com.kuit.findu.data.dataremote.model.response.breed.BreedResponseDto +import com.kuit.findu.data.dataremote.model.response.breed.BreedValidationResponseDto import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.POST diff --git a/app/src/main/java/com/example/findu/data/dataremote/service/DetailSearchService.kt b/app/src/main/java/com/kuit/findu/data/dataremote/service/DetailSearchService.kt similarity index 64% rename from app/src/main/java/com/example/findu/data/dataremote/service/DetailSearchService.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/service/DetailSearchService.kt index 23b4baed..2708cd5a 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/service/DetailSearchService.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/service/DetailSearchService.kt @@ -1,9 +1,9 @@ -package com.example.findu.data.dataremote.service +package com.kuit.findu.data.dataremote.service -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.response.search.DetailMissingResponseDto -import com.example.findu.data.dataremote.model.response.search.DetailProtectResponseDto -import com.example.findu.data.dataremote.model.response.search.DetailWitnessResponseDto +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.response.search.DetailMissingResponseDto +import com.kuit.findu.data.dataremote.model.response.search.DetailProtectResponseDto +import com.kuit.findu.data.dataremote.model.response.search.DetailWitnessResponseDto import retrofit2.http.GET import retrofit2.http.Path diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/service/DummyService.kt b/app/src/main/java/com/kuit/findu/data/dataremote/service/DummyService.kt new file mode 100644 index 00000000..0f186295 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/service/DummyService.kt @@ -0,0 +1,9 @@ +package com.kuit.findu.data.dataremote.service + +import com.kuit.findu.data.dataremote.model.response.DummyResponseDto +import retrofit2.http.GET + +interface DummyService { + @GET("/API") + suspend fun dummy(): DummyResponseDto +} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/service/GptService.kt b/app/src/main/java/com/kuit/findu/data/dataremote/service/GptService.kt similarity index 62% rename from app/src/main/java/com/example/findu/data/dataremote/service/GptService.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/service/GptService.kt index e00c7e77..415e7508 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/service/GptService.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/service/GptService.kt @@ -1,8 +1,8 @@ -package com.example.findu.data.dataremote.service +package com.kuit.findu.data.dataremote.service -import com.example.findu.BuildConfig -import com.example.findu.data.dataremote.model.request.GptRequestDto -import com.example.findu.data.dataremote.model.response.GptResponseDto +import com.kuit.findu.BuildConfig +import com.kuit.findu.data.dataremote.model.request.GptRequestDto +import com.kuit.findu.data.dataremote.model.response.GptResponseDto import retrofit2.http.Body import retrofit2.http.Header import retrofit2.http.POST diff --git a/app/src/main/java/com/kuit/findu/data/dataremote/service/HomeService.kt b/app/src/main/java/com/kuit/findu/data/dataremote/service/HomeService.kt new file mode 100644 index 00000000..8d8ff706 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/dataremote/service/HomeService.kt @@ -0,0 +1,15 @@ +package com.kuit.findu.data.dataremote.service + +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.response.home.HomeResponseDto +import com.kuit.findu.data.dataremote.util.ApiConstraints +import retrofit2.http.GET +import retrofit2.http.Query + +interface HomeService { + @GET("/${ApiConstraints.API}/${ApiConstraints.VERSION}/${ApiConstraints.HOME}") + suspend fun getHome( + @Query("lat") lat: Double? = null, + @Query("lon") lon: Double? = null, + ): BaseResponse +} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/service/InformationService.kt b/app/src/main/java/com/kuit/findu/data/dataremote/service/InformationService.kt similarity index 56% rename from app/src/main/java/com/example/findu/data/dataremote/service/InformationService.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/service/InformationService.kt index 1cc89dba..b20c5b1e 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/service/InformationService.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/service/InformationService.kt @@ -1,15 +1,14 @@ -package com.example.findu.data.dataremote.service +package com.kuit.findu.data.dataremote.service -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.response.home.HomeResponseDto -import com.example.findu.data.dataremote.model.response.information.CentersResponseDto -import com.example.findu.data.dataremote.model.response.information.DepartmentsResponseDto -import com.example.findu.data.dataremote.model.response.information.SidoListDto -import com.example.findu.data.dataremote.model.response.information.SigunguListDto -import com.example.findu.data.dataremote.model.response.information.VolunteersResponseDto -import com.example.findu.data.dataremote.util.ApiConstraints.API -import com.example.findu.data.dataremote.util.ApiConstraints.INFORMATION -import com.example.findu.data.dataremote.util.ApiConstraints.VERSION +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.response.information.CentersResponseDto +import com.kuit.findu.data.dataremote.model.response.information.DepartmentsResponseDto +import com.kuit.findu.data.dataremote.model.response.information.SidoListDto +import com.kuit.findu.data.dataremote.model.response.information.SigunguListDto +import com.kuit.findu.data.dataremote.model.response.information.VolunteersResponseDto +import com.kuit.findu.data.dataremote.util.ApiConstraints.API +import com.kuit.findu.data.dataremote.util.ApiConstraints.INFORMATION +import com.kuit.findu.data.dataremote.util.ApiConstraints.VERSION import retrofit2.http.GET import retrofit2.http.Query diff --git a/app/src/main/java/com/example/findu/data/dataremote/service/InquiryService.kt b/app/src/main/java/com/kuit/findu/data/dataremote/service/InquiryService.kt similarity index 55% rename from app/src/main/java/com/example/findu/data/dataremote/service/InquiryService.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/service/InquiryService.kt index 26b618ba..d5c741b3 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/service/InquiryService.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/service/InquiryService.kt @@ -1,7 +1,7 @@ -package com.example.findu.data.dataremote.service +package com.kuit.findu.data.dataremote.service -import com.example.findu.data.dataremote.model.base.NullableBaseResponse -import com.example.findu.data.dataremote.model.request.PostInquiryRequestDto +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.request.PostInquiryRequestDto import retrofit2.http.Body import retrofit2.http.Header import retrofit2.http.POST diff --git a/app/src/main/java/com/example/findu/data/dataremote/service/InterestService.kt b/app/src/main/java/com/kuit/findu/data/dataremote/service/InterestService.kt similarity index 52% rename from app/src/main/java/com/example/findu/data/dataremote/service/InterestService.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/service/InterestService.kt index 7a61600e..84de45ad 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/service/InterestService.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/service/InterestService.kt @@ -1,8 +1,8 @@ -package com.example.findu.data.dataremote.service +package com.kuit.findu.data.dataremote.service -import com.example.findu.data.dataremote.model.base.NullableBaseResponse -import com.example.findu.data.dataremote.model.request.MyInterestRequestDto -import com.example.findu.data.dataremote.model.response.my.MyInterestResponseDto +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.request.MyInterestRequestDto +import com.kuit.findu.data.dataremote.model.response.my.MyInterestResponseDto import retrofit2.http.Body import retrofit2.http.DELETE import retrofit2.http.GET @@ -14,17 +14,17 @@ interface InterestService { @GET("/api/v2/users/me/interest-animals") suspend fun getInterestAnimals( - @Query("lastId") lastId: Long + @Query("lastId") lastId: Long, ): NullableBaseResponse @POST("/api/v2/users/me/interest-animals") suspend fun registerInterestAnimal( - @Body request: MyInterestRequestDto - ) : NullableBaseResponse + @Body request: MyInterestRequestDto, + ): NullableBaseResponse @DELETE("/api/v2/users/me/interest-animals/{reportId}") suspend fun deleteInterestAnimal( - @Path("reportId") reportId: Long - ) : NullableBaseResponse + @Path("reportId") reportId: Long, + ): NullableBaseResponse } \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/dataremote/service/MyService.kt b/app/src/main/java/com/kuit/findu/data/dataremote/service/MyService.kt similarity index 70% rename from app/src/main/java/com/example/findu/data/dataremote/service/MyService.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/service/MyService.kt index d2a439d7..b3fdf74c 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/service/MyService.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/service/MyService.kt @@ -1,12 +1,12 @@ -package com.example.findu.data.dataremote.service - -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.base.NullableBaseResponse -import com.example.findu.data.dataremote.model.request.PatchNicknameRequestDto -import com.example.findu.data.dataremote.model.response.my.MyInterestResponseDto -import com.example.findu.data.dataremote.model.response.my.MyNickNameResponseDto -import com.example.findu.data.dataremote.model.response.my.MyViewedAnimalsResponseDto -import com.example.findu.data.dataremote.model.response.my.MyReportHistoryResponseDto +package com.kuit.findu.data.dataremote.service + +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.request.PatchNicknameRequestDto +import com.kuit.findu.data.dataremote.model.response.my.MyInterestResponseDto +import com.kuit.findu.data.dataremote.model.response.my.MyNickNameResponseDto +import com.kuit.findu.data.dataremote.model.response.my.MyViewedAnimalsResponseDto +import com.kuit.findu.data.dataremote.model.response.my.MyReportHistoryResponseDto import okhttp3.MultipartBody import okhttp3.RequestBody import retrofit2.http.Body diff --git a/app/src/main/java/com/example/findu/data/dataremote/service/NaverService.kt b/app/src/main/java/com/kuit/findu/data/dataremote/service/NaverService.kt similarity index 68% rename from app/src/main/java/com/example/findu/data/dataremote/service/NaverService.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/service/NaverService.kt index 138daafc..0b29e92a 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/service/NaverService.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/service/NaverService.kt @@ -1,10 +1,10 @@ -package com.example.findu.data.dataremote.service +package com.kuit.findu.data.dataremote.service -import com.example.findu.BuildConfig -import com.example.findu.data.dataremote.model.response.report.GeocodeResponseDto -import com.example.findu.data.dataremote.model.response.report.ReverseGeocodeResponseDto -import com.example.findu.data.dataremote.util.ApiConstraints.GEOCODE -import com.example.findu.data.dataremote.util.ApiConstraints.REVERSE_GEOCODE +import com.kuit.findu.BuildConfig +import com.kuit.findu.data.dataremote.model.response.report.GeocodeResponseDto +import com.kuit.findu.data.dataremote.model.response.report.ReverseGeocodeResponseDto +import com.kuit.findu.data.dataremote.util.ApiConstraints.GEOCODE +import com.kuit.findu.data.dataremote.util.ApiConstraints.REVERSE_GEOCODE import retrofit2.http.GET import retrofit2.http.Header import retrofit2.http.Query diff --git a/app/src/main/java/com/example/findu/data/dataremote/service/ReportService.kt b/app/src/main/java/com/kuit/findu/data/dataremote/service/ReportService.kt similarity index 67% rename from app/src/main/java/com/example/findu/data/dataremote/service/ReportService.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/service/ReportService.kt index 8bac07fa..31f4dc1f 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/service/ReportService.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/service/ReportService.kt @@ -1,10 +1,10 @@ -package com.example.findu.data.dataremote.service +package com.kuit.findu.data.dataremote.service -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.base.NullableBaseResponse -import com.example.findu.data.dataremote.model.request.MissingReportRequestDto -import com.example.findu.data.dataremote.model.request.WitnessReportRequestDto -import com.example.findu.data.dataremote.model.response.report.ImageUploadResponseDto +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.request.MissingReportRequestDto +import com.kuit.findu.data.dataremote.model.request.WitnessReportRequestDto +import com.kuit.findu.data.dataremote.model.response.report.ImageUploadResponseDto import okhttp3.MultipartBody import retrofit2.http.Body import retrofit2.http.DELETE diff --git a/app/src/main/java/com/example/findu/data/dataremote/service/SearchService.kt b/app/src/main/java/com/kuit/findu/data/dataremote/service/SearchService.kt similarity index 72% rename from app/src/main/java/com/example/findu/data/dataremote/service/SearchService.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/service/SearchService.kt index 8c90edf3..5b799b90 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/service/SearchService.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/service/SearchService.kt @@ -1,7 +1,7 @@ -package com.example.findu.data.dataremote.service +package com.kuit.findu.data.dataremote.service -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.response.search.SearchResponseDto +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.response.search.SearchResponseDto import retrofit2.http.GET import retrofit2.http.Query diff --git a/app/src/main/java/com/example/findu/data/dataremote/util/ApiResponseHandler.kt b/app/src/main/java/com/kuit/findu/data/dataremote/util/ApiResponseHandler.kt similarity index 85% rename from app/src/main/java/com/example/findu/data/dataremote/util/ApiResponseHandler.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/util/ApiResponseHandler.kt index d0003cb1..80c14513 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/util/ApiResponseHandler.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/util/ApiResponseHandler.kt @@ -1,7 +1,7 @@ -package com.example.findu.data.dataremote.util +package com.kuit.findu.data.dataremote.util -import com.example.findu.data.dataremote.model.base.BaseResponse -import com.example.findu.data.dataremote.model.base.NullableBaseResponse +import com.kuit.findu.data.dataremote.model.base.BaseResponse +import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse fun BaseResponse.handleBaseResponse(): Result = when (this.code) { diff --git a/app/src/main/java/com/example/findu/data/dataremote/util/AuthInterceptor.kt b/app/src/main/java/com/kuit/findu/data/dataremote/util/AuthInterceptor.kt similarity index 90% rename from app/src/main/java/com/example/findu/data/dataremote/util/AuthInterceptor.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/util/AuthInterceptor.kt index 29953de3..1add4279 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/util/AuthInterceptor.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/util/AuthInterceptor.kt @@ -1,7 +1,7 @@ -package com.example.findu.data.dataremote.util +package com.kuit.findu.data.dataremote.util import android.content.Context -import com.example.findu.data.datalocal.datasource.TokenLocalDataSource +import com.kuit.findu.data.datalocal.datasource.TokenLocalDataSource import dagger.hilt.android.qualifiers.ApplicationContext import okhttp3.Interceptor import okhttp3.Request diff --git a/app/src/main/java/com/example/findu/data/dataremote/util/Constraints.kt b/app/src/main/java/com/kuit/findu/data/dataremote/util/Constraints.kt similarity index 90% rename from app/src/main/java/com/example/findu/data/dataremote/util/Constraints.kt rename to app/src/main/java/com/kuit/findu/data/dataremote/util/Constraints.kt index 134c2b9b..0228324b 100644 --- a/app/src/main/java/com/example/findu/data/dataremote/util/Constraints.kt +++ b/app/src/main/java/com/kuit/findu/data/dataremote/util/Constraints.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.dataremote.util +package com.kuit.findu.data.dataremote.util object ApiConstraints { // Common diff --git a/app/src/main/java/com/kuit/findu/data/mapper/DataMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/DataMapper.kt new file mode 100644 index 00000000..20fa5852 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/mapper/DataMapper.kt @@ -0,0 +1,10 @@ +package com.kuit.findu.data.mapper + +import com.kuit.findu.data.dataremote.model.response.DummyResponseDto +import com.kuit.findu.domain.model.DummyData + +fun DummyResponseDto.toDomainModel(): DummyData { + return DummyData( + description = this.dummy + "입니다 " + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/mapper/todomain/DetailSearchResponseDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/DetailSearchResponseDtoMapper.kt similarity index 76% rename from app/src/main/java/com/example/findu/data/mapper/todomain/DetailSearchResponseDtoMapper.kt rename to app/src/main/java/com/kuit/findu/data/mapper/todomain/DetailSearchResponseDtoMapper.kt index 609f4d2c..8631c38e 100644 --- a/app/src/main/java/com/example/findu/data/mapper/todomain/DetailSearchResponseDtoMapper.kt +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/DetailSearchResponseDtoMapper.kt @@ -1,13 +1,13 @@ -package com.example.findu.data.mapper.todomain +package com.kuit.findu.data.mapper.todomain -import com.example.findu.data.dataremote.model.response.search.DetailMissingResponseDto -import com.example.findu.data.dataremote.model.response.search.DetailProtectResponseDto -import com.example.findu.data.dataremote.model.response.search.DetailWitnessResponseDto -import com.example.findu.domain.model.search.DetailMissingData -import com.example.findu.domain.model.search.DetailProtectData -import com.example.findu.domain.model.search.DetailWitnessData -import com.example.findu.domain.model.search.SearchStatus -import com.example.findu.presentation.ui.search.model.SearchRvTag +import com.kuit.findu.data.dataremote.model.response.search.DetailMissingResponseDto +import com.kuit.findu.data.dataremote.model.response.search.DetailProtectResponseDto +import com.kuit.findu.data.dataremote.model.response.search.DetailWitnessResponseDto +import com.kuit.findu.domain.model.search.DetailMissingData +import com.kuit.findu.domain.model.search.DetailProtectData +import com.kuit.findu.domain.model.search.DetailWitnessData +import com.kuit.findu.domain.model.search.SearchStatus +import com.kuit.findu.presentation.ui.search.model.SearchRvTag fun DetailProtectResponseDto.toDomain() = DetailProtectData( imageUrls = imageUrls, diff --git a/app/src/main/java/com/example/findu/data/mapper/todomain/GptResponseDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/GptResponseDtoMapper.kt similarity index 79% rename from app/src/main/java/com/example/findu/data/mapper/todomain/GptResponseDtoMapper.kt rename to app/src/main/java/com/kuit/findu/data/mapper/todomain/GptResponseDtoMapper.kt index 35eae8b7..9865ba73 100644 --- a/app/src/main/java/com/example/findu/data/mapper/todomain/GptResponseDtoMapper.kt +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/GptResponseDtoMapper.kt @@ -1,9 +1,9 @@ -package com.example.findu.data.mapper.todomain +package com.kuit.findu.data.mapper.todomain -import com.example.findu.data.dataremote.model.response.GptResponseDto -import com.example.findu.domain.model.breed.SpeciesType -import com.example.findu.domain.model.report.FurColorType -import com.example.findu.domain.model.report.GptData +import com.kuit.findu.data.dataremote.model.response.GptResponseDto +import com.kuit.findu.domain.model.breed.SpeciesType +import com.kuit.findu.domain.model.report.FurColorType +import com.kuit.findu.domain.model.report.GptData fun GptResponseDto.toDomain(): GptData = this.choices.firstOrNull()?.message?.content?.let { content -> diff --git a/app/src/main/java/com/kuit/findu/data/mapper/todomain/GuestLoginResponseDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/GuestLoginResponseDtoMapper.kt new file mode 100644 index 00000000..0b8a3c75 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/GuestLoginResponseDtoMapper.kt @@ -0,0 +1,10 @@ +package com.kuit.findu.data.mapper.todomain + +import com.kuit.findu.data.dataremote.model.response.auth.GuestLoginResponseDto +import com.kuit.findu.domain.model.GuestLoginData + +fun GuestLoginResponseDto.toDomain(): GuestLoginData = + GuestLoginData( + userId = this.userId, + accessToken = this.accessToken + ) \ No newline at end of file diff --git a/app/src/main/java/com/kuit/findu/data/mapper/todomain/LoginResponseDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/LoginResponseDtoMapper.kt new file mode 100644 index 00000000..099e2ce3 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/LoginResponseDtoMapper.kt @@ -0,0 +1,10 @@ +package com.kuit.findu.data.mapper.todomain + +import com.kuit.findu.data.dataremote.model.response.auth.LoginResponseDto +import com.kuit.findu.domain.model.LoginData + +fun LoginResponseDto.toDomain(): LoginData = + LoginData( + isFirstLogin = isFirstLogin, + userInfo = userInfo?.toDomain() + ) \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/mapper/todomain/SearchResponseDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/SearchResponseDtoMapper.kt similarity index 72% rename from app/src/main/java/com/example/findu/data/mapper/todomain/SearchResponseDtoMapper.kt rename to app/src/main/java/com/kuit/findu/data/mapper/todomain/SearchResponseDtoMapper.kt index 3b6f96f5..4f571fd9 100644 --- a/app/src/main/java/com/example/findu/data/mapper/todomain/SearchResponseDtoMapper.kt +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/SearchResponseDtoMapper.kt @@ -1,11 +1,11 @@ -package com.example.findu.data.mapper.todomain +package com.kuit.findu.data.mapper.todomain -import com.example.findu.data.dataremote.model.response.search.SearchAnimalCard -import com.example.findu.data.dataremote.model.response.search.SearchResponseDto -import com.example.findu.domain.model.search.SearchAnimal -import com.example.findu.domain.model.search.SearchData -import com.example.findu.domain.model.search.SearchStatus -import com.example.findu.presentation.ui.search.model.SearchRvTag +import com.kuit.findu.data.dataremote.model.response.search.SearchAnimalCard +import com.kuit.findu.data.dataremote.model.response.search.SearchResponseDto +import com.kuit.findu.domain.model.search.SearchAnimal +import com.kuit.findu.domain.model.search.SearchData +import com.kuit.findu.domain.model.search.SearchStatus +import com.kuit.findu.presentation.ui.search.model.SearchRvTag fun SearchResponseDto.toDomain(): List { return listOf( diff --git a/app/src/main/java/com/kuit/findu/data/mapper/todomain/UserInfoDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/UserInfoDtoMapper.kt new file mode 100644 index 00000000..644287b7 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/UserInfoDtoMapper.kt @@ -0,0 +1,11 @@ +package com.kuit.findu.data.mapper.todomain + +import com.kuit.findu.data.dataremote.model.response.auth.UserInfoDto +import com.kuit.findu.domain.model.UserInfo + +fun UserInfoDto.toDomain(): UserInfo = + UserInfo( + userId = this.userId, + nickname = this.nickname, + accessToken = this.accessToken + ) \ No newline at end of file diff --git a/app/src/main/java/com/kuit/findu/data/mapper/todomain/breed/AiDetectionResponseDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/breed/AiDetectionResponseDtoMapper.kt new file mode 100644 index 00000000..de4e35a4 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/breed/AiDetectionResponseDtoMapper.kt @@ -0,0 +1,10 @@ +package com.kuit.findu.data.mapper.todomain.breed + +import com.kuit.findu.data.dataremote.model.response.breed.AiDetectionResponseDto +import com.kuit.findu.domain.model.breed.AiDetectionData + +fun AiDetectionResponseDto.toDomain() = AiDetectionData( + species = species, + breed = breed, + furColors = furColors +) \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/mapper/todomain/breed/BreedResponseDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/breed/BreedResponseDtoMapper.kt similarity index 71% rename from app/src/main/java/com/example/findu/data/mapper/todomain/breed/BreedResponseDtoMapper.kt rename to app/src/main/java/com/kuit/findu/data/mapper/todomain/breed/BreedResponseDtoMapper.kt index d83b2dea..43a16654 100644 --- a/app/src/main/java/com/example/findu/data/mapper/todomain/breed/BreedResponseDtoMapper.kt +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/breed/BreedResponseDtoMapper.kt @@ -1,11 +1,11 @@ -package com.example.findu.data.mapper.todomain.breed - -import com.example.findu.data.dataremote.model.response.breed.BreedResponseDto -import com.example.findu.data.dataremote.model.response.breed.BreedValidationResponseDto -import com.example.findu.domain.model.breed.Breed -import com.example.findu.domain.model.breed.BreedData -import com.example.findu.domain.model.breed.BreedValidationData -import com.example.findu.domain.model.breed.SpeciesType +package com.kuit.findu.data.mapper.todomain.breed + +import com.kuit.findu.data.dataremote.model.response.breed.BreedResponseDto +import com.kuit.findu.data.dataremote.model.response.breed.BreedValidationResponseDto +import com.kuit.findu.domain.model.breed.Breed +import com.kuit.findu.domain.model.breed.BreedData +import com.kuit.findu.domain.model.breed.BreedValidationData +import com.kuit.findu.domain.model.breed.SpeciesType fun BreedResponseDto.toDomain(): BreedData { val dogBreedList = dogBreedList.mapIndexed { index, breedName -> diff --git a/app/src/main/java/com/example/findu/data/mapper/todomain/extra/InformationResponseDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/extra/InformationResponseDtoMapper.kt similarity index 70% rename from app/src/main/java/com/example/findu/data/mapper/todomain/extra/InformationResponseDtoMapper.kt rename to app/src/main/java/com/kuit/findu/data/mapper/todomain/extra/InformationResponseDtoMapper.kt index 5ba6ea1c..ad6f2ce2 100644 --- a/app/src/main/java/com/example/findu/data/mapper/todomain/extra/InformationResponseDtoMapper.kt +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/extra/InformationResponseDtoMapper.kt @@ -1,13 +1,13 @@ -package com.example.findu.data.mapper.todomain.extra +package com.kuit.findu.data.mapper.todomain.extra -import com.example.findu.data.dataremote.model.response.information.CentersResponseDto -import com.example.findu.data.dataremote.model.response.information.DepartmentsResponseDto -import com.example.findu.data.dataremote.model.response.information.VolunteersResponseDto -import com.example.findu.domain.model.extra.Center -import com.example.findu.domain.model.extra.Department -import com.example.findu.domain.model.extra.PagedResult -import com.example.findu.domain.model.extra.VolunteerWork +import com.kuit.findu.data.dataremote.model.response.information.CentersResponseDto +import com.kuit.findu.data.dataremote.model.response.information.DepartmentsResponseDto +import com.kuit.findu.data.dataremote.model.response.information.VolunteersResponseDto +import com.kuit.findu.domain.model.extra.Center +import com.kuit.findu.domain.model.extra.Department +import com.kuit.findu.domain.model.extra.PagedResult +import com.kuit.findu.domain.model.extra.VolunteerWork fun VolunteersResponseDto.toDomain(): PagedResult = PagedResult( diff --git a/app/src/main/java/com/kuit/findu/data/mapper/todomain/extra/SidoListDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/extra/SidoListDtoMapper.kt new file mode 100644 index 00000000..c7cd7135 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/extra/SidoListDtoMapper.kt @@ -0,0 +1,12 @@ +package com.kuit.findu.data.mapper.todomain.extra + +import com.kuit.findu.data.dataremote.model.response.information.SidoListDto +import com.kuit.findu.domain.model.extra.Sido + +fun SidoListDto.toDomain(): List = + sidoList.map { sidoItemDto -> + Sido( + id = sidoItemDto.id, + name = sidoItemDto.name + ) + } diff --git a/app/src/main/java/com/example/findu/data/mapper/todomain/home/HomeResponseDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/home/HomeResponseDtoMapper.kt similarity index 63% rename from app/src/main/java/com/example/findu/data/mapper/todomain/home/HomeResponseDtoMapper.kt rename to app/src/main/java/com/kuit/findu/data/mapper/todomain/home/HomeResponseDtoMapper.kt index 0f9df176..fd25237c 100644 --- a/app/src/main/java/com/example/findu/data/mapper/todomain/home/HomeResponseDtoMapper.kt +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/home/HomeResponseDtoMapper.kt @@ -1,15 +1,15 @@ -package com.example.findu.data.mapper.todomain.home +package com.kuit.findu.data.mapper.todomain.home -import com.example.findu.data.dataremote.model.response.home.HomeResponseDto -import com.example.findu.data.dataremote.model.response.home.PeriodStatisticsDto -import com.example.findu.data.dataremote.model.response.home.ProtectingAnimal -import com.example.findu.data.dataremote.model.response.home.Statistics -import com.example.findu.data.dataremote.model.response.home.WitnessedOrMissingAnimal -import com.example.findu.domain.model.HomeData -import com.example.findu.domain.model.HomeStatistics -import com.example.findu.domain.model.PeriodStatistics -import com.example.findu.domain.model.ProtectAnimal -import com.example.findu.domain.model.ReportAnimal +import com.kuit.findu.data.dataremote.model.response.home.HomeResponseDto +import com.kuit.findu.data.dataremote.model.response.home.PeriodStatisticsDto +import com.kuit.findu.data.dataremote.model.response.home.ProtectingAnimal +import com.kuit.findu.data.dataremote.model.response.home.Statistics +import com.kuit.findu.data.dataremote.model.response.home.WitnessedOrMissingAnimal +import com.kuit.findu.domain.model.HomeData +import com.kuit.findu.domain.model.HomeStatistics +import com.kuit.findu.domain.model.PeriodStatistics +import com.kuit.findu.domain.model.ProtectAnimal +import com.kuit.findu.domain.model.ReportAnimal fun HomeResponseDto.toDomain() = HomeData( todayRescuedAnimalCount = statistics.recent7days.rescuedAnimalCount, diff --git a/app/src/main/java/com/example/findu/data/mapper/todomain/my/MyInterestMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/my/MyInterestMapper.kt similarity index 72% rename from app/src/main/java/com/example/findu/data/mapper/todomain/my/MyInterestMapper.kt rename to app/src/main/java/com/kuit/findu/data/mapper/todomain/my/MyInterestMapper.kt index cdbaa252..db2c95e7 100644 --- a/app/src/main/java/com/example/findu/data/mapper/todomain/my/MyInterestMapper.kt +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/my/MyInterestMapper.kt @@ -1,7 +1,7 @@ -package com.example.findu.data.mapper.todomain.my +package com.kuit.findu.data.mapper.todomain.my -import com.example.findu.data.dataremote.model.response.my.MyInterestResponseDto -import com.example.findu.domain.model.my.MyInterestData +import com.kuit.findu.data.dataremote.model.response.my.MyInterestResponseDto +import com.kuit.findu.domain.model.my.MyInterestData fun MyInterestResponseDto.toDomain(): MyInterestData = MyInterestData( diff --git a/app/src/main/java/com/kuit/findu/data/mapper/todomain/my/MyProfileMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/my/MyProfileMapper.kt new file mode 100644 index 00000000..935fa68d --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/my/MyProfileMapper.kt @@ -0,0 +1,10 @@ +package com.kuit.findu.data.mapper.todomain.my + +import com.kuit.findu.data.dataremote.model.response.my.MyNickNameResponseDto +import com.kuit.findu.domain.model.my.MyProfileData + +fun MyNickNameResponseDto.toDomain(): MyProfileData = + MyProfileData( + nickname = nickname, + profileImage = profileImage + ) \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/mapper/todomain/my/MyResponseDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/my/MyResponseDtoMapper.kt similarity index 68% rename from app/src/main/java/com/example/findu/data/mapper/todomain/my/MyResponseDtoMapper.kt rename to app/src/main/java/com/kuit/findu/data/mapper/todomain/my/MyResponseDtoMapper.kt index ac0a2f75..6a2d6cff 100644 --- a/app/src/main/java/com/example/findu/data/mapper/todomain/my/MyResponseDtoMapper.kt +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/my/MyResponseDtoMapper.kt @@ -1,11 +1,9 @@ -package com.example.findu.data.mapper.todomain.my +package com.kuit.findu.data.mapper.todomain.my -import com.example.findu.data.dataremote.model.response.my.MyInterestResponseDto -import com.example.findu.data.dataremote.model.response.my.MyReportHistoryResponseDto -import com.example.findu.data.dataremote.model.response.my.MyViewedAnimalsResponseDto -import com.example.findu.domain.model.my.MyInterestData -import com.example.findu.domain.model.my.MyReportHistoryData -import com.example.findu.domain.model.my.MyViewedAnimalData +import com.kuit.findu.data.dataremote.model.response.my.MyReportHistoryResponseDto +import com.kuit.findu.data.dataremote.model.response.my.MyViewedAnimalsResponseDto +import com.kuit.findu.domain.model.my.MyReportHistoryData +import com.kuit.findu.domain.model.my.MyViewedAnimalData fun MyReportHistoryResponseDto.toDomain(): MyReportHistoryData { diff --git a/app/src/main/java/com/example/findu/data/mapper/todomain/report/NaverResponseDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/report/NaverResponseDtoMapper.kt similarity index 51% rename from app/src/main/java/com/example/findu/data/mapper/todomain/report/NaverResponseDtoMapper.kt rename to app/src/main/java/com/kuit/findu/data/mapper/todomain/report/NaverResponseDtoMapper.kt index e1d57956..6a5b2a7c 100644 --- a/app/src/main/java/com/example/findu/data/mapper/todomain/report/NaverResponseDtoMapper.kt +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/report/NaverResponseDtoMapper.kt @@ -1,9 +1,9 @@ -package com.example.findu.data.mapper.todomain.report +package com.kuit.findu.data.mapper.todomain.report -import com.example.findu.data.dataremote.model.response.report.GeocodeResponseDto -import com.example.findu.data.dataremote.model.response.report.ReverseGeocodeResponseDto -import com.example.findu.domain.model.report.AddressData -import com.example.findu.domain.model.report.LatLngData +import com.kuit.findu.data.dataremote.model.response.report.GeocodeResponseDto +import com.kuit.findu.data.dataremote.model.response.report.ReverseGeocodeResponseDto +import com.kuit.findu.domain.model.report.AddressData +import com.kuit.findu.domain.model.report.LatLngData fun ReverseGeocodeResponseDto.toDomain() = AddressData( with(results[0]) { diff --git a/app/src/main/java/com/kuit/findu/data/mapper/todomain/report/ReportResponseDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/todomain/report/ReportResponseDtoMapper.kt new file mode 100644 index 00000000..919acc12 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/mapper/todomain/report/ReportResponseDtoMapper.kt @@ -0,0 +1,5 @@ +package com.kuit.findu.data.mapper.todomain.report + +import com.kuit.findu.data.dataremote.model.response.report.ImageUploadResponseDto + +fun ImageUploadResponseDto.toList() = this.urls \ No newline at end of file diff --git a/app/src/main/java/com/kuit/findu/data/mapper/torequest/AiDetectionRequestDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/torequest/AiDetectionRequestDtoMapper.kt new file mode 100644 index 00000000..91acc6ed --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/mapper/torequest/AiDetectionRequestDtoMapper.kt @@ -0,0 +1,7 @@ +package com.kuit.findu.data.mapper.torequest + +import com.kuit.findu.data.dataremote.model.request.AiDetectionRequestDto + +fun String.toAiDetectionRequest() = AiDetectionRequestDto( + base64Image = this +) \ No newline at end of file diff --git a/app/src/main/java/com/kuit/findu/data/mapper/torequest/GuestLoginRequestDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/torequest/GuestLoginRequestDtoMapper.kt new file mode 100644 index 00000000..b90e83b8 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/mapper/torequest/GuestLoginRequestDtoMapper.kt @@ -0,0 +1,7 @@ +package com.kuit.findu.data.mapper.torequest + +import com.kuit.findu.data.dataremote.model.request.GuestLoginRequestDto + + +fun String.toRequestDto() = + GuestLoginRequestDto(deviceId = this) \ No newline at end of file diff --git a/app/src/main/java/com/kuit/findu/data/mapper/torequest/LoginRequestDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/torequest/LoginRequestDtoMapper.kt new file mode 100644 index 00000000..9c658b5d --- /dev/null +++ b/app/src/main/java/com/kuit/findu/data/mapper/torequest/LoginRequestDtoMapper.kt @@ -0,0 +1,8 @@ +package com.kuit.findu.data.mapper.torequest + +import com.kuit.findu.data.dataremote.model.request.LoginRequestDto +import com.kuit.findu.domain.model.LoginInfo + + +fun LoginInfo.toRequestDto() = + LoginRequestDto(kakaoId = this.kakaoId, deviceId = this.deviceId) \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/data/mapper/torequest/ReportRequestDtoMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/torequest/ReportRequestDtoMapper.kt similarity index 72% rename from app/src/main/java/com/example/findu/data/mapper/torequest/ReportRequestDtoMapper.kt rename to app/src/main/java/com/kuit/findu/data/mapper/torequest/ReportRequestDtoMapper.kt index fc0cd2b7..0b8b04b1 100644 --- a/app/src/main/java/com/example/findu/data/mapper/torequest/ReportRequestDtoMapper.kt +++ b/app/src/main/java/com/kuit/findu/data/mapper/torequest/ReportRequestDtoMapper.kt @@ -1,9 +1,9 @@ -package com.example.findu.data.mapper.torequest +package com.kuit.findu.data.mapper.torequest -import com.example.findu.data.dataremote.model.request.MissingReportRequestDto -import com.example.findu.data.dataremote.model.request.WitnessReportRequestDto -import com.example.findu.domain.model.report.MissingReportData -import com.example.findu.domain.model.report.WitnessReportData +import com.kuit.findu.data.dataremote.model.request.MissingReportRequestDto +import com.kuit.findu.data.dataremote.model.request.WitnessReportRequestDto +import com.kuit.findu.domain.model.report.MissingReportData +import com.kuit.findu.domain.model.report.WitnessReportData fun MissingReportData.toRequestDto() = MissingReportRequestDto( diff --git a/app/src/main/java/com/example/findu/data/mapper/torequest/TextRequestBodyMapper.kt b/app/src/main/java/com/kuit/findu/data/mapper/torequest/TextRequestBodyMapper.kt similarity index 91% rename from app/src/main/java/com/example/findu/data/mapper/torequest/TextRequestBodyMapper.kt rename to app/src/main/java/com/kuit/findu/data/mapper/torequest/TextRequestBodyMapper.kt index a744005b..dd52447a 100644 --- a/app/src/main/java/com/example/findu/data/mapper/torequest/TextRequestBodyMapper.kt +++ b/app/src/main/java/com/kuit/findu/data/mapper/torequest/TextRequestBodyMapper.kt @@ -1,4 +1,4 @@ -package com.example.findu.data.mapper.torequest +package com.kuit.findu.data.mapper.torequest import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody diff --git a/app/src/main/java/com/example/findu/data/repositoryimpl/AuthRepositoryImpl.kt b/app/src/main/java/com/kuit/findu/data/repositoryimpl/AuthRepositoryImpl.kt similarity index 73% rename from app/src/main/java/com/example/findu/data/repositoryimpl/AuthRepositoryImpl.kt rename to app/src/main/java/com/kuit/findu/data/repositoryimpl/AuthRepositoryImpl.kt index 8724959d..67de9010 100644 --- a/app/src/main/java/com/example/findu/data/repositoryimpl/AuthRepositoryImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/repositoryimpl/AuthRepositoryImpl.kt @@ -1,14 +1,14 @@ -package com.example.findu.data.repositoryimpl +package com.kuit.findu.data.repositoryimpl -import com.example.findu.data.dataremote.datasource.AuthRemoteDataSource -import com.example.findu.data.dataremote.util.handleBaseResponse -import com.example.findu.data.mapper.todomain.toDomain -import com.example.findu.data.mapper.torequest.toRequestDto -import com.example.findu.domain.model.GuestLoginData -import com.example.findu.domain.model.LoginData -import com.example.findu.domain.model.LoginInfo -import com.example.findu.domain.model.UserInfo -import com.example.findu.domain.repository.AuthRepository +import com.kuit.findu.data.dataremote.datasource.AuthRemoteDataSource +import com.kuit.findu.data.dataremote.util.handleBaseResponse +import com.kuit.findu.data.mapper.todomain.toDomain +import com.kuit.findu.data.mapper.torequest.toRequestDto +import com.kuit.findu.domain.model.GuestLoginData +import com.kuit.findu.domain.model.LoginData +import com.kuit.findu.domain.model.LoginInfo +import com.kuit.findu.domain.model.UserInfo +import com.kuit.findu.domain.repository.AuthRepository import java.io.File import javax.inject.Inject diff --git a/app/src/main/java/com/example/findu/data/repositoryimpl/BreedRepositoryImpl.kt b/app/src/main/java/com/kuit/findu/data/repositoryimpl/BreedRepositoryImpl.kt similarity index 60% rename from app/src/main/java/com/example/findu/data/repositoryimpl/BreedRepositoryImpl.kt rename to app/src/main/java/com/kuit/findu/data/repositoryimpl/BreedRepositoryImpl.kt index 34515c41..9eb8279a 100644 --- a/app/src/main/java/com/example/findu/data/repositoryimpl/BreedRepositoryImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/repositoryimpl/BreedRepositoryImpl.kt @@ -1,13 +1,13 @@ -package com.example.findu.data.repositoryimpl +package com.kuit.findu.data.repositoryimpl -import com.example.findu.data.dataremote.datasource.BreedRemoteDataSource -import com.example.findu.data.dataremote.util.handleBaseResponse -import com.example.findu.data.mapper.todomain.breed.toDomain -import com.example.findu.data.mapper.torequest.toAiDetectionRequest -import com.example.findu.domain.model.breed.AiDetectionData -import com.example.findu.domain.model.breed.BreedData -import com.example.findu.domain.model.breed.BreedValidationData -import com.example.findu.domain.repository.BreedRepository +import com.kuit.findu.data.dataremote.datasource.BreedRemoteDataSource +import com.kuit.findu.data.dataremote.util.handleBaseResponse +import com.kuit.findu.data.mapper.todomain.breed.toDomain +import com.kuit.findu.data.mapper.torequest.toAiDetectionRequest +import com.kuit.findu.domain.model.breed.AiDetectionData +import com.kuit.findu.domain.model.breed.BreedData +import com.kuit.findu.domain.model.breed.BreedValidationData +import com.kuit.findu.domain.repository.BreedRepository import javax.inject.Inject class BreedRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/com/example/findu/data/repositoryimpl/DetailSearchRepositoryImpl.kt b/app/src/main/java/com/kuit/findu/data/repositoryimpl/DetailSearchRepositoryImpl.kt similarity index 69% rename from app/src/main/java/com/example/findu/data/repositoryimpl/DetailSearchRepositoryImpl.kt rename to app/src/main/java/com/kuit/findu/data/repositoryimpl/DetailSearchRepositoryImpl.kt index 426a9763..3f762935 100644 --- a/app/src/main/java/com/example/findu/data/repositoryimpl/DetailSearchRepositoryImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/repositoryimpl/DetailSearchRepositoryImpl.kt @@ -1,12 +1,12 @@ -package com.example.findu.data.repositoryimpl +package com.kuit.findu.data.repositoryimpl -import com.example.findu.data.dataremote.datasource.DetailSearchRemoteDataSource -import com.example.findu.data.dataremote.util.handleBaseResponse -import com.example.findu.data.mapper.todomain.toDomain -import com.example.findu.domain.model.search.DetailMissingData -import com.example.findu.domain.model.search.DetailProtectData -import com.example.findu.domain.model.search.DetailWitnessData -import com.example.findu.domain.repository.DetailSearchRepository +import com.kuit.findu.data.dataremote.datasource.DetailSearchRemoteDataSource +import com.kuit.findu.data.dataremote.util.handleBaseResponse +import com.kuit.findu.data.mapper.todomain.toDomain +import com.kuit.findu.domain.model.search.DetailMissingData +import com.kuit.findu.domain.model.search.DetailProtectData +import com.kuit.findu.domain.model.search.DetailWitnessData +import com.kuit.findu.domain.repository.DetailSearchRepository import javax.inject.Inject class DetailSearchRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/com/example/findu/data/repositoryimpl/DummyRepositoryImpl.kt b/app/src/main/java/com/kuit/findu/data/repositoryimpl/DummyRepositoryImpl.kt similarity index 50% rename from app/src/main/java/com/example/findu/data/repositoryimpl/DummyRepositoryImpl.kt rename to app/src/main/java/com/kuit/findu/data/repositoryimpl/DummyRepositoryImpl.kt index 7b5beae9..8004a017 100644 --- a/app/src/main/java/com/example/findu/data/repositoryimpl/DummyRepositoryImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/repositoryimpl/DummyRepositoryImpl.kt @@ -1,9 +1,9 @@ -package com.example.findu.data.repositoryimpl +package com.kuit.findu.data.repositoryimpl -import com.example.findu.data.dataremote.datasource.DummyRemoteDataSource -import com.example.findu.data.mapper.toDomainModel -import com.example.findu.domain.model.DummyData -import com.example.findu.domain.repository.DummyRepository +import com.kuit.findu.data.dataremote.datasource.DummyRemoteDataSource +import com.kuit.findu.data.mapper.toDomainModel +import com.kuit.findu.domain.model.DummyData +import com.kuit.findu.domain.repository.DummyRepository import javax.inject.Inject class DummyRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/com/example/findu/data/repositoryimpl/HomeRepositoryImpl.kt b/app/src/main/java/com/kuit/findu/data/repositoryimpl/HomeRepositoryImpl.kt similarity index 53% rename from app/src/main/java/com/example/findu/data/repositoryimpl/HomeRepositoryImpl.kt rename to app/src/main/java/com/kuit/findu/data/repositoryimpl/HomeRepositoryImpl.kt index 394febcf..09882e2a 100644 --- a/app/src/main/java/com/example/findu/data/repositoryimpl/HomeRepositoryImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/repositoryimpl/HomeRepositoryImpl.kt @@ -1,10 +1,10 @@ -package com.example.findu.data.repositoryimpl +package com.kuit.findu.data.repositoryimpl -import com.example.findu.data.dataremote.datasource.HomeRemoteDataSource -import com.example.findu.data.dataremote.util.handleBaseResponse -import com.example.findu.data.mapper.todomain.home.toDomain -import com.example.findu.domain.model.HomeData -import com.example.findu.domain.repository.HomeRepository +import com.kuit.findu.data.dataremote.datasource.HomeRemoteDataSource +import com.kuit.findu.data.dataremote.util.handleBaseResponse +import com.kuit.findu.data.mapper.todomain.home.toDomain +import com.kuit.findu.domain.model.HomeData +import com.kuit.findu.domain.repository.HomeRepository import javax.inject.Inject class HomeRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/com/example/findu/data/repositoryimpl/InformationRepositoryImpl.kt b/app/src/main/java/com/kuit/findu/data/repositoryimpl/InformationRepositoryImpl.kt similarity index 71% rename from app/src/main/java/com/example/findu/data/repositoryimpl/InformationRepositoryImpl.kt rename to app/src/main/java/com/kuit/findu/data/repositoryimpl/InformationRepositoryImpl.kt index aced246d..2d21a040 100644 --- a/app/src/main/java/com/example/findu/data/repositoryimpl/InformationRepositoryImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/repositoryimpl/InformationRepositoryImpl.kt @@ -1,14 +1,14 @@ -package com.example.findu.data.repositoryimpl +package com.kuit.findu.data.repositoryimpl -import com.example.findu.data.dataremote.datasource.InformationRemoteDataSource -import com.example.findu.data.dataremote.util.handleBaseResponse -import com.example.findu.data.mapper.todomain.extra.toDomain -import com.example.findu.domain.model.extra.Center -import com.example.findu.domain.model.extra.Department -import com.example.findu.domain.model.extra.PagedResult -import com.example.findu.domain.model.extra.Sido -import com.example.findu.domain.model.extra.VolunteerWork -import com.example.findu.domain.repository.InformationRepository +import com.kuit.findu.data.dataremote.datasource.InformationRemoteDataSource +import com.kuit.findu.data.dataremote.util.handleBaseResponse +import com.kuit.findu.data.mapper.todomain.extra.toDomain +import com.kuit.findu.domain.model.extra.Center +import com.kuit.findu.domain.model.extra.Department +import com.kuit.findu.domain.model.extra.PagedResult +import com.kuit.findu.domain.model.extra.Sido +import com.kuit.findu.domain.model.extra.VolunteerWork +import com.kuit.findu.domain.repository.InformationRepository import javax.inject.Inject class InformationRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/com/example/findu/data/repositoryimpl/InquiryRepositoryImpl.kt b/app/src/main/java/com/kuit/findu/data/repositoryimpl/InquiryRepositoryImpl.kt similarity index 60% rename from app/src/main/java/com/example/findu/data/repositoryimpl/InquiryRepositoryImpl.kt rename to app/src/main/java/com/kuit/findu/data/repositoryimpl/InquiryRepositoryImpl.kt index 9cffe15b..7987f737 100644 --- a/app/src/main/java/com/example/findu/data/repositoryimpl/InquiryRepositoryImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/repositoryimpl/InquiryRepositoryImpl.kt @@ -1,10 +1,10 @@ -package com.example.findu.data.repositoryimpl +package com.kuit.findu.data.repositoryimpl -import com.example.findu.data.dataremote.datasource.InquiryRemoteDataSource -import com.example.findu.data.dataremote.model.request.PostInquiryRequestDto -import com.example.findu.data.dataremote.util.handleBaseResponse -import com.example.findu.domain.repository.InquiryRepository +import com.kuit.findu.data.dataremote.datasource.InquiryRemoteDataSource +import com.kuit.findu.data.dataremote.model.request.PostInquiryRequestDto +import com.kuit.findu.data.dataremote.util.handleBaseResponse +import com.kuit.findu.domain.repository.InquiryRepository import javax.inject.Inject class InquiryRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/com/example/findu/data/repositoryimpl/InterestRepositoryImpl.kt b/app/src/main/java/com/kuit/findu/data/repositoryimpl/InterestRepositoryImpl.kt similarity index 68% rename from app/src/main/java/com/example/findu/data/repositoryimpl/InterestRepositoryImpl.kt rename to app/src/main/java/com/kuit/findu/data/repositoryimpl/InterestRepositoryImpl.kt index a0c4da50..eb3d5893 100644 --- a/app/src/main/java/com/example/findu/data/repositoryimpl/InterestRepositoryImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/repositoryimpl/InterestRepositoryImpl.kt @@ -1,11 +1,10 @@ -package com.example.findu.data.repositoryimpl +package com.kuit.findu.data.repositoryimpl -import com.example.findu.data.dataremote.datasource.InterestRemoteDataSource -import com.example.findu.data.dataremote.util.handleBaseResponse -import com.example.findu.data.mapper.todomain.my.toDomain -import com.example.findu.data.dataremote.util.handleBaseResponse -import com.example.findu.domain.model.my.MyInterestData -import com.example.findu.domain.repository.InterestRepository +import com.kuit.findu.data.dataremote.datasource.InterestRemoteDataSource +import com.kuit.findu.data.dataremote.util.handleBaseResponse +import com.kuit.findu.data.mapper.todomain.my.toDomain +import com.kuit.findu.domain.model.my.MyInterestData +import com.kuit.findu.domain.repository.InterestRepository import javax.inject.Inject class InterestRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/com/example/findu/data/repositoryimpl/MyRepositoryImpl.kt b/app/src/main/java/com/kuit/findu/data/repositoryimpl/MyRepositoryImpl.kt similarity index 78% rename from app/src/main/java/com/example/findu/data/repositoryimpl/MyRepositoryImpl.kt rename to app/src/main/java/com/kuit/findu/data/repositoryimpl/MyRepositoryImpl.kt index 0a0cf9a7..59bbb931 100644 --- a/app/src/main/java/com/example/findu/data/repositoryimpl/MyRepositoryImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/repositoryimpl/MyRepositoryImpl.kt @@ -1,18 +1,18 @@ -package com.example.findu.data.repositoryimpl +package com.kuit.findu.data.repositoryimpl import android.net.Uri -import com.example.findu.FindUApp -import com.example.findu.data.dataremote.datasource.MyRemoteDataSource -import com.example.findu.data.dataremote.model.request.PatchNicknameRequestDto -import com.example.findu.data.dataremote.util.handleBaseResponse -import com.example.findu.data.mapper.todomain.my.toDomain -import com.example.findu.domain.model.my.MyInterestData -import com.example.findu.domain.model.my.MyProfileData -import com.example.findu.domain.model.my.MyProfileImageUpdate -import com.example.findu.domain.model.my.MyReportHistoryData -import com.example.findu.domain.model.my.MyViewedAnimalData -import com.example.findu.domain.repository.MyRepository -import com.example.findu.presentation.util.UriUtil +import com.kuit.findu.FindUApp +import com.kuit.findu.data.dataremote.datasource.MyRemoteDataSource +import com.kuit.findu.data.dataremote.model.request.PatchNicknameRequestDto +import com.kuit.findu.data.dataremote.util.handleBaseResponse +import com.kuit.findu.data.mapper.todomain.my.toDomain +import com.kuit.findu.domain.model.my.MyInterestData +import com.kuit.findu.domain.model.my.MyProfileData +import com.kuit.findu.domain.model.my.MyProfileImageUpdate +import com.kuit.findu.domain.model.my.MyReportHistoryData +import com.kuit.findu.domain.model.my.MyViewedAnimalData +import com.kuit.findu.domain.repository.MyRepository +import com.kuit.findu.presentation.util.UriUtil import okhttp3.MediaType.Companion.toMediaType import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody diff --git a/app/src/main/java/com/example/findu/data/repositoryimpl/ReportRepositoryImpl.kt b/app/src/main/java/com/kuit/findu/data/repositoryimpl/ReportRepositoryImpl.kt similarity index 63% rename from app/src/main/java/com/example/findu/data/repositoryimpl/ReportRepositoryImpl.kt rename to app/src/main/java/com/kuit/findu/data/repositoryimpl/ReportRepositoryImpl.kt index b1cb6784..7ef49596 100644 --- a/app/src/main/java/com/example/findu/data/repositoryimpl/ReportRepositoryImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/repositoryimpl/ReportRepositoryImpl.kt @@ -1,24 +1,24 @@ -package com.example.findu.data.repositoryimpl +package com.kuit.findu.data.repositoryimpl -import com.example.findu.data.dataremote.datasource.GptRemoteDataSource -import com.example.findu.data.dataremote.datasource.NaverRemoteDataSource -import com.example.findu.data.dataremote.datasource.ReportRemoteDataSource -import com.example.findu.data.dataremote.model.request.GptRequestConstants.getPromptText -import com.example.findu.data.dataremote.model.request.GptRequestDto -import com.example.findu.data.dataremote.model.request.GptRequestDto.Companion.imageContent -import com.example.findu.data.dataremote.model.request.GptRequestDto.Companion.textContent -import com.example.findu.data.dataremote.model.request.ImageUrl -import com.example.findu.data.dataremote.util.handleBaseResponse -import com.example.findu.data.mapper.todomain.report.toDomain -import com.example.findu.data.mapper.todomain.report.toList -import com.example.findu.data.mapper.todomain.toDomain -import com.example.findu.data.mapper.torequest.toRequestDto -import com.example.findu.domain.model.report.AddressData -import com.example.findu.domain.model.report.GptData -import com.example.findu.domain.model.report.LatLngData -import com.example.findu.domain.model.report.MissingReportData -import com.example.findu.domain.model.report.WitnessReportData -import com.example.findu.domain.repository.report.ReportRepository +import com.kuit.findu.data.dataremote.datasource.GptRemoteDataSource +import com.kuit.findu.data.dataremote.datasource.NaverRemoteDataSource +import com.kuit.findu.data.dataremote.datasource.ReportRemoteDataSource +import com.kuit.findu.data.dataremote.model.request.GptRequestConstants.getPromptText +import com.kuit.findu.data.dataremote.model.request.GptRequestDto +import com.kuit.findu.data.dataremote.model.request.GptRequestDto.Companion.imageContent +import com.kuit.findu.data.dataremote.model.request.GptRequestDto.Companion.textContent +import com.kuit.findu.data.dataremote.model.request.ImageUrl +import com.kuit.findu.data.dataremote.util.handleBaseResponse +import com.kuit.findu.data.mapper.todomain.report.toDomain +import com.kuit.findu.data.mapper.todomain.report.toList +import com.kuit.findu.data.mapper.todomain.toDomain +import com.kuit.findu.data.mapper.torequest.toRequestDto +import com.kuit.findu.domain.model.report.AddressData +import com.kuit.findu.domain.model.report.GptData +import com.kuit.findu.domain.model.report.LatLngData +import com.kuit.findu.domain.model.report.MissingReportData +import com.kuit.findu.domain.model.report.WitnessReportData +import com.kuit.findu.domain.repository.report.ReportRepository import okhttp3.MultipartBody import javax.inject.Inject diff --git a/app/src/main/java/com/example/findu/data/repositoryimpl/SearchRepositoryImpl.kt b/app/src/main/java/com/kuit/findu/data/repositoryimpl/SearchRepositoryImpl.kt similarity index 63% rename from app/src/main/java/com/example/findu/data/repositoryimpl/SearchRepositoryImpl.kt rename to app/src/main/java/com/kuit/findu/data/repositoryimpl/SearchRepositoryImpl.kt index e7ea3a98..26b19c2b 100644 --- a/app/src/main/java/com/example/findu/data/repositoryimpl/SearchRepositoryImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/repositoryimpl/SearchRepositoryImpl.kt @@ -1,12 +1,12 @@ -package com.example.findu.data.repositoryimpl +package com.kuit.findu.data.repositoryimpl import android.util.Log -import com.example.findu.data.dataremote.datasource.SearchRemoteDataSource -import com.example.findu.data.dataremote.util.handleBaseResponse -import com.example.findu.data.mapper.todomain.toDomain -import com.example.findu.domain.model.search.SearchData -import com.example.findu.domain.model.search.SearchFilterData -import com.example.findu.domain.repository.SearchRepository +import com.kuit.findu.data.dataremote.datasource.SearchRemoteDataSource +import com.kuit.findu.data.dataremote.util.handleBaseResponse +import com.kuit.findu.data.mapper.todomain.toDomain +import com.kuit.findu.domain.model.search.SearchData +import com.kuit.findu.domain.model.search.SearchFilterData +import com.kuit.findu.domain.repository.SearchRepository import javax.inject.Inject class SearchRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/com/example/findu/data/repositoryimpl/TokenRepositoryImpl.kt b/app/src/main/java/com/kuit/findu/data/repositoryimpl/TokenRepositoryImpl.kt similarity index 77% rename from app/src/main/java/com/example/findu/data/repositoryimpl/TokenRepositoryImpl.kt rename to app/src/main/java/com/kuit/findu/data/repositoryimpl/TokenRepositoryImpl.kt index 1ec667ae..2e2bb61a 100644 --- a/app/src/main/java/com/example/findu/data/repositoryimpl/TokenRepositoryImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/repositoryimpl/TokenRepositoryImpl.kt @@ -1,7 +1,7 @@ -package com.example.findu.data.repositoryimpl +package com.kuit.findu.data.repositoryimpl -import com.example.findu.data.datalocal.datasource.TokenLocalDataSource -import com.example.findu.domain.repository.TokenRepository +import com.kuit.findu.data.datalocal.datasource.TokenLocalDataSource +import com.kuit.findu.domain.repository.TokenRepository import javax.inject.Inject class TokenRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/com/example/findu/data/repositoryimpl/UserInfoRepositoryImpl.kt b/app/src/main/java/com/kuit/findu/data/repositoryimpl/UserInfoRepositoryImpl.kt similarity index 76% rename from app/src/main/java/com/example/findu/data/repositoryimpl/UserInfoRepositoryImpl.kt rename to app/src/main/java/com/kuit/findu/data/repositoryimpl/UserInfoRepositoryImpl.kt index 768c1d91..44d402e0 100644 --- a/app/src/main/java/com/example/findu/data/repositoryimpl/UserInfoRepositoryImpl.kt +++ b/app/src/main/java/com/kuit/findu/data/repositoryimpl/UserInfoRepositoryImpl.kt @@ -1,7 +1,7 @@ -package com.example.findu.data.repositoryimpl +package com.kuit.findu.data.repositoryimpl -import com.example.findu.data.datalocal.datasource.DeviceLocalDataSource -import com.example.findu.domain.repository.UserInfoRepository +import com.kuit.findu.data.datalocal.datasource.DeviceLocalDataSource +import com.kuit.findu.domain.repository.UserInfoRepository import javax.inject.Inject class UserInfoRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/com/example/findu/di/DataSourceModule.kt b/app/src/main/java/com/kuit/findu/di/DataSourceModule.kt similarity index 53% rename from app/src/main/java/com/example/findu/di/DataSourceModule.kt rename to app/src/main/java/com/kuit/findu/di/DataSourceModule.kt index 6a476ee6..7b7c6273 100644 --- a/app/src/main/java/com/example/findu/di/DataSourceModule.kt +++ b/app/src/main/java/com/kuit/findu/di/DataSourceModule.kt @@ -1,37 +1,37 @@ -package com.example.findu.di - -import com.example.findu.data.datalocal.datasource.DeviceLocalDataSource -import com.example.findu.data.datalocal.datasource.DummyLocalDataSource -import com.example.findu.data.datalocal.datasource.TokenLocalDataSource -import com.example.findu.data.datalocal.datasourceimpl.DeviceLocalDataSourceImpl -import com.example.findu.data.dataremote.datasource.DummyRemoteDataSource -import com.example.findu.data.datalocal.datasourceimpl.DummyLocalDataSourceImpl -import com.example.findu.data.datalocal.datasourceimpl.TokenLocalDataSourceImpl -import com.example.findu.data.dataremote.datasource.AuthRemoteDataSource -import com.example.findu.data.dataremote.datasource.HomeRemoteDataSource -import com.example.findu.data.dataremote.datasource.BreedRemoteDataSource -import com.example.findu.data.dataremote.datasourceimpl.BreedRemoteDataSourceImpl -import com.example.findu.data.dataremote.datasource.GptRemoteDataSource -import com.example.findu.data.dataremote.datasource.MyRemoteDataSource -import com.example.findu.data.dataremote.datasource.DetailSearchRemoteDataSource -import com.example.findu.data.dataremote.datasource.InquiryRemoteDataSource -import com.example.findu.data.dataremote.datasource.InformationRemoteDataSource -import com.example.findu.data.dataremote.datasource.InterestRemoteDataSource -import com.example.findu.data.dataremote.datasource.SearchRemoteDataSource -import com.example.findu.data.dataremote.datasourceimpl.DetailSearchRemoteDataSourceImpl -import com.example.findu.data.dataremote.datasource.NaverRemoteDataSource -import com.example.findu.data.dataremote.datasource.ReportRemoteDataSource -import com.example.findu.data.dataremote.datasourceimpl.AuthRemoteDataSourceImpl -import com.example.findu.data.dataremote.datasourceimpl.DummyRemoteDataSourceImpl -import com.example.findu.data.dataremote.datasourceimpl.GptRemoteDataSourceImpl -import com.example.findu.data.dataremote.datasourceimpl.HomeRemoteDataSourceImpl -import com.example.findu.data.dataremote.datasourceimpl.InquiryRemoteDataSourceImpl -import com.example.findu.data.dataremote.datasourceimpl.InformationRemoteDataSourceImpl -import com.example.findu.data.dataremote.datasourceimpl.InterestRemoteDataSourceImpl -import com.example.findu.data.dataremote.datasourceimpl.SearchRemoteDataSourceImpl -import com.example.findu.data.dataremote.datasourceimpl.MyRemoteDataSourceImpl -import com.example.findu.data.dataremote.datasourceimpl.NaverRemoteDataSourceImpl -import com.example.findu.data.dataremote.datasourceimpl.ReportRemoteDataSourceImpl +package com.kuit.findu.di + +import com.kuit.findu.data.datalocal.datasource.DeviceLocalDataSource +import com.kuit.findu.data.datalocal.datasource.DummyLocalDataSource +import com.kuit.findu.data.datalocal.datasource.TokenLocalDataSource +import com.kuit.findu.data.datalocal.datasourceimpl.DeviceLocalDataSourceImpl +import com.kuit.findu.data.dataremote.datasource.DummyRemoteDataSource +import com.kuit.findu.data.datalocal.datasourceimpl.DummyLocalDataSourceImpl +import com.kuit.findu.data.datalocal.datasourceimpl.TokenLocalDataSourceImpl +import com.kuit.findu.data.dataremote.datasource.AuthRemoteDataSource +import com.kuit.findu.data.dataremote.datasource.HomeRemoteDataSource +import com.kuit.findu.data.dataremote.datasource.BreedRemoteDataSource +import com.kuit.findu.data.dataremote.datasourceimpl.BreedRemoteDataSourceImpl +import com.kuit.findu.data.dataremote.datasource.GptRemoteDataSource +import com.kuit.findu.data.dataremote.datasource.MyRemoteDataSource +import com.kuit.findu.data.dataremote.datasource.DetailSearchRemoteDataSource +import com.kuit.findu.data.dataremote.datasource.InquiryRemoteDataSource +import com.kuit.findu.data.dataremote.datasource.InformationRemoteDataSource +import com.kuit.findu.data.dataremote.datasource.InterestRemoteDataSource +import com.kuit.findu.data.dataremote.datasource.SearchRemoteDataSource +import com.kuit.findu.data.dataremote.datasourceimpl.DetailSearchRemoteDataSourceImpl +import com.kuit.findu.data.dataremote.datasource.NaverRemoteDataSource +import com.kuit.findu.data.dataremote.datasource.ReportRemoteDataSource +import com.kuit.findu.data.dataremote.datasourceimpl.AuthRemoteDataSourceImpl +import com.kuit.findu.data.dataremote.datasourceimpl.DummyRemoteDataSourceImpl +import com.kuit.findu.data.dataremote.datasourceimpl.GptRemoteDataSourceImpl +import com.kuit.findu.data.dataremote.datasourceimpl.HomeRemoteDataSourceImpl +import com.kuit.findu.data.dataremote.datasourceimpl.InquiryRemoteDataSourceImpl +import com.kuit.findu.data.dataremote.datasourceimpl.InformationRemoteDataSourceImpl +import com.kuit.findu.data.dataremote.datasourceimpl.InterestRemoteDataSourceImpl +import com.kuit.findu.data.dataremote.datasourceimpl.SearchRemoteDataSourceImpl +import com.kuit.findu.data.dataremote.datasourceimpl.MyRemoteDataSourceImpl +import com.kuit.findu.data.dataremote.datasourceimpl.NaverRemoteDataSourceImpl +import com.kuit.findu.data.dataremote.datasourceimpl.ReportRemoteDataSourceImpl import dagger.Binds import dagger.Module import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/example/findu/di/NetworkModule.kt b/app/src/main/java/com/kuit/findu/di/NetworkModule.kt similarity index 90% rename from app/src/main/java/com/example/findu/di/NetworkModule.kt rename to app/src/main/java/com/kuit/findu/di/NetworkModule.kt index 98a877a8..76021961 100644 --- a/app/src/main/java/com/example/findu/di/NetworkModule.kt +++ b/app/src/main/java/com/kuit/findu/di/NetworkModule.kt @@ -1,10 +1,10 @@ -package com.example.findu.di +package com.kuit.findu.di import android.content.Context -import com.example.findu.BuildConfig -import com.example.findu.BuildConfig.DEBUG -import com.example.findu.data.datalocal.datasource.TokenLocalDataSource -import com.example.findu.data.dataremote.util.AuthInterceptor +import com.kuit.findu.BuildConfig +import com.kuit.findu.BuildConfig.DEBUG +import com.kuit.findu.data.datalocal.datasource.TokenLocalDataSource +import com.kuit.findu.data.dataremote.util.AuthInterceptor import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import dagger.Module import dagger.Provides diff --git a/app/src/main/java/com/example/findu/di/RepositoryModule.kt b/app/src/main/java/com/kuit/findu/di/RepositoryModule.kt similarity index 53% rename from app/src/main/java/com/example/findu/di/RepositoryModule.kt rename to app/src/main/java/com/kuit/findu/di/RepositoryModule.kt index 7a3d03e8..f039da5a 100644 --- a/app/src/main/java/com/example/findu/di/RepositoryModule.kt +++ b/app/src/main/java/com/kuit/findu/di/RepositoryModule.kt @@ -1,31 +1,31 @@ -package com.example.findu.di +package com.kuit.findu.di -import com.example.findu.data.repositoryimpl.AuthRepositoryImpl -import com.example.findu.data.repositoryimpl.DetailSearchRepositoryImpl -import com.example.findu.data.repositoryimpl.BreedRepositoryImpl -import com.example.findu.data.repositoryimpl.UserInfoRepositoryImpl -import com.example.findu.data.repositoryimpl.DummyRepositoryImpl -import com.example.findu.data.repositoryimpl.HomeRepositoryImpl -import com.example.findu.data.repositoryimpl.InquiryRepositoryImpl -import com.example.findu.data.repositoryimpl.InformationRepositoryImpl -import com.example.findu.data.repositoryimpl.InterestRepositoryImpl -import com.example.findu.data.repositoryimpl.SearchRepositoryImpl -import com.example.findu.domain.repository.DetailSearchRepository -import com.example.findu.data.repositoryimpl.MyRepositoryImpl -import com.example.findu.domain.repository.BreedRepository -import com.example.findu.data.repositoryimpl.ReportRepositoryImpl -import com.example.findu.data.repositoryimpl.TokenRepositoryImpl -import com.example.findu.domain.repository.AuthRepository -import com.example.findu.domain.repository.UserInfoRepository -import com.example.findu.domain.repository.DummyRepository -import com.example.findu.domain.repository.report.ReportRepository -import com.example.findu.domain.repository.HomeRepository -import com.example.findu.domain.repository.InquiryRepository -import com.example.findu.domain.repository.InformationRepository -import com.example.findu.domain.repository.InterestRepository -import com.example.findu.domain.repository.SearchRepository -import com.example.findu.domain.repository.MyRepository -import com.example.findu.domain.repository.TokenRepository +import com.kuit.findu.data.repositoryimpl.AuthRepositoryImpl +import com.kuit.findu.data.repositoryimpl.DetailSearchRepositoryImpl +import com.kuit.findu.data.repositoryimpl.BreedRepositoryImpl +import com.kuit.findu.data.repositoryimpl.UserInfoRepositoryImpl +import com.kuit.findu.data.repositoryimpl.DummyRepositoryImpl +import com.kuit.findu.data.repositoryimpl.HomeRepositoryImpl +import com.kuit.findu.data.repositoryimpl.InquiryRepositoryImpl +import com.kuit.findu.data.repositoryimpl.InformationRepositoryImpl +import com.kuit.findu.data.repositoryimpl.InterestRepositoryImpl +import com.kuit.findu.data.repositoryimpl.SearchRepositoryImpl +import com.kuit.findu.domain.repository.DetailSearchRepository +import com.kuit.findu.data.repositoryimpl.MyRepositoryImpl +import com.kuit.findu.domain.repository.BreedRepository +import com.kuit.findu.data.repositoryimpl.ReportRepositoryImpl +import com.kuit.findu.data.repositoryimpl.TokenRepositoryImpl +import com.kuit.findu.domain.repository.AuthRepository +import com.kuit.findu.domain.repository.UserInfoRepository +import com.kuit.findu.domain.repository.DummyRepository +import com.kuit.findu.domain.repository.report.ReportRepository +import com.kuit.findu.domain.repository.HomeRepository +import com.kuit.findu.domain.repository.InquiryRepository +import com.kuit.findu.domain.repository.InformationRepository +import com.kuit.findu.domain.repository.InterestRepository +import com.kuit.findu.domain.repository.SearchRepository +import com.kuit.findu.domain.repository.MyRepository +import com.kuit.findu.domain.repository.TokenRepository import dagger.Binds import dagger.Module import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/example/findu/di/ServiceModule.kt b/app/src/main/java/com/kuit/findu/di/ServiceModule.kt similarity index 77% rename from app/src/main/java/com/example/findu/di/ServiceModule.kt rename to app/src/main/java/com/kuit/findu/di/ServiceModule.kt index 5eb64879..469be617 100644 --- a/app/src/main/java/com/example/findu/di/ServiceModule.kt +++ b/app/src/main/java/com/kuit/findu/di/ServiceModule.kt @@ -1,19 +1,19 @@ -package com.example.findu.di +package com.kuit.findu.di -import com.example.findu.data.dataremote.service.AuthService -import com.example.findu.data.dataremote.service.DetailSearchService -import com.example.findu.data.dataremote.service.BreedService -import com.example.findu.data.dataremote.service.DummyService -import com.example.findu.data.dataremote.service.GptService import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory -import com.example.findu.data.dataremote.service.HomeService -import com.example.findu.data.dataremote.service.InquiryService -import com.example.findu.data.dataremote.service.InformationService -import com.example.findu.data.dataremote.service.InterestService -import com.example.findu.data.dataremote.service.SearchService -import com.example.findu.data.dataremote.service.MyService -import com.example.findu.data.dataremote.service.NaverService -import com.example.findu.data.dataremote.service.ReportService +import com.kuit.findu.data.dataremote.service.AuthService +import com.kuit.findu.data.dataremote.service.BreedService +import com.kuit.findu.data.dataremote.service.DetailSearchService +import com.kuit.findu.data.dataremote.service.DummyService +import com.kuit.findu.data.dataremote.service.GptService +import com.kuit.findu.data.dataremote.service.HomeService +import com.kuit.findu.data.dataremote.service.InformationService +import com.kuit.findu.data.dataremote.service.InquiryService +import com.kuit.findu.data.dataremote.service.InterestService +import com.kuit.findu.data.dataremote.service.MyService +import com.kuit.findu.data.dataremote.service.NaverService +import com.kuit.findu.data.dataremote.service.ReportService +import com.kuit.findu.data.dataremote.service.SearchService import dagger.Module import dagger.Provides import dagger.hilt.InstallIn @@ -81,7 +81,7 @@ object ServiceModule { @Singleton fun provideGptService( okHttpClient: OkHttpClient, - json: Json + json: Json, ): GptService { val gptRetrofit = Retrofit.Builder() .baseUrl("https://api.openai.com/") @@ -98,7 +98,7 @@ object ServiceModule { @Singleton fun provideNaverService( okHttpClient: OkHttpClient, - json: Json + json: Json, ): NaverService { val naverRetrofit = Retrofit.Builder() .baseUrl("https://maps.apigw.ntruss.com/") diff --git a/app/src/main/java/com/example/findu/di/SharedPreferencesModule.kt b/app/src/main/java/com/kuit/findu/di/SharedPreferencesModule.kt similarity index 86% rename from app/src/main/java/com/example/findu/di/SharedPreferencesModule.kt rename to app/src/main/java/com/kuit/findu/di/SharedPreferencesModule.kt index bc427d8f..0775861b 100644 --- a/app/src/main/java/com/example/findu/di/SharedPreferencesModule.kt +++ b/app/src/main/java/com/kuit/findu/di/SharedPreferencesModule.kt @@ -1,9 +1,9 @@ -package com.example.findu.di +package com.kuit.findu.di import android.content.Context import android.content.SharedPreferences -import com.example.findu.di.qualifier.DeviceIdPrefs -import com.example.findu.di.qualifier.TokenPrefs +import com.kuit.findu.di.qualifier.DeviceIdPrefs +import com.kuit.findu.di.qualifier.TokenPrefs import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/example/findu/di/UseCaseModule.kt b/app/src/main/java/com/kuit/findu/di/UseCaseModule.kt similarity index 51% rename from app/src/main/java/com/example/findu/di/UseCaseModule.kt rename to app/src/main/java/com/kuit/findu/di/UseCaseModule.kt index 773903b9..484a284b 100644 --- a/app/src/main/java/com/example/findu/di/UseCaseModule.kt +++ b/app/src/main/java/com/kuit/findu/di/UseCaseModule.kt @@ -1,53 +1,53 @@ -package com.example.findu.di - -import com.example.findu.domain.repository.AuthRepository -import com.example.findu.domain.repository.BreedRepository -import com.example.findu.domain.repository.DetailSearchRepository -import com.example.findu.domain.repository.HomeRepository -import com.example.findu.domain.repository.InformationRepository -import com.example.findu.domain.repository.InterestRepository -import com.example.findu.domain.repository.MyRepository -import com.example.findu.domain.repository.SearchRepository -import com.example.findu.domain.repository.TokenRepository -import com.example.findu.domain.repository.UserInfoRepository -import com.example.findu.domain.repository.report.ReportRepository -import com.example.findu.domain.usecase.GetBreedDataUseCase -import com.example.findu.domain.usecase.GetBreedValidationUseCase -import com.example.findu.domain.usecase.GetDetailSearchUseCase -import com.example.findu.domain.usecase.GetNicknameUseCase -import com.example.findu.domain.usecase.GetSearchUseCase -import com.example.findu.domain.usecase.PostAiDetectionUseCase -import com.example.findu.domain.usecase.SetNicknameUseCase -import com.example.findu.domain.usecase.auth.PostCheckNicknameUseCase -import com.example.findu.domain.usecase.auth.PostGuestLoginUseCase -import com.example.findu.domain.usecase.auth.PostLoginUseCase -import com.example.findu.domain.usecase.auth.PostSignupUseCase -import com.example.findu.domain.usecase.extra.GetCentersUseCase -import com.example.findu.domain.usecase.extra.GetDepartmentsUseCase -import com.example.findu.domain.usecase.extra.GetSidoUseCase -import com.example.findu.domain.usecase.extra.GetSigunguUseCase -import com.example.findu.domain.usecase.extra.GetVolunteersUseCase -import com.example.findu.domain.usecase.home.GetHomeUseCase -import com.example.findu.domain.usecase.interest.DeleteInterestAnimalUseCase -import com.example.findu.domain.usecase.interest.PostInterestAnimalUseCase -import com.example.findu.domain.usecase.my.DeleteUserUseCase -import com.example.findu.domain.usecase.my.GetInterestUseCase -import com.example.findu.domain.usecase.my.GetNickNameUseCase -import com.example.findu.domain.usecase.my.GetReportHistoryUseCase -import com.example.findu.domain.usecase.my.GetViewedAnimalUseCase -import com.example.findu.domain.usecase.my.PatchNickNameUseCase -import com.example.findu.domain.usecase.report.AnalysisImageWithGptUseCase -import com.example.findu.domain.usecase.report.DeleteReportUseCase -import com.example.findu.domain.usecase.report.GetAddressUseCase -import com.example.findu.domain.usecase.report.GetLatLngUseCase -import com.example.findu.domain.usecase.report.PostMissingReportUseCase -import com.example.findu.domain.usecase.report.PostWitnessReportUseCase -import com.example.findu.domain.usecase.report.UploadImagesUseCase -import com.example.findu.domain.usecase.token.ClearTokenUseCase -import com.example.findu.domain.usecase.token.GetAccessTokenUseCase -import com.example.findu.domain.usecase.token.GetRefreshTokenUseCase -import com.example.findu.domain.usecase.token.SetAccessTokenUseCase -import com.example.findu.domain.usecase.token.SetRefreshTokenUseCase +package com.kuit.findu.di + +import com.kuit.findu.domain.repository.AuthRepository +import com.kuit.findu.domain.repository.BreedRepository +import com.kuit.findu.domain.repository.DetailSearchRepository +import com.kuit.findu.domain.repository.HomeRepository +import com.kuit.findu.domain.repository.InformationRepository +import com.kuit.findu.domain.repository.InterestRepository +import com.kuit.findu.domain.repository.MyRepository +import com.kuit.findu.domain.repository.SearchRepository +import com.kuit.findu.domain.repository.TokenRepository +import com.kuit.findu.domain.repository.UserInfoRepository +import com.kuit.findu.domain.repository.report.ReportRepository +import com.kuit.findu.domain.usecase.GetBreedDataUseCase +import com.kuit.findu.domain.usecase.GetBreedValidationUseCase +import com.kuit.findu.domain.usecase.GetDetailSearchUseCase +import com.kuit.findu.domain.usecase.GetNicknameUseCase +import com.kuit.findu.domain.usecase.GetSearchUseCase +import com.kuit.findu.domain.usecase.PostAiDetectionUseCase +import com.kuit.findu.domain.usecase.SetNicknameUseCase +import com.kuit.findu.domain.usecase.auth.PostCheckNicknameUseCase +import com.kuit.findu.domain.usecase.auth.PostGuestLoginUseCase +import com.kuit.findu.domain.usecase.auth.PostLoginUseCase +import com.kuit.findu.domain.usecase.auth.PostSignupUseCase +import com.kuit.findu.domain.usecase.extra.GetCentersUseCase +import com.kuit.findu.domain.usecase.extra.GetDepartmentsUseCase +import com.kuit.findu.domain.usecase.extra.GetSidoUseCase +import com.kuit.findu.domain.usecase.extra.GetSigunguUseCase +import com.kuit.findu.domain.usecase.extra.GetVolunteersUseCase +import com.kuit.findu.domain.usecase.home.GetHomeUseCase +import com.kuit.findu.domain.usecase.interest.DeleteInterestAnimalUseCase +import com.kuit.findu.domain.usecase.interest.PostInterestAnimalUseCase +import com.kuit.findu.domain.usecase.my.DeleteUserUseCase +import com.kuit.findu.domain.usecase.my.GetInterestUseCase +import com.kuit.findu.domain.usecase.my.GetNickNameUseCase +import com.kuit.findu.domain.usecase.my.GetReportHistoryUseCase +import com.kuit.findu.domain.usecase.my.GetViewedAnimalUseCase +import com.kuit.findu.domain.usecase.my.PatchNickNameUseCase +import com.kuit.findu.domain.usecase.report.AnalysisImageWithGptUseCase +import com.kuit.findu.domain.usecase.report.DeleteReportUseCase +import com.kuit.findu.domain.usecase.report.GetAddressUseCase +import com.kuit.findu.domain.usecase.report.GetLatLngUseCase +import com.kuit.findu.domain.usecase.report.PostMissingReportUseCase +import com.kuit.findu.domain.usecase.report.PostWitnessReportUseCase +import com.kuit.findu.domain.usecase.report.UploadImagesUseCase +import com.kuit.findu.domain.usecase.token.ClearTokenUseCase +import com.kuit.findu.domain.usecase.token.GetAccessTokenUseCase +import com.kuit.findu.domain.usecase.token.GetRefreshTokenUseCase +import com.kuit.findu.domain.usecase.token.SetAccessTokenUseCase +import com.kuit.findu.domain.usecase.token.SetRefreshTokenUseCase import dagger.Module import dagger.Provides import dagger.hilt.InstallIn @@ -61,62 +61,62 @@ object UseCaseModule { @Provides @Singleton fun provideGetHomeUseCase( - homeRepository: HomeRepository + homeRepository: HomeRepository, ): GetHomeUseCase = GetHomeUseCase(homeRepository) @Provides @Singleton fun provideGetSearchUseCase( - searchRepository: SearchRepository + searchRepository: SearchRepository, ): GetSearchUseCase = GetSearchUseCase(searchRepository) @Provides @Singleton fun provideGetDetailSearchUseCase( - detailSearchRepository: DetailSearchRepository + detailSearchRepository: DetailSearchRepository, ): GetDetailSearchUseCase = GetDetailSearchUseCase(detailSearchRepository) @Provides @Singleton fun provideGetBreedDataUseCase( - breedRepository: BreedRepository + breedRepository: BreedRepository, ): GetBreedDataUseCase = GetBreedDataUseCase(breedRepository) @Provides @Singleton fun provideGetBreedValidationUseCase( - breedRepository: BreedRepository + breedRepository: BreedRepository, ): GetBreedValidationUseCase = GetBreedValidationUseCase(breedRepository) @Provides @Singleton fun provideAnalysisImageWithGptUseCase( - reportRepository: ReportRepository + reportRepository: ReportRepository, ): AnalysisImageWithGptUseCase = AnalysisImageWithGptUseCase(reportRepository) @Provides @Singleton fun provideUploadImagesUseCase( - reportRepository: ReportRepository + reportRepository: ReportRepository, ): UploadImagesUseCase = UploadImagesUseCase(reportRepository) @Provides @Singleton fun providePostMissingReportUseCase( - reportRepository: ReportRepository + reportRepository: ReportRepository, ): PostMissingReportUseCase = PostMissingReportUseCase(reportRepository) @Provides @Singleton fun providePostWitnessReportUseCase( - reportRepository: ReportRepository + reportRepository: ReportRepository, ): PostWitnessReportUseCase = PostWitnessReportUseCase(reportRepository) @Provides @Singleton fun provideGetAddressUseCase( - reportRepository: ReportRepository + reportRepository: ReportRepository, ): GetAddressUseCase = GetAddressUseCase(reportRepository) @Provides @@ -128,144 +128,149 @@ object UseCaseModule { @Provides @Singleton fun provideGetInterestUseCase( - myRepository: MyRepository + myRepository: MyRepository, ): GetInterestUseCase = GetInterestUseCase(myRepository) @Provides @Singleton fun provideGetReportHistoryUseCase( - myRepository: MyRepository + myRepository: MyRepository, ): GetReportHistoryUseCase = GetReportHistoryUseCase(myRepository) @Provides @Singleton fun provideGetViewedAnimalUseCase( - myRepository: MyRepository + myRepository: MyRepository, ): GetViewedAnimalUseCase = GetViewedAnimalUseCase(myRepository) @Provides @Singleton fun provideDeleteUserUseCase( - myRepository: MyRepository + myRepository: MyRepository, ): DeleteUserUseCase = DeleteUserUseCase(myRepository) @Provides @Singleton fun providePatchNickNameUseCase( - myRepository: MyRepository + myRepository: MyRepository, ): PatchNickNameUseCase = PatchNickNameUseCase(myRepository) @Provides @Singleton fun provideGetNickNameUseCase( - myRepository: MyRepository + myRepository: MyRepository, ): GetNickNameUseCase = GetNickNameUseCase(myRepository) @Provides @Singleton fun providePostInterestAnimalUseCase( - interestRepository: InterestRepository + interestRepository: InterestRepository, ): PostInterestAnimalUseCase = PostInterestAnimalUseCase(interestRepository) @Provides @Singleton fun provideDeleteInterestAnimalUseCase( - interestRepository: InterestRepository + interestRepository: InterestRepository, ): DeleteInterestAnimalUseCase = DeleteInterestAnimalUseCase(interestRepository) @Provides @Singleton fun providePostLoginUseCase( authRepository: AuthRepository, - userInfoRepository: UserInfoRepository - ): PostLoginUseCase = PostLoginUseCase(authRepository = authRepository, userInfoRepository = userInfoRepository) + userInfoRepository: UserInfoRepository, + ): PostLoginUseCase = + PostLoginUseCase(authRepository = authRepository, userInfoRepository = userInfoRepository) @Provides @Singleton fun providePostGuestLoginUseCase( authRepository: AuthRepository, - userInfoRepository: UserInfoRepository + userInfoRepository: UserInfoRepository, ): PostGuestLoginUseCase = - PostGuestLoginUseCase(authRepository = authRepository, userInfoRepository = userInfoRepository) + PostGuestLoginUseCase( + authRepository = authRepository, + userInfoRepository = userInfoRepository + ) @Provides @Singleton fun providePostCheckEmailUseCase( - authRepository: AuthRepository + authRepository: AuthRepository, ): PostCheckNicknameUseCase = PostCheckNicknameUseCase(authRepository) @Provides @Singleton fun providePostSignupUseCase( authRepository: AuthRepository, - userInfoRepository: UserInfoRepository - ): PostSignupUseCase = PostSignupUseCase(authRepository = authRepository, userInfoRepository = userInfoRepository) + userInfoRepository: UserInfoRepository, + ): PostSignupUseCase = + PostSignupUseCase(authRepository = authRepository, userInfoRepository = userInfoRepository) @Provides @Singleton fun provideDeleteReportUseCase( - reportRepository: ReportRepository + reportRepository: ReportRepository, ): DeleteReportUseCase = DeleteReportUseCase(reportRepository) @Provides @Singleton fun provideSetAccessTokenUseCase( - tokenRepository: TokenRepository + tokenRepository: TokenRepository, ): SetAccessTokenUseCase = SetAccessTokenUseCase(tokenRepository) @Provides @Singleton fun provideSetRefreshTokenUseCase( - tokenRepository: TokenRepository + tokenRepository: TokenRepository, ): SetRefreshTokenUseCase = SetRefreshTokenUseCase(tokenRepository) @Provides @Singleton fun provideGetAccessTokenUseCase( - tokenRepository: TokenRepository + tokenRepository: TokenRepository, ): GetAccessTokenUseCase = GetAccessTokenUseCase(tokenRepository) @Provides @Singleton fun provideGetRefreshTokenUseCase( - tokenRepository: TokenRepository + tokenRepository: TokenRepository, ): GetRefreshTokenUseCase = GetRefreshTokenUseCase(tokenRepository) @Provides @Singleton fun provideClearTokenUseCase( - tokenRepository: TokenRepository + tokenRepository: TokenRepository, ): ClearTokenUseCase = ClearTokenUseCase(tokenRepository) @Provides @Singleton fun provideGetDepartmentsUseCase( - informationRepository: InformationRepository + informationRepository: InformationRepository, ): GetDepartmentsUseCase = GetDepartmentsUseCase(informationRepository) @Provides @Singleton fun provideGetVolunteersUseCase( - informationRepository: InformationRepository + informationRepository: InformationRepository, ): GetVolunteersUseCase = GetVolunteersUseCase(informationRepository) @Provides @Singleton fun provideGetCentersUseCase( - informationRepository: InformationRepository + informationRepository: InformationRepository, ): GetCentersUseCase = GetCentersUseCase(informationRepository) @Provides @Singleton fun provideGetLocalNicknameUseCase( - userInfoRepository: UserInfoRepository + userInfoRepository: UserInfoRepository, ): GetNicknameUseCase = GetNicknameUseCase(userInfoRepository) @Provides @Singleton fun provideSetNicknameUseCase( - userInfoRepository: UserInfoRepository + userInfoRepository: UserInfoRepository, ): SetNicknameUseCase = SetNicknameUseCase(userInfoRepository) @Provides @@ -277,12 +282,12 @@ object UseCaseModule { @Provides @Singleton fun provideGetSidoUseCase( - informationRepository: InformationRepository + informationRepository: InformationRepository, ): GetSidoUseCase = GetSidoUseCase(informationRepository) @Provides @Singleton fun provideGetSigunguUseCase( - informationRepository: InformationRepository + informationRepository: InformationRepository, ): GetSigunguUseCase = GetSigunguUseCase(informationRepository) } \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/di/qualifier/Qualifier.kt b/app/src/main/java/com/kuit/findu/di/qualifier/Qualifier.kt similarity index 83% rename from app/src/main/java/com/example/findu/di/qualifier/Qualifier.kt rename to app/src/main/java/com/kuit/findu/di/qualifier/Qualifier.kt index be43db70..89d424b9 100644 --- a/app/src/main/java/com/example/findu/di/qualifier/Qualifier.kt +++ b/app/src/main/java/com/kuit/findu/di/qualifier/Qualifier.kt @@ -1,4 +1,4 @@ -package com.example.findu.di.qualifier +package com.kuit.findu.di.qualifier import javax.inject.Qualifier diff --git a/app/src/main/java/com/example/findu/domain/model/AuthData.kt b/app/src/main/java/com/kuit/findu/domain/model/AuthData.kt similarity index 89% rename from app/src/main/java/com/example/findu/domain/model/AuthData.kt rename to app/src/main/java/com/kuit/findu/domain/model/AuthData.kt index 8d4f842b..8de51cf1 100644 --- a/app/src/main/java/com/example/findu/domain/model/AuthData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/AuthData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model +package com.kuit.findu.domain.model data class LoginInfo( val kakaoId: Long, diff --git a/app/src/main/java/com/example/findu/domain/model/DummyData.kt b/app/src/main/java/com/kuit/findu/domain/model/DummyData.kt similarity index 57% rename from app/src/main/java/com/example/findu/domain/model/DummyData.kt rename to app/src/main/java/com/kuit/findu/domain/model/DummyData.kt index 38d0a662..c5d1d388 100644 --- a/app/src/main/java/com/example/findu/domain/model/DummyData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/DummyData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model +package com.kuit.findu.domain.model data class DummyData( val description: String diff --git a/app/src/main/java/com/example/findu/domain/model/HomeData.kt b/app/src/main/java/com/kuit/findu/domain/model/HomeData.kt similarity index 97% rename from app/src/main/java/com/example/findu/domain/model/HomeData.kt rename to app/src/main/java/com/kuit/findu/domain/model/HomeData.kt index af73dd82..c8b6d147 100644 --- a/app/src/main/java/com/example/findu/domain/model/HomeData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/HomeData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model +package com.kuit.findu.domain.model data class HomeData( val todayRescuedAnimalCount: Int, diff --git a/app/src/main/java/com/example/findu/domain/model/breed/AiDetectionData.kt b/app/src/main/java/com/kuit/findu/domain/model/breed/AiDetectionData.kt similarity index 70% rename from app/src/main/java/com/example/findu/domain/model/breed/AiDetectionData.kt rename to app/src/main/java/com/kuit/findu/domain/model/breed/AiDetectionData.kt index 9e05c779..6b156858 100644 --- a/app/src/main/java/com/example/findu/domain/model/breed/AiDetectionData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/breed/AiDetectionData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.breed +package com.kuit.findu.domain.model.breed data class AiDetectionData( val species: String, diff --git a/app/src/main/java/com/example/findu/domain/model/breed/BreedData.kt b/app/src/main/java/com/kuit/findu/domain/model/breed/BreedData.kt similarity index 94% rename from app/src/main/java/com/example/findu/domain/model/breed/BreedData.kt rename to app/src/main/java/com/kuit/findu/domain/model/breed/BreedData.kt index 47c6a399..f0cea007 100644 --- a/app/src/main/java/com/example/findu/domain/model/breed/BreedData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/breed/BreedData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.breed +package com.kuit.findu.domain.model.breed data class BreedData( val dogBreedList: List = emptyList(), diff --git a/app/src/main/java/com/example/findu/domain/model/breed/BreedValidationData.kt b/app/src/main/java/com/kuit/findu/domain/model/breed/BreedValidationData.kt similarity index 64% rename from app/src/main/java/com/example/findu/domain/model/breed/BreedValidationData.kt rename to app/src/main/java/com/kuit/findu/domain/model/breed/BreedValidationData.kt index 73d5b371..c71e0fb2 100644 --- a/app/src/main/java/com/example/findu/domain/model/breed/BreedValidationData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/breed/BreedValidationData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.breed +package com.kuit.findu.domain.model.breed data class BreedValidationData( val breedId: Int, diff --git a/app/src/main/java/com/example/findu/domain/model/breed/SpeciesType.kt b/app/src/main/java/com/kuit/findu/domain/model/breed/SpeciesType.kt similarity index 87% rename from app/src/main/java/com/example/findu/domain/model/breed/SpeciesType.kt rename to app/src/main/java/com/kuit/findu/domain/model/breed/SpeciesType.kt index 5e9b14a1..6ea17e6d 100644 --- a/app/src/main/java/com/example/findu/domain/model/breed/SpeciesType.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/breed/SpeciesType.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.breed +package com.kuit.findu.domain.model.breed enum class SpeciesType( val displayName: String, diff --git a/app/src/main/java/com/example/findu/domain/model/extra/HomeExtraDataType.kt b/app/src/main/java/com/kuit/findu/domain/model/extra/HomeExtraDataType.kt similarity index 94% rename from app/src/main/java/com/example/findu/domain/model/extra/HomeExtraDataType.kt rename to app/src/main/java/com/kuit/findu/domain/model/extra/HomeExtraDataType.kt index 06a7d0de..2eea8e33 100644 --- a/app/src/main/java/com/example/findu/domain/model/extra/HomeExtraDataType.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/extra/HomeExtraDataType.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.extra +package com.kuit.findu.domain.model.extra interface HomeExtraDataType diff --git a/app/src/main/java/com/example/findu/domain/model/my/MyInterestData.kt b/app/src/main/java/com/kuit/findu/domain/model/my/MyInterestData.kt similarity index 88% rename from app/src/main/java/com/example/findu/domain/model/my/MyInterestData.kt rename to app/src/main/java/com/kuit/findu/domain/model/my/MyInterestData.kt index 6f5dd576..9d21cb75 100644 --- a/app/src/main/java/com/example/findu/domain/model/my/MyInterestData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/my/MyInterestData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.my +package com.kuit.findu.domain.model.my data class MyInterestData( val interestAnimals: List, diff --git a/app/src/main/java/com/example/findu/domain/model/my/MyProfileData.kt b/app/src/main/java/com/kuit/findu/domain/model/my/MyProfileData.kt similarity index 66% rename from app/src/main/java/com/example/findu/domain/model/my/MyProfileData.kt rename to app/src/main/java/com/kuit/findu/domain/model/my/MyProfileData.kt index c18c39d3..7e25eaf2 100644 --- a/app/src/main/java/com/example/findu/domain/model/my/MyProfileData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/my/MyProfileData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.my +package com.kuit.findu.domain.model.my data class MyProfileData( val nickname: String, diff --git a/app/src/main/java/com/example/findu/domain/model/my/MyProfileImageUpdate.kt b/app/src/main/java/com/kuit/findu/domain/model/my/MyProfileImageUpdate.kt similarity index 80% rename from app/src/main/java/com/example/findu/domain/model/my/MyProfileImageUpdate.kt rename to app/src/main/java/com/kuit/findu/domain/model/my/MyProfileImageUpdate.kt index 3c56e40e..4dc7dbb2 100644 --- a/app/src/main/java/com/example/findu/domain/model/my/MyProfileImageUpdate.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/my/MyProfileImageUpdate.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.my +package com.kuit.findu.domain.model.my sealed class MyProfileImageUpdate { data class FilePath(val path: String) : MyProfileImageUpdate() diff --git a/app/src/main/java/com/example/findu/domain/model/my/MyReportHistoryData.kt b/app/src/main/java/com/kuit/findu/domain/model/my/MyReportHistoryData.kt similarity index 89% rename from app/src/main/java/com/example/findu/domain/model/my/MyReportHistoryData.kt rename to app/src/main/java/com/kuit/findu/domain/model/my/MyReportHistoryData.kt index cc0b80a7..d8a920c5 100644 --- a/app/src/main/java/com/example/findu/domain/model/my/MyReportHistoryData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/my/MyReportHistoryData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.my +package com.kuit.findu.domain.model.my data class MyReportHistoryData( val isLast: Boolean, diff --git a/app/src/main/java/com/example/findu/domain/model/my/MyViewedAnimalData.kt b/app/src/main/java/com/kuit/findu/domain/model/my/MyViewedAnimalData.kt similarity index 73% rename from app/src/main/java/com/example/findu/domain/model/my/MyViewedAnimalData.kt rename to app/src/main/java/com/kuit/findu/domain/model/my/MyViewedAnimalData.kt index 1f4f2eb1..6e90369b 100644 --- a/app/src/main/java/com/example/findu/domain/model/my/MyViewedAnimalData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/my/MyViewedAnimalData.kt @@ -1,7 +1,4 @@ -package com.example.findu.domain.model.my - -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable +package com.kuit.findu.domain.model.my data class MyViewedAnimalData( val isLast: Boolean, diff --git a/app/src/main/java/com/example/findu/domain/model/report/AddressData.kt b/app/src/main/java/com/kuit/findu/domain/model/report/AddressData.kt similarity index 52% rename from app/src/main/java/com/example/findu/domain/model/report/AddressData.kt rename to app/src/main/java/com/kuit/findu/domain/model/report/AddressData.kt index 71ea7f68..e71621cf 100644 --- a/app/src/main/java/com/example/findu/domain/model/report/AddressData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/report/AddressData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.report +package com.kuit.findu.domain.model.report data class AddressData( val address: String diff --git a/app/src/main/java/com/example/findu/domain/model/report/FurColorType.kt b/app/src/main/java/com/kuit/findu/domain/model/report/FurColorType.kt similarity index 91% rename from app/src/main/java/com/example/findu/domain/model/report/FurColorType.kt rename to app/src/main/java/com/kuit/findu/domain/model/report/FurColorType.kt index 06982c7c..9f3f6115 100644 --- a/app/src/main/java/com/example/findu/domain/model/report/FurColorType.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/report/FurColorType.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.report +package com.kuit.findu.domain.model.report enum class FurColorType( val color: String, diff --git a/app/src/main/java/com/example/findu/domain/model/report/Gender.kt b/app/src/main/java/com/kuit/findu/domain/model/report/Gender.kt similarity index 67% rename from app/src/main/java/com/example/findu/domain/model/report/Gender.kt rename to app/src/main/java/com/kuit/findu/domain/model/report/Gender.kt index ad03fa93..013dc542 100644 --- a/app/src/main/java/com/example/findu/domain/model/report/Gender.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/report/Gender.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.report +package com.kuit.findu.domain.model.report enum class Gender( val displayName: String diff --git a/app/src/main/java/com/example/findu/domain/model/report/GptData.kt b/app/src/main/java/com/kuit/findu/domain/model/report/GptData.kt similarity index 57% rename from app/src/main/java/com/example/findu/domain/model/report/GptData.kt rename to app/src/main/java/com/kuit/findu/domain/model/report/GptData.kt index c42e4a11..0ea0f6bd 100644 --- a/app/src/main/java/com/example/findu/domain/model/report/GptData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/report/GptData.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.model.report +package com.kuit.findu.domain.model.report -import com.example.findu.domain.model.breed.SpeciesType +import com.kuit.findu.domain.model.breed.SpeciesType data class GptData( val breed: String = "", diff --git a/app/src/main/java/com/example/findu/domain/model/report/LatLngData.kt b/app/src/main/java/com/kuit/findu/domain/model/report/LatLngData.kt similarity index 59% rename from app/src/main/java/com/example/findu/domain/model/report/LatLngData.kt rename to app/src/main/java/com/kuit/findu/domain/model/report/LatLngData.kt index eacdd00b..9de0e3a0 100644 --- a/app/src/main/java/com/example/findu/domain/model/report/LatLngData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/report/LatLngData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.report +package com.kuit.findu.domain.model.report data class LatLngData( val lat: Double, diff --git a/app/src/main/java/com/example/findu/domain/model/report/MissingReportData.kt b/app/src/main/java/com/kuit/findu/domain/model/report/MissingReportData.kt similarity index 76% rename from app/src/main/java/com/example/findu/domain/model/report/MissingReportData.kt rename to app/src/main/java/com/kuit/findu/domain/model/report/MissingReportData.kt index feed39a7..83c6c1f2 100644 --- a/app/src/main/java/com/example/findu/domain/model/report/MissingReportData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/report/MissingReportData.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.model.report +package com.kuit.findu.domain.model.report -import com.example.findu.domain.model.breed.SpeciesType +import com.kuit.findu.domain.model.breed.SpeciesType data class MissingReportData( val imageUrls: List, diff --git a/app/src/main/java/com/example/findu/domain/model/report/WitnessReportData.kt b/app/src/main/java/com/kuit/findu/domain/model/report/WitnessReportData.kt similarity index 72% rename from app/src/main/java/com/example/findu/domain/model/report/WitnessReportData.kt rename to app/src/main/java/com/kuit/findu/domain/model/report/WitnessReportData.kt index 394a143a..c89568b2 100644 --- a/app/src/main/java/com/example/findu/domain/model/report/WitnessReportData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/report/WitnessReportData.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.model.report +package com.kuit.findu.domain.model.report -import com.example.findu.domain.model.breed.SpeciesType +import com.kuit.findu.domain.model.breed.SpeciesType data class WitnessReportData( val imageUrls: List, diff --git a/app/src/main/java/com/example/findu/domain/model/search/DetailMissingData.kt b/app/src/main/java/com/kuit/findu/domain/model/search/DetailMissingData.kt similarity index 91% rename from app/src/main/java/com/example/findu/domain/model/search/DetailMissingData.kt rename to app/src/main/java/com/kuit/findu/domain/model/search/DetailMissingData.kt index d8525108..d80dd763 100644 --- a/app/src/main/java/com/example/findu/domain/model/search/DetailMissingData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/search/DetailMissingData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.search +package com.kuit.findu.domain.model.search import java.io.Serializable diff --git a/app/src/main/java/com/example/findu/domain/model/search/DetailProtectData.kt b/app/src/main/java/com/kuit/findu/domain/model/search/DetailProtectData.kt similarity index 92% rename from app/src/main/java/com/example/findu/domain/model/search/DetailProtectData.kt rename to app/src/main/java/com/kuit/findu/domain/model/search/DetailProtectData.kt index 4653e269..38dd3e3b 100644 --- a/app/src/main/java/com/example/findu/domain/model/search/DetailProtectData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/search/DetailProtectData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.search +package com.kuit.findu.domain.model.search import java.io.Serializable diff --git a/app/src/main/java/com/example/findu/domain/model/search/DetailWitnessData.kt b/app/src/main/java/com/kuit/findu/domain/model/search/DetailWitnessData.kt similarity index 89% rename from app/src/main/java/com/example/findu/domain/model/search/DetailWitnessData.kt rename to app/src/main/java/com/kuit/findu/domain/model/search/DetailWitnessData.kt index 8fcb2ea1..3e31427d 100644 --- a/app/src/main/java/com/example/findu/domain/model/search/DetailWitnessData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/search/DetailWitnessData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.search +package com.kuit.findu.domain.model.search import java.io.Serializable diff --git a/app/src/main/java/com/example/findu/domain/model/search/SearchData.kt b/app/src/main/java/com/kuit/findu/domain/model/search/SearchData.kt similarity index 93% rename from app/src/main/java/com/example/findu/domain/model/search/SearchData.kt rename to app/src/main/java/com/kuit/findu/domain/model/search/SearchData.kt index cbbdea6e..bec3a7d4 100644 --- a/app/src/main/java/com/example/findu/domain/model/search/SearchData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/search/SearchData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.search +package com.kuit.findu.domain.model.search import java.io.Serializable diff --git a/app/src/main/java/com/example/findu/domain/model/search/SearchFilterData.kt b/app/src/main/java/com/kuit/findu/domain/model/search/SearchFilterData.kt similarity index 81% rename from app/src/main/java/com/example/findu/domain/model/search/SearchFilterData.kt rename to app/src/main/java/com/kuit/findu/domain/model/search/SearchFilterData.kt index 9d545c9b..2e22c9ea 100644 --- a/app/src/main/java/com/example/findu/domain/model/search/SearchFilterData.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/search/SearchFilterData.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.model.search +package com.kuit.findu.domain.model.search data class SearchFilterData( var breeds: List? = null, diff --git a/app/src/main/java/com/example/findu/domain/model/search/SearchStatus.kt b/app/src/main/java/com/kuit/findu/domain/model/search/SearchStatus.kt similarity index 85% rename from app/src/main/java/com/example/findu/domain/model/search/SearchStatus.kt rename to app/src/main/java/com/kuit/findu/domain/model/search/SearchStatus.kt index dfff8922..fd80c008 100644 --- a/app/src/main/java/com/example/findu/domain/model/search/SearchStatus.kt +++ b/app/src/main/java/com/kuit/findu/domain/model/search/SearchStatus.kt @@ -1,7 +1,7 @@ -package com.example.findu.domain.model.search +package com.kuit.findu.domain.model.search import androidx.annotation.ColorRes -import com.example.findu.R +import com.kuit.findu.R import java.io.Serializable enum class SearchStatus( diff --git a/app/src/main/java/com/example/findu/domain/repository/AuthRepository.kt b/app/src/main/java/com/kuit/findu/domain/repository/AuthRepository.kt similarity index 67% rename from app/src/main/java/com/example/findu/domain/repository/AuthRepository.kt rename to app/src/main/java/com/kuit/findu/domain/repository/AuthRepository.kt index 9cb95bb0..b8f9eda3 100644 --- a/app/src/main/java/com/example/findu/domain/repository/AuthRepository.kt +++ b/app/src/main/java/com/kuit/findu/domain/repository/AuthRepository.kt @@ -1,9 +1,9 @@ -package com.example.findu.domain.repository +package com.kuit.findu.domain.repository -import com.example.findu.domain.model.GuestLoginData -import com.example.findu.domain.model.LoginData -import com.example.findu.domain.model.LoginInfo -import com.example.findu.domain.model.UserInfo +import com.kuit.findu.domain.model.GuestLoginData +import com.kuit.findu.domain.model.LoginData +import com.kuit.findu.domain.model.LoginInfo +import com.kuit.findu.domain.model.UserInfo import java.io.File interface AuthRepository { diff --git a/app/src/main/java/com/example/findu/domain/repository/BreedRepository.kt b/app/src/main/java/com/kuit/findu/domain/repository/BreedRepository.kt similarity index 52% rename from app/src/main/java/com/example/findu/domain/repository/BreedRepository.kt rename to app/src/main/java/com/kuit/findu/domain/repository/BreedRepository.kt index 6763c632..b20dfa87 100644 --- a/app/src/main/java/com/example/findu/domain/repository/BreedRepository.kt +++ b/app/src/main/java/com/kuit/findu/domain/repository/BreedRepository.kt @@ -1,8 +1,8 @@ -package com.example.findu.domain.repository +package com.kuit.findu.domain.repository -import com.example.findu.domain.model.breed.AiDetectionData -import com.example.findu.domain.model.breed.BreedData -import com.example.findu.domain.model.breed.BreedValidationData +import com.kuit.findu.domain.model.breed.AiDetectionData +import com.kuit.findu.domain.model.breed.BreedData +import com.kuit.findu.domain.model.breed.BreedValidationData interface BreedRepository { suspend fun getBreedData() : Result diff --git a/app/src/main/java/com/example/findu/domain/repository/DetailSearchRepository.kt b/app/src/main/java/com/kuit/findu/domain/repository/DetailSearchRepository.kt similarity index 55% rename from app/src/main/java/com/example/findu/domain/repository/DetailSearchRepository.kt rename to app/src/main/java/com/kuit/findu/domain/repository/DetailSearchRepository.kt index eb2ca8f2..055cd76c 100644 --- a/app/src/main/java/com/example/findu/domain/repository/DetailSearchRepository.kt +++ b/app/src/main/java/com/kuit/findu/domain/repository/DetailSearchRepository.kt @@ -1,8 +1,8 @@ -package com.example.findu.domain.repository +package com.kuit.findu.domain.repository -import com.example.findu.domain.model.search.DetailMissingData -import com.example.findu.domain.model.search.DetailProtectData -import com.example.findu.domain.model.search.DetailWitnessData +import com.kuit.findu.domain.model.search.DetailMissingData +import com.kuit.findu.domain.model.search.DetailProtectData +import com.kuit.findu.domain.model.search.DetailWitnessData interface DetailSearchRepository { diff --git a/app/src/main/java/com/kuit/findu/domain/repository/DummyRepository.kt b/app/src/main/java/com/kuit/findu/domain/repository/DummyRepository.kt new file mode 100644 index 00000000..f9548803 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/domain/repository/DummyRepository.kt @@ -0,0 +1,7 @@ +package com.kuit.findu.domain.repository + +import com.kuit.findu.domain.model.DummyData + +interface DummyRepository{ + suspend fun dummy():Result +} \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/domain/repository/HomeRepository.kt b/app/src/main/java/com/kuit/findu/domain/repository/HomeRepository.kt similarity index 57% rename from app/src/main/java/com/example/findu/domain/repository/HomeRepository.kt rename to app/src/main/java/com/kuit/findu/domain/repository/HomeRepository.kt index 4f7ced6b..8778e68d 100644 --- a/app/src/main/java/com/example/findu/domain/repository/HomeRepository.kt +++ b/app/src/main/java/com/kuit/findu/domain/repository/HomeRepository.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.repository +package com.kuit.findu.domain.repository -import com.example.findu.domain.model.HomeData +import com.kuit.findu.domain.model.HomeData interface HomeRepository { suspend fun getHome( diff --git a/app/src/main/java/com/example/findu/domain/repository/InformationRepository.kt b/app/src/main/java/com/kuit/findu/domain/repository/InformationRepository.kt similarity index 66% rename from app/src/main/java/com/example/findu/domain/repository/InformationRepository.kt rename to app/src/main/java/com/kuit/findu/domain/repository/InformationRepository.kt index 6cbb20f1..1492c734 100644 --- a/app/src/main/java/com/example/findu/domain/repository/InformationRepository.kt +++ b/app/src/main/java/com/kuit/findu/domain/repository/InformationRepository.kt @@ -1,10 +1,10 @@ -package com.example.findu.domain.repository +package com.kuit.findu.domain.repository -import com.example.findu.domain.model.extra.Center -import com.example.findu.domain.model.extra.Department -import com.example.findu.domain.model.extra.PagedResult -import com.example.findu.domain.model.extra.Sido -import com.example.findu.domain.model.extra.VolunteerWork +import com.kuit.findu.domain.model.extra.Center +import com.kuit.findu.domain.model.extra.Department +import com.kuit.findu.domain.model.extra.PagedResult +import com.kuit.findu.domain.model.extra.Sido +import com.kuit.findu.domain.model.extra.VolunteerWork interface InformationRepository { diff --git a/app/src/main/java/com/example/findu/domain/repository/InquiryRepository.kt b/app/src/main/java/com/kuit/findu/domain/repository/InquiryRepository.kt similarity index 78% rename from app/src/main/java/com/example/findu/domain/repository/InquiryRepository.kt rename to app/src/main/java/com/kuit/findu/domain/repository/InquiryRepository.kt index b596fd90..226a85e3 100644 --- a/app/src/main/java/com/example/findu/domain/repository/InquiryRepository.kt +++ b/app/src/main/java/com/kuit/findu/domain/repository/InquiryRepository.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.repository +package com.kuit.findu.domain.repository interface InquiryRepository { diff --git a/app/src/main/java/com/example/findu/domain/repository/InterestRepository.kt b/app/src/main/java/com/kuit/findu/domain/repository/InterestRepository.kt similarity index 70% rename from app/src/main/java/com/example/findu/domain/repository/InterestRepository.kt rename to app/src/main/java/com/kuit/findu/domain/repository/InterestRepository.kt index a66a6ab0..57c3967f 100644 --- a/app/src/main/java/com/example/findu/domain/repository/InterestRepository.kt +++ b/app/src/main/java/com/kuit/findu/domain/repository/InterestRepository.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.repository +package com.kuit.findu.domain.repository -import com.example.findu.domain.model.my.MyInterestData +import com.kuit.findu.domain.model.my.MyInterestData interface InterestRepository { suspend fun getInterestAnimals(lastId: Long): Result diff --git a/app/src/main/java/com/example/findu/domain/repository/MyRepository.kt b/app/src/main/java/com/kuit/findu/domain/repository/MyRepository.kt similarity index 61% rename from app/src/main/java/com/example/findu/domain/repository/MyRepository.kt rename to app/src/main/java/com/kuit/findu/domain/repository/MyRepository.kt index 405a8a81..382b5fc2 100644 --- a/app/src/main/java/com/example/findu/domain/repository/MyRepository.kt +++ b/app/src/main/java/com/kuit/findu/domain/repository/MyRepository.kt @@ -1,10 +1,10 @@ -package com.example.findu.domain.repository +package com.kuit.findu.domain.repository -import com.example.findu.domain.model.my.MyInterestData -import com.example.findu.domain.model.my.MyProfileData -import com.example.findu.domain.model.my.MyProfileImageUpdate -import com.example.findu.domain.model.my.MyReportHistoryData -import com.example.findu.domain.model.my.MyViewedAnimalData +import com.kuit.findu.domain.model.my.MyInterestData +import com.kuit.findu.domain.model.my.MyProfileData +import com.kuit.findu.domain.model.my.MyProfileImageUpdate +import com.kuit.findu.domain.model.my.MyReportHistoryData +import com.kuit.findu.domain.model.my.MyViewedAnimalData interface MyRepository { suspend fun getMyInterest( diff --git a/app/src/main/java/com/example/findu/domain/repository/SearchRepository.kt b/app/src/main/java/com/kuit/findu/domain/repository/SearchRepository.kt similarity index 54% rename from app/src/main/java/com/example/findu/domain/repository/SearchRepository.kt rename to app/src/main/java/com/kuit/findu/domain/repository/SearchRepository.kt index 54fddeb9..aea8deca 100644 --- a/app/src/main/java/com/example/findu/domain/repository/SearchRepository.kt +++ b/app/src/main/java/com/kuit/findu/domain/repository/SearchRepository.kt @@ -1,7 +1,7 @@ -package com.example.findu.domain.repository +package com.kuit.findu.domain.repository -import com.example.findu.domain.model.search.SearchData -import com.example.findu.domain.model.search.SearchFilterData +import com.kuit.findu.domain.model.search.SearchData +import com.kuit.findu.domain.model.search.SearchFilterData interface SearchRepository { suspend fun getReports( diff --git a/app/src/main/java/com/example/findu/domain/repository/TokenRepository.kt b/app/src/main/java/com/kuit/findu/domain/repository/TokenRepository.kt similarity index 82% rename from app/src/main/java/com/example/findu/domain/repository/TokenRepository.kt rename to app/src/main/java/com/kuit/findu/domain/repository/TokenRepository.kt index 7f3d7ed9..3a0e06a6 100644 --- a/app/src/main/java/com/example/findu/domain/repository/TokenRepository.kt +++ b/app/src/main/java/com/kuit/findu/domain/repository/TokenRepository.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.repository +package com.kuit.findu.domain.repository interface TokenRepository { fun getAccessToken(): String diff --git a/app/src/main/java/com/example/findu/domain/repository/UserInfoRepository.kt b/app/src/main/java/com/kuit/findu/domain/repository/UserInfoRepository.kt similarity index 80% rename from app/src/main/java/com/example/findu/domain/repository/UserInfoRepository.kt rename to app/src/main/java/com/kuit/findu/domain/repository/UserInfoRepository.kt index 469698de..d4f5c8e2 100644 --- a/app/src/main/java/com/example/findu/domain/repository/UserInfoRepository.kt +++ b/app/src/main/java/com/kuit/findu/domain/repository/UserInfoRepository.kt @@ -1,4 +1,4 @@ -package com.example.findu.domain.repository +package com.kuit.findu.domain.repository interface UserInfoRepository { fun getDeviceId(): String diff --git a/app/src/main/java/com/example/findu/domain/repository/report/ReportRepository.kt b/app/src/main/java/com/kuit/findu/domain/repository/report/ReportRepository.kt similarity index 65% rename from app/src/main/java/com/example/findu/domain/repository/report/ReportRepository.kt rename to app/src/main/java/com/kuit/findu/domain/repository/report/ReportRepository.kt index f7328613..445b45a2 100644 --- a/app/src/main/java/com/example/findu/domain/repository/report/ReportRepository.kt +++ b/app/src/main/java/com/kuit/findu/domain/repository/report/ReportRepository.kt @@ -1,11 +1,10 @@ -package com.example.findu.domain.repository.report +package com.kuit.findu.domain.repository.report -import android.net.Uri -import com.example.findu.domain.model.report.AddressData -import com.example.findu.domain.model.report.GptData -import com.example.findu.domain.model.report.LatLngData -import com.example.findu.domain.model.report.MissingReportData -import com.example.findu.domain.model.report.WitnessReportData +import com.kuit.findu.domain.model.report.AddressData +import com.kuit.findu.domain.model.report.GptData +import com.kuit.findu.domain.model.report.LatLngData +import com.kuit.findu.domain.model.report.MissingReportData +import com.kuit.findu.domain.model.report.WitnessReportData import okhttp3.MultipartBody interface ReportRepository { diff --git a/app/src/main/java/com/example/findu/domain/usecase/DummyUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/DummyUseCase.kt similarity index 69% rename from app/src/main/java/com/example/findu/domain/usecase/DummyUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/DummyUseCase.kt index f4b07be0..ff834b3f 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/DummyUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/DummyUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase +package com.kuit.findu.domain.usecase -import com.example.findu.domain.repository.DummyRepository +import com.kuit.findu.domain.repository.DummyRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/example/findu/domain/usecase/GetBreedDataUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/GetBreedDataUseCase.kt similarity index 66% rename from app/src/main/java/com/example/findu/domain/usecase/GetBreedDataUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/GetBreedDataUseCase.kt index f8d4e37f..bf7a75b9 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/GetBreedDataUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/GetBreedDataUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase +package com.kuit.findu.domain.usecase -import com.example.findu.domain.repository.BreedRepository +import com.kuit.findu.domain.repository.BreedRepository import javax.inject.Inject class GetBreedDataUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/GetBreedValidationUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/GetBreedValidationUseCase.kt similarity index 70% rename from app/src/main/java/com/example/findu/domain/usecase/GetBreedValidationUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/GetBreedValidationUseCase.kt index 5e1f556a..3e1cd6c7 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/GetBreedValidationUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/GetBreedValidationUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase +package com.kuit.findu.domain.usecase -import com.example.findu.domain.repository.BreedRepository +import com.kuit.findu.domain.repository.BreedRepository import javax.inject.Inject class GetBreedValidationUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/GetDetailSearchUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/GetDetailSearchUseCase.kt similarity index 64% rename from app/src/main/java/com/example/findu/domain/usecase/GetDetailSearchUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/GetDetailSearchUseCase.kt index d3a3c0ce..f6c4fbb5 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/GetDetailSearchUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/GetDetailSearchUseCase.kt @@ -1,9 +1,9 @@ -package com.example.findu.domain.usecase +package com.kuit.findu.domain.usecase -import com.example.findu.domain.model.search.DetailMissingData -import com.example.findu.domain.model.search.DetailProtectData -import com.example.findu.domain.model.search.DetailWitnessData -import com.example.findu.domain.repository.DetailSearchRepository +import com.kuit.findu.domain.model.search.DetailMissingData +import com.kuit.findu.domain.model.search.DetailProtectData +import com.kuit.findu.domain.model.search.DetailWitnessData +import com.kuit.findu.domain.repository.DetailSearchRepository class GetDetailSearchUseCase( private val detailSearchRepository: DetailSearchRepository diff --git a/app/src/main/java/com/example/findu/domain/usecase/GetNicknameUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/GetNicknameUseCase.kt similarity index 65% rename from app/src/main/java/com/example/findu/domain/usecase/GetNicknameUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/GetNicknameUseCase.kt index e2c760a4..d3416656 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/GetNicknameUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/GetNicknameUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase +package com.kuit.findu.domain.usecase -import com.example.findu.domain.repository.UserInfoRepository +import com.kuit.findu.domain.repository.UserInfoRepository import javax.inject.Inject class GetNicknameUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/GetSearchUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/GetSearchUseCase.kt similarity index 64% rename from app/src/main/java/com/example/findu/domain/usecase/GetSearchUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/GetSearchUseCase.kt index 9605cc3c..d6277dcf 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/GetSearchUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/GetSearchUseCase.kt @@ -1,8 +1,8 @@ -package com.example.findu.domain.usecase +package com.kuit.findu.domain.usecase -import com.example.findu.domain.model.search.SearchData -import com.example.findu.domain.model.search.SearchFilterData -import com.example.findu.domain.repository.SearchRepository +import com.kuit.findu.domain.model.search.SearchData +import com.kuit.findu.domain.model.search.SearchFilterData +import com.kuit.findu.domain.repository.SearchRepository class GetSearchUseCase( private val searchRepository: SearchRepository diff --git a/app/src/main/java/com/example/findu/domain/usecase/PostAiDetectionUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/PostAiDetectionUseCase.kt similarity index 57% rename from app/src/main/java/com/example/findu/domain/usecase/PostAiDetectionUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/PostAiDetectionUseCase.kt index e71f1d56..680d1762 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/PostAiDetectionUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/PostAiDetectionUseCase.kt @@ -1,7 +1,7 @@ -package com.example.findu.domain.usecase +package com.kuit.findu.domain.usecase -import com.example.findu.domain.model.breed.AiDetectionData -import com.example.findu.domain.repository.BreedRepository +import com.kuit.findu.domain.model.breed.AiDetectionData +import com.kuit.findu.domain.repository.BreedRepository class PostAiDetectionUseCase( private val breedRepository: BreedRepository diff --git a/app/src/main/java/com/example/findu/domain/usecase/PostInquiryUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/PostInquiryUseCase.kt similarity index 76% rename from app/src/main/java/com/example/findu/domain/usecase/PostInquiryUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/PostInquiryUseCase.kt index ff019247..67f89e18 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/PostInquiryUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/PostInquiryUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase +package com.kuit.findu.domain.usecase -import com.example.findu.domain.repository.InquiryRepository +import com.kuit.findu.domain.repository.InquiryRepository import javax.inject.Inject class PostInquiryUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/SetDeviceIdUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/SetDeviceIdUseCase.kt similarity index 72% rename from app/src/main/java/com/example/findu/domain/usecase/SetDeviceIdUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/SetDeviceIdUseCase.kt index 3e9b0ff6..1fe492c8 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/SetDeviceIdUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/SetDeviceIdUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase +package com.kuit.findu.domain.usecase -import com.example.findu.domain.repository.UserInfoRepository +import com.kuit.findu.domain.repository.UserInfoRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/example/findu/domain/usecase/SetNicknameUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/SetNicknameUseCase.kt similarity index 70% rename from app/src/main/java/com/example/findu/domain/usecase/SetNicknameUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/SetNicknameUseCase.kt index c11615b9..d982c453 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/SetNicknameUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/SetNicknameUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase +package com.kuit.findu.domain.usecase -import com.example.findu.domain.repository.UserInfoRepository +import com.kuit.findu.domain.repository.UserInfoRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/example/findu/domain/usecase/auth/PostCheckNicknameUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/auth/PostCheckNicknameUseCase.kt similarity index 67% rename from app/src/main/java/com/example/findu/domain/usecase/auth/PostCheckNicknameUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/auth/PostCheckNicknameUseCase.kt index 6efabf1e..e55844f3 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/auth/PostCheckNicknameUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/auth/PostCheckNicknameUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.auth +package com.kuit.findu.domain.usecase.auth -import com.example.findu.domain.repository.AuthRepository +import com.kuit.findu.domain.repository.AuthRepository class PostCheckNicknameUseCase( private val authRepository: AuthRepository diff --git a/app/src/main/java/com/example/findu/domain/usecase/auth/PostGuestLoginUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/auth/PostGuestLoginUseCase.kt similarity index 56% rename from app/src/main/java/com/example/findu/domain/usecase/auth/PostGuestLoginUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/auth/PostGuestLoginUseCase.kt index 70d2803b..461c9f5a 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/auth/PostGuestLoginUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/auth/PostGuestLoginUseCase.kt @@ -1,8 +1,8 @@ -package com.example.findu.domain.usecase.auth +package com.kuit.findu.domain.usecase.auth -import com.example.findu.domain.model.GuestLoginData -import com.example.findu.domain.repository.AuthRepository -import com.example.findu.domain.repository.UserInfoRepository +import com.kuit.findu.domain.model.GuestLoginData +import com.kuit.findu.domain.repository.AuthRepository +import com.kuit.findu.domain.repository.UserInfoRepository class PostGuestLoginUseCase( private val authRepository: AuthRepository, diff --git a/app/src/main/java/com/example/findu/domain/usecase/auth/PostLoginUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/auth/PostLoginUseCase.kt similarity index 58% rename from app/src/main/java/com/example/findu/domain/usecase/auth/PostLoginUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/auth/PostLoginUseCase.kt index 4360e8c9..4fbb29cd 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/auth/PostLoginUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/auth/PostLoginUseCase.kt @@ -1,9 +1,9 @@ -package com.example.findu.domain.usecase.auth +package com.kuit.findu.domain.usecase.auth -import com.example.findu.domain.model.LoginData -import com.example.findu.domain.model.LoginInfo -import com.example.findu.domain.repository.AuthRepository -import com.example.findu.domain.repository.UserInfoRepository +import com.kuit.findu.domain.model.LoginData +import com.kuit.findu.domain.model.LoginInfo +import com.kuit.findu.domain.repository.AuthRepository +import com.kuit.findu.domain.repository.UserInfoRepository class PostLoginUseCase( private val authRepository: AuthRepository, diff --git a/app/src/main/java/com/example/findu/domain/usecase/auth/PostSignupUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/auth/PostSignupUseCase.kt similarity index 74% rename from app/src/main/java/com/example/findu/domain/usecase/auth/PostSignupUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/auth/PostSignupUseCase.kt index 5703996e..e065a309 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/auth/PostSignupUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/auth/PostSignupUseCase.kt @@ -1,8 +1,8 @@ -package com.example.findu.domain.usecase.auth +package com.kuit.findu.domain.usecase.auth -import com.example.findu.domain.model.UserInfo -import com.example.findu.domain.repository.AuthRepository -import com.example.findu.domain.repository.UserInfoRepository +import com.kuit.findu.domain.model.UserInfo +import com.kuit.findu.domain.repository.AuthRepository +import com.kuit.findu.domain.repository.UserInfoRepository import java.io.File class PostSignupUseCase( diff --git a/app/src/main/java/com/example/findu/domain/usecase/extra/GetCentersUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/extra/GetCentersUseCase.kt similarity index 66% rename from app/src/main/java/com/example/findu/domain/usecase/extra/GetCentersUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/extra/GetCentersUseCase.kt index 17778d55..e8aeb978 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/extra/GetCentersUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/extra/GetCentersUseCase.kt @@ -1,8 +1,8 @@ -package com.example.findu.domain.usecase.extra +package com.kuit.findu.domain.usecase.extra -import com.example.findu.domain.model.extra.Center -import com.example.findu.domain.model.extra.PagedResult -import com.example.findu.domain.repository.InformationRepository +import com.kuit.findu.domain.model.extra.Center +import com.kuit.findu.domain.model.extra.PagedResult +import com.kuit.findu.domain.repository.InformationRepository class GetCentersUseCase( private val repository: InformationRepository diff --git a/app/src/main/java/com/example/findu/domain/usecase/extra/GetDepartmentsUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/extra/GetDepartmentsUseCase.kt similarity index 71% rename from app/src/main/java/com/example/findu/domain/usecase/extra/GetDepartmentsUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/extra/GetDepartmentsUseCase.kt index f5214a24..cb355a0b 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/extra/GetDepartmentsUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/extra/GetDepartmentsUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.extra +package com.kuit.findu.domain.usecase.extra -import com.example.findu.domain.repository.InformationRepository +import com.kuit.findu.domain.repository.InformationRepository class GetDepartmentsUseCase( private val repository: InformationRepository diff --git a/app/src/main/java/com/example/findu/domain/usecase/extra/GetSidoUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/extra/GetSidoUseCase.kt similarity index 60% rename from app/src/main/java/com/example/findu/domain/usecase/extra/GetSidoUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/extra/GetSidoUseCase.kt index ade52098..d08b04a3 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/extra/GetSidoUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/extra/GetSidoUseCase.kt @@ -1,7 +1,7 @@ -package com.example.findu.domain.usecase.extra +package com.kuit.findu.domain.usecase.extra -import com.example.findu.domain.model.extra.Sido -import com.example.findu.domain.repository.InformationRepository +import com.kuit.findu.domain.model.extra.Sido +import com.kuit.findu.domain.repository.InformationRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/example/findu/domain/usecase/extra/GetSigunguUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/extra/GetSigunguUseCase.kt similarity index 63% rename from app/src/main/java/com/example/findu/domain/usecase/extra/GetSigunguUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/extra/GetSigunguUseCase.kt index 125846b3..8775562f 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/extra/GetSigunguUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/extra/GetSigunguUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.extra +package com.kuit.findu.domain.usecase.extra -import com.example.findu.domain.repository.InformationRepository +import com.kuit.findu.domain.repository.InformationRepository class GetSigunguUseCase ( private val repository: InformationRepository diff --git a/app/src/main/java/com/example/findu/domain/usecase/extra/GetVolunteersUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/extra/GetVolunteersUseCase.kt similarity index 63% rename from app/src/main/java/com/example/findu/domain/usecase/extra/GetVolunteersUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/extra/GetVolunteersUseCase.kt index 56f3147d..8b8bbe87 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/extra/GetVolunteersUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/extra/GetVolunteersUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.extra +package com.kuit.findu.domain.usecase.extra -import com.example.findu.domain.repository.InformationRepository +import com.kuit.findu.domain.repository.InformationRepository class GetVolunteersUseCase( private val repository: InformationRepository diff --git a/app/src/main/java/com/example/findu/domain/usecase/home/GetHomeUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/home/GetHomeUseCase.kt similarity index 62% rename from app/src/main/java/com/example/findu/domain/usecase/home/GetHomeUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/home/GetHomeUseCase.kt index 4e8ecaeb..b1f24827 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/home/GetHomeUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/home/GetHomeUseCase.kt @@ -1,7 +1,7 @@ -package com.example.findu.domain.usecase.home +package com.kuit.findu.domain.usecase.home -import com.example.findu.domain.model.HomeData -import com.example.findu.domain.repository.HomeRepository +import com.kuit.findu.domain.model.HomeData +import com.kuit.findu.domain.repository.HomeRepository class GetHomeUseCase( private val homeRepository: HomeRepository diff --git a/app/src/main/java/com/example/findu/domain/usecase/interest/DeleteInterestAnimalUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/interest/DeleteInterestAnimalUseCase.kt similarity index 71% rename from app/src/main/java/com/example/findu/domain/usecase/interest/DeleteInterestAnimalUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/interest/DeleteInterestAnimalUseCase.kt index 60f72c34..97e6171b 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/interest/DeleteInterestAnimalUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/interest/DeleteInterestAnimalUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.interest +package com.kuit.findu.domain.usecase.interest -import com.example.findu.domain.repository.InterestRepository +import com.kuit.findu.domain.repository.InterestRepository import javax.inject.Inject class DeleteInterestAnimalUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/interest/PostInterestAnimalUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/interest/PostInterestAnimalUseCase.kt similarity index 71% rename from app/src/main/java/com/example/findu/domain/usecase/interest/PostInterestAnimalUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/interest/PostInterestAnimalUseCase.kt index bd5a412a..2d486f2e 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/interest/PostInterestAnimalUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/interest/PostInterestAnimalUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.interest +package com.kuit.findu.domain.usecase.interest -import com.example.findu.domain.repository.InterestRepository +import com.kuit.findu.domain.repository.InterestRepository import javax.inject.Inject class PostInterestAnimalUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/my/DeleteUserUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/my/DeleteUserUseCase.kt similarity index 64% rename from app/src/main/java/com/example/findu/domain/usecase/my/DeleteUserUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/my/DeleteUserUseCase.kt index 32732b02..e4cf587f 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/my/DeleteUserUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/my/DeleteUserUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.my +package com.kuit.findu.domain.usecase.my -import com.example.findu.domain.repository.MyRepository +import com.kuit.findu.domain.repository.MyRepository import javax.inject.Inject class DeleteUserUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/my/GetInterestUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/my/GetInterestUseCase.kt similarity index 68% rename from app/src/main/java/com/example/findu/domain/usecase/my/GetInterestUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/my/GetInterestUseCase.kt index 0143869d..8c02d97a 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/my/GetInterestUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/my/GetInterestUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.my +package com.kuit.findu.domain.usecase.my -import com.example.findu.domain.repository.MyRepository +import com.kuit.findu.domain.repository.MyRepository import javax.inject.Inject class GetInterestUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/my/GetNickNameUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/my/GetNickNameUseCase.kt similarity index 65% rename from app/src/main/java/com/example/findu/domain/usecase/my/GetNickNameUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/my/GetNickNameUseCase.kt index 0871ed90..0c0a2451 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/my/GetNickNameUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/my/GetNickNameUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.my +package com.kuit.findu.domain.usecase.my -import com.example.findu.domain.repository.MyRepository +import com.kuit.findu.domain.repository.MyRepository import javax.inject.Inject class GetNickNameUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/my/GetReportHistoryUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/my/GetReportHistoryUseCase.kt similarity index 68% rename from app/src/main/java/com/example/findu/domain/usecase/my/GetReportHistoryUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/my/GetReportHistoryUseCase.kt index da6cfd30..4fe628f2 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/my/GetReportHistoryUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/my/GetReportHistoryUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.my +package com.kuit.findu.domain.usecase.my -import com.example.findu.domain.repository.MyRepository +import com.kuit.findu.domain.repository.MyRepository import javax.inject.Inject class GetReportHistoryUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/my/GetViewedAnimalUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/my/GetViewedAnimalUseCase.kt similarity index 71% rename from app/src/main/java/com/example/findu/domain/usecase/my/GetViewedAnimalUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/my/GetViewedAnimalUseCase.kt index 8ea7caac..45e14432 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/my/GetViewedAnimalUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/my/GetViewedAnimalUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.my +package com.kuit.findu.domain.usecase.my -import com.example.findu.domain.repository.MyRepository +import com.kuit.findu.domain.repository.MyRepository import javax.inject.Inject class GetViewedAnimalUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/my/PatchNickNameUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/my/PatchNickNameUseCase.kt similarity index 68% rename from app/src/main/java/com/example/findu/domain/usecase/my/PatchNickNameUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/my/PatchNickNameUseCase.kt index 422257e8..2fc86ddf 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/my/PatchNickNameUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/my/PatchNickNameUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.my +package com.kuit.findu.domain.usecase.my -import com.example.findu.domain.repository.MyRepository +import com.kuit.findu.domain.repository.MyRepository import javax.inject.Inject class PatchNickNameUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/my/PatchProfileImageUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/my/PatchProfileImageUseCase.kt similarity index 60% rename from app/src/main/java/com/example/findu/domain/usecase/my/PatchProfileImageUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/my/PatchProfileImageUseCase.kt index 6617929b..21e09ff1 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/my/PatchProfileImageUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/my/PatchProfileImageUseCase.kt @@ -1,7 +1,7 @@ -package com.example.findu.domain.usecase.my +package com.kuit.findu.domain.usecase.my -import com.example.findu.domain.model.my.MyProfileImageUpdate -import com.example.findu.domain.repository.MyRepository +import com.kuit.findu.domain.model.my.MyProfileImageUpdate +import com.kuit.findu.domain.repository.MyRepository import javax.inject.Inject class PatchProfileImageUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/report/AnalysisImageWithGptUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/report/AnalysisImageWithGptUseCase.kt similarity index 71% rename from app/src/main/java/com/example/findu/domain/usecase/report/AnalysisImageWithGptUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/report/AnalysisImageWithGptUseCase.kt index 18242ca0..d2e8d4e3 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/report/AnalysisImageWithGptUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/report/AnalysisImageWithGptUseCase.kt @@ -1,7 +1,7 @@ -package com.example.findu.domain.usecase.report +package com.kuit.findu.domain.usecase.report -import com.example.findu.domain.model.report.GptData -import com.example.findu.domain.repository.report.ReportRepository +import com.kuit.findu.domain.model.report.GptData +import com.kuit.findu.domain.repository.report.ReportRepository class AnalysisImageWithGptUseCase( private val reportRepository: ReportRepository diff --git a/app/src/main/java/com/example/findu/domain/usecase/report/DeleteReportUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/report/DeleteReportUseCase.kt similarity index 67% rename from app/src/main/java/com/example/findu/domain/usecase/report/DeleteReportUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/report/DeleteReportUseCase.kt index f33d3b9b..7b6babf5 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/report/DeleteReportUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/report/DeleteReportUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.report +package com.kuit.findu.domain.usecase.report -import com.example.findu.domain.repository.report.ReportRepository +import com.kuit.findu.domain.repository.report.ReportRepository import javax.inject.Inject class DeleteReportUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/report/GetAddressUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/report/GetAddressUseCase.kt similarity index 60% rename from app/src/main/java/com/example/findu/domain/usecase/report/GetAddressUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/report/GetAddressUseCase.kt index 9db2ca40..92b9d893 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/report/GetAddressUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/report/GetAddressUseCase.kt @@ -1,7 +1,7 @@ -package com.example.findu.domain.usecase.report +package com.kuit.findu.domain.usecase.report -import com.example.findu.domain.model.report.AddressData -import com.example.findu.domain.repository.report.ReportRepository +import com.kuit.findu.domain.model.report.AddressData +import com.kuit.findu.domain.repository.report.ReportRepository import javax.inject.Inject class GetAddressUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/report/GetLatLngUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/report/GetLatLngUseCase.kt similarity index 58% rename from app/src/main/java/com/example/findu/domain/usecase/report/GetLatLngUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/report/GetLatLngUseCase.kt index ba4980b2..9a8f9aed 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/report/GetLatLngUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/report/GetLatLngUseCase.kt @@ -1,7 +1,7 @@ -package com.example.findu.domain.usecase.report +package com.kuit.findu.domain.usecase.report -import com.example.findu.domain.model.report.LatLngData -import com.example.findu.domain.repository.report.ReportRepository +import com.kuit.findu.domain.model.report.LatLngData +import com.kuit.findu.domain.repository.report.ReportRepository import javax.inject.Inject class GetLatLngUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/report/PostMissingReportUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/report/PostMissingReportUseCase.kt similarity index 61% rename from app/src/main/java/com/example/findu/domain/usecase/report/PostMissingReportUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/report/PostMissingReportUseCase.kt index ccc65a1f..440ceeb3 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/report/PostMissingReportUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/report/PostMissingReportUseCase.kt @@ -1,7 +1,7 @@ -package com.example.findu.domain.usecase.report +package com.kuit.findu.domain.usecase.report -import com.example.findu.domain.model.report.MissingReportData -import com.example.findu.domain.repository.report.ReportRepository +import com.kuit.findu.domain.model.report.MissingReportData +import com.kuit.findu.domain.repository.report.ReportRepository import javax.inject.Inject class PostMissingReportUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/report/PostWitnessReportUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/report/PostWitnessReportUseCase.kt similarity index 61% rename from app/src/main/java/com/example/findu/domain/usecase/report/PostWitnessReportUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/report/PostWitnessReportUseCase.kt index f1a8b060..763fca24 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/report/PostWitnessReportUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/report/PostWitnessReportUseCase.kt @@ -1,7 +1,7 @@ -package com.example.findu.domain.usecase.report +package com.kuit.findu.domain.usecase.report -import com.example.findu.domain.model.report.WitnessReportData -import com.example.findu.domain.repository.report.ReportRepository +import com.kuit.findu.domain.model.report.WitnessReportData +import com.kuit.findu.domain.repository.report.ReportRepository import javax.inject.Inject class PostWitnessReportUseCase @Inject constructor( diff --git a/app/src/main/java/com/example/findu/domain/usecase/report/UploadImagesUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/report/UploadImagesUseCase.kt similarity index 68% rename from app/src/main/java/com/example/findu/domain/usecase/report/UploadImagesUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/report/UploadImagesUseCase.kt index 980bc04f..fe7d95e6 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/report/UploadImagesUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/report/UploadImagesUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.report +package com.kuit.findu.domain.usecase.report -import com.example.findu.domain.repository.report.ReportRepository +import com.kuit.findu.domain.repository.report.ReportRepository import okhttp3.MultipartBody class UploadImagesUseCase( diff --git a/app/src/main/java/com/example/findu/domain/usecase/token/ClearTokenUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/token/ClearTokenUseCase.kt similarity index 68% rename from app/src/main/java/com/example/findu/domain/usecase/token/ClearTokenUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/token/ClearTokenUseCase.kt index e53ff9b9..29db54a0 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/token/ClearTokenUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/token/ClearTokenUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.token +package com.kuit.findu.domain.usecase.token -import com.example.findu.domain.repository.TokenRepository +import com.kuit.findu.domain.repository.TokenRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/example/findu/domain/usecase/token/GetAccessTokenUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/token/GetAccessTokenUseCase.kt similarity index 68% rename from app/src/main/java/com/example/findu/domain/usecase/token/GetAccessTokenUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/token/GetAccessTokenUseCase.kt index 6cbd3af0..22858b12 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/token/GetAccessTokenUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/token/GetAccessTokenUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.token +package com.kuit.findu.domain.usecase.token -import com.example.findu.domain.repository.TokenRepository +import com.kuit.findu.domain.repository.TokenRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/example/findu/domain/usecase/token/GetRefreshTokenUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/token/GetRefreshTokenUseCase.kt similarity index 69% rename from app/src/main/java/com/example/findu/domain/usecase/token/GetRefreshTokenUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/token/GetRefreshTokenUseCase.kt index f41d2c8f..ca35c150 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/token/GetRefreshTokenUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/token/GetRefreshTokenUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.token +package com.kuit.findu.domain.usecase.token -import com.example.findu.domain.repository.TokenRepository +import com.kuit.findu.domain.repository.TokenRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/example/findu/domain/usecase/token/SetAccessTokenUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/token/SetAccessTokenUseCase.kt similarity index 72% rename from app/src/main/java/com/example/findu/domain/usecase/token/SetAccessTokenUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/token/SetAccessTokenUseCase.kt index f752ae65..20a28666 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/token/SetAccessTokenUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/token/SetAccessTokenUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.token +package com.kuit.findu.domain.usecase.token -import com.example.findu.domain.repository.TokenRepository +import com.kuit.findu.domain.repository.TokenRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/example/findu/domain/usecase/token/SetRefreshTokenUseCase.kt b/app/src/main/java/com/kuit/findu/domain/usecase/token/SetRefreshTokenUseCase.kt similarity index 72% rename from app/src/main/java/com/example/findu/domain/usecase/token/SetRefreshTokenUseCase.kt rename to app/src/main/java/com/kuit/findu/domain/usecase/token/SetRefreshTokenUseCase.kt index 741a4b91..db32d23e 100644 --- a/app/src/main/java/com/example/findu/domain/usecase/token/SetRefreshTokenUseCase.kt +++ b/app/src/main/java/com/kuit/findu/domain/usecase/token/SetRefreshTokenUseCase.kt @@ -1,6 +1,6 @@ -package com.example.findu.domain.usecase.token +package com.kuit.findu.domain.usecase.token -import com.example.findu.domain.repository.TokenRepository +import com.kuit.findu.domain.repository.TokenRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/example/findu/presentation/mapper/todomain/MyInterestDataMapper.kt b/app/src/main/java/com/kuit/findu/presentation/mapper/todomain/MyInterestDataMapper.kt similarity index 69% rename from app/src/main/java/com/example/findu/presentation/mapper/todomain/MyInterestDataMapper.kt rename to app/src/main/java/com/kuit/findu/presentation/mapper/todomain/MyInterestDataMapper.kt index 446ac0ae..a88ba12d 100644 --- a/app/src/main/java/com/example/findu/presentation/mapper/todomain/MyInterestDataMapper.kt +++ b/app/src/main/java/com/kuit/findu/presentation/mapper/todomain/MyInterestDataMapper.kt @@ -1,11 +1,11 @@ -package com.example.findu.presentation.mapper.todomain +package com.kuit.findu.presentation.mapper.todomain -import com.example.findu.domain.model.my.MyInterestData -import com.example.findu.domain.model.my.MyReportHistoryData -import com.example.findu.domain.model.my.MyViewedAnimalData -import com.example.findu.presentation.model.MyInterestRv -import com.example.findu.presentation.model.MyReportHistoryRv -import com.example.findu.presentation.model.MyViewedAnimalsRv +import com.kuit.findu.domain.model.my.MyInterestData +import com.kuit.findu.domain.model.my.MyReportHistoryData +import com.kuit.findu.domain.model.my.MyViewedAnimalData +import com.kuit.findu.presentation.model.MyInterestRv +import com.kuit.findu.presentation.model.MyReportHistoryRv +import com.kuit.findu.presentation.model.MyViewedAnimalsRv fun MyInterestData.InterestAnimal.toRvModel(): MyInterestRv { return MyInterestRv( diff --git a/app/src/main/java/com/kuit/findu/presentation/mapper/todomain/SearchFilterToDomainMapper.kt b/app/src/main/java/com/kuit/findu/presentation/mapper/todomain/SearchFilterToDomainMapper.kt new file mode 100644 index 00000000..fdc31ff1 --- /dev/null +++ b/app/src/main/java/com/kuit/findu/presentation/mapper/todomain/SearchFilterToDomainMapper.kt @@ -0,0 +1,12 @@ +package com.kuit.findu.presentation.mapper.todomain + +import com.kuit.findu.domain.model.search.SearchFilterData +import com.kuit.findu.presentation.ui.search.model.SearchFilterUiModel + +fun SearchFilterUiModel.toDomain() = SearchFilterData( + breeds = breeds, + location = location, + species = species, + startDate = startDate, + endDate = endDate +) \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/presentation/model/HomeExtraContent.kt b/app/src/main/java/com/kuit/findu/presentation/model/HomeExtraContent.kt similarity index 58% rename from app/src/main/java/com/example/findu/presentation/model/HomeExtraContent.kt rename to app/src/main/java/com/kuit/findu/presentation/model/HomeExtraContent.kt index ce92d365..9095ea92 100644 --- a/app/src/main/java/com/example/findu/presentation/model/HomeExtraContent.kt +++ b/app/src/main/java/com/kuit/findu/presentation/model/HomeExtraContent.kt @@ -1,8 +1,8 @@ -package com.example.findu.presentation.model +package com.kuit.findu.presentation.model -import com.example.findu.domain.model.extra.Center -import com.example.findu.domain.model.extra.Department -import com.example.findu.domain.model.extra.VolunteerWork +import com.kuit.findu.domain.model.extra.Center +import com.kuit.findu.domain.model.extra.Department +import com.kuit.findu.domain.model.extra.VolunteerWork sealed interface HomeExtraContent { data object None : HomeExtraContent data class Centers(val list: List
) : HomeExtraContent diff --git a/app/src/main/java/com/example/findu/presentation/model/HomeRv.kt b/app/src/main/java/com/kuit/findu/presentation/model/HomeRv.kt similarity index 76% rename from app/src/main/java/com/example/findu/presentation/model/HomeRv.kt rename to app/src/main/java/com/kuit/findu/presentation/model/HomeRv.kt index 86d917f1..820d28ce 100644 --- a/app/src/main/java/com/example/findu/presentation/model/HomeRv.kt +++ b/app/src/main/java/com/kuit/findu/presentation/model/HomeRv.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.model +package com.kuit.findu.presentation.model class HomeRv( val imageUrl: String, diff --git a/app/src/main/java/com/example/findu/presentation/model/InfoRv.kt b/app/src/main/java/com/kuit/findu/presentation/model/InfoRv.kt similarity index 65% rename from app/src/main/java/com/example/findu/presentation/model/InfoRv.kt rename to app/src/main/java/com/kuit/findu/presentation/model/InfoRv.kt index d13ae2d3..94640cbe 100644 --- a/app/src/main/java/com/example/findu/presentation/model/InfoRv.kt +++ b/app/src/main/java/com/kuit/findu/presentation/model/InfoRv.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.model +package com.kuit.findu.presentation.model data class InfoRv( val image: Int, diff --git a/app/src/main/java/com/example/findu/presentation/model/MyRv.kt b/app/src/main/java/com/kuit/findu/presentation/model/MyRv.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/model/MyRv.kt rename to app/src/main/java/com/kuit/findu/presentation/model/MyRv.kt index 88bda961..8c87f629 100644 --- a/app/src/main/java/com/example/findu/presentation/model/MyRv.kt +++ b/app/src/main/java/com/kuit/findu/presentation/model/MyRv.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.model +package com.kuit.findu.presentation.model data class MyReportHistoryRv( val reportId: Long, diff --git a/app/src/main/java/com/example/findu/presentation/type/AnimalStateType.kt b/app/src/main/java/com/kuit/findu/presentation/type/AnimalStateType.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/type/AnimalStateType.kt rename to app/src/main/java/com/kuit/findu/presentation/type/AnimalStateType.kt index 035c0cd5..08752e6f 100644 --- a/app/src/main/java/com/example/findu/presentation/type/AnimalStateType.kt +++ b/app/src/main/java/com/kuit/findu/presentation/type/AnimalStateType.kt @@ -1,7 +1,7 @@ -package com.example.findu.presentation.type +package com.kuit.findu.presentation.type import androidx.annotation.ColorRes -import com.example.findu.R +import com.kuit.findu.R enum class AnimalStateType( val state: String, diff --git a/app/src/main/java/com/example/findu/presentation/type/DefaultProfileType.kt b/app/src/main/java/com/kuit/findu/presentation/type/DefaultProfileType.kt similarity index 75% rename from app/src/main/java/com/example/findu/presentation/type/DefaultProfileType.kt rename to app/src/main/java/com/kuit/findu/presentation/type/DefaultProfileType.kt index abf69084..b58cf84e 100644 --- a/app/src/main/java/com/example/findu/presentation/type/DefaultProfileType.kt +++ b/app/src/main/java/com/kuit/findu/presentation/type/DefaultProfileType.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.type +package com.kuit.findu.presentation.type enum class DefaultProfileType(val string: String) { DEFAULT("default"), diff --git a/app/src/main/java/com/example/findu/presentation/type/HomeBannerType.kt b/app/src/main/java/com/kuit/findu/presentation/type/HomeBannerType.kt similarity index 84% rename from app/src/main/java/com/example/findu/presentation/type/HomeBannerType.kt rename to app/src/main/java/com/kuit/findu/presentation/type/HomeBannerType.kt index 9612d67a..9a441d9e 100644 --- a/app/src/main/java/com/example/findu/presentation/type/HomeBannerType.kt +++ b/app/src/main/java/com/kuit/findu/presentation/type/HomeBannerType.kt @@ -1,7 +1,7 @@ -package com.example.findu.presentation.type +package com.kuit.findu.presentation.type import androidx.annotation.DrawableRes -import com.example.findu.R +import com.kuit.findu.R enum class HomeBannerType ( @DrawableRes val imgRes: Int, diff --git a/app/src/main/java/com/example/findu/presentation/type/HomeExtraButtonType.kt b/app/src/main/java/com/kuit/findu/presentation/type/HomeExtraButtonType.kt similarity index 89% rename from app/src/main/java/com/example/findu/presentation/type/HomeExtraButtonType.kt rename to app/src/main/java/com/kuit/findu/presentation/type/HomeExtraButtonType.kt index 6db57840..d8334592 100644 --- a/app/src/main/java/com/example/findu/presentation/type/HomeExtraButtonType.kt +++ b/app/src/main/java/com/kuit/findu/presentation/type/HomeExtraButtonType.kt @@ -1,8 +1,8 @@ -package com.example.findu.presentation.type +package com.kuit.findu.presentation.type import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import com.example.findu.R +import com.kuit.findu.R enum class HomeExtraButtonType( @DrawableRes val imageRes: Int, diff --git a/app/src/main/java/com/example/findu/presentation/type/HomeReportDurationType.kt b/app/src/main/java/com/kuit/findu/presentation/type/HomeReportDurationType.kt similarity index 73% rename from app/src/main/java/com/example/findu/presentation/type/HomeReportDurationType.kt rename to app/src/main/java/com/kuit/findu/presentation/type/HomeReportDurationType.kt index 3b5907b7..04329952 100644 --- a/app/src/main/java/com/example/findu/presentation/type/HomeReportDurationType.kt +++ b/app/src/main/java/com/kuit/findu/presentation/type/HomeReportDurationType.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.type +package com.kuit.findu.presentation.type enum class HomeReportDurationType(val label: String) { WEEK("7일"), diff --git a/app/src/main/java/com/example/findu/presentation/type/HomeUserStatusType.kt b/app/src/main/java/com/kuit/findu/presentation/type/HomeUserStatusType.kt similarity index 91% rename from app/src/main/java/com/example/findu/presentation/type/HomeUserStatusType.kt rename to app/src/main/java/com/kuit/findu/presentation/type/HomeUserStatusType.kt index fac71c53..1afd0c3b 100644 --- a/app/src/main/java/com/example/findu/presentation/type/HomeUserStatusType.kt +++ b/app/src/main/java/com/kuit/findu/presentation/type/HomeUserStatusType.kt @@ -1,7 +1,7 @@ -package com.example.findu.presentation.type +package com.kuit.findu.presentation.type import androidx.annotation.StringRes -import com.example.findu.R +import com.kuit.findu.R enum class HomeUserStatusType( @StringRes val protectAnimalListTitleRes: Int, diff --git a/app/src/main/java/com/example/findu/presentation/type/NicknameValidType.kt b/app/src/main/java/com/kuit/findu/presentation/type/NicknameValidType.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/type/NicknameValidType.kt rename to app/src/main/java/com/kuit/findu/presentation/type/NicknameValidType.kt index 94c25790..75607531 100644 --- a/app/src/main/java/com/example/findu/presentation/type/NicknameValidType.kt +++ b/app/src/main/java/com/kuit/findu/presentation/type/NicknameValidType.kt @@ -1,8 +1,8 @@ -package com.example.findu.presentation.type +package com.kuit.findu.presentation.type import androidx.annotation.ColorRes import androidx.annotation.StringRes -import com.example.findu.R +import com.kuit.findu.R enum class NicknameValidType( @StringRes val stringRes: Int, diff --git a/app/src/main/java/com/example/findu/presentation/type/PermissionType.kt b/app/src/main/java/com/kuit/findu/presentation/type/PermissionType.kt similarity index 69% rename from app/src/main/java/com/example/findu/presentation/type/PermissionType.kt rename to app/src/main/java/com/kuit/findu/presentation/type/PermissionType.kt index 64868cb3..27331fd4 100644 --- a/app/src/main/java/com/example/findu/presentation/type/PermissionType.kt +++ b/app/src/main/java/com/kuit/findu/presentation/type/PermissionType.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.type +package com.kuit.findu.presentation.type enum class PermissionType { NOT_DETERMINED, diff --git a/app/src/main/java/com/example/findu/presentation/type/report/FeatureType.kt b/app/src/main/java/com/kuit/findu/presentation/type/report/FeatureType.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/type/report/FeatureType.kt rename to app/src/main/java/com/kuit/findu/presentation/type/report/FeatureType.kt index befa18e4..40e69bf9 100644 --- a/app/src/main/java/com/example/findu/presentation/type/report/FeatureType.kt +++ b/app/src/main/java/com/kuit/findu/presentation/type/report/FeatureType.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.type.report +package com.kuit.findu.presentation.type.report enum class PhysicalFeatureType( val feature: String, diff --git a/app/src/main/java/com/example/findu/presentation/type/report/ReportType.kt b/app/src/main/java/com/kuit/findu/presentation/type/report/ReportType.kt similarity index 67% rename from app/src/main/java/com/example/findu/presentation/type/report/ReportType.kt rename to app/src/main/java/com/kuit/findu/presentation/type/report/ReportType.kt index 50a138c7..f1c884cf 100644 --- a/app/src/main/java/com/example/findu/presentation/type/report/ReportType.kt +++ b/app/src/main/java/com/kuit/findu/presentation/type/report/ReportType.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.type.report +package com.kuit.findu.presentation.type.report enum class ReportType( val type: String diff --git a/app/src/main/java/com/example/findu/presentation/type/view/LoadState.kt b/app/src/main/java/com/kuit/findu/presentation/type/view/LoadState.kt similarity index 59% rename from app/src/main/java/com/example/findu/presentation/type/view/LoadState.kt rename to app/src/main/java/com/kuit/findu/presentation/type/view/LoadState.kt index e817ea9b..bfa73291 100644 --- a/app/src/main/java/com/example/findu/presentation/type/view/LoadState.kt +++ b/app/src/main/java/com/kuit/findu/presentation/type/view/LoadState.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.type.view +package com.kuit.findu.presentation.type.view enum class LoadState { Idle, diff --git a/app/src/main/java/com/example/findu/presentation/ui/base/BaseVectorIcon.kt b/app/src/main/java/com/kuit/findu/presentation/ui/base/BaseVectorIcon.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/ui/base/BaseVectorIcon.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/base/BaseVectorIcon.kt index d3f4e346..fb2e4de1 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/base/BaseVectorIcon.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/base/BaseVectorIcon.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.base +package com.kuit.findu.presentation.ui.base import androidx.annotation.DrawableRes import androidx.compose.material.Icon diff --git a/app/src/main/java/com/example/findu/presentation/ui/base/FindUButton.kt b/app/src/main/java/com/kuit/findu/presentation/ui/base/FindUButton.kt similarity index 96% rename from app/src/main/java/com/example/findu/presentation/ui/base/FindUButton.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/base/FindUButton.kt index 4c582507..5c50cfa1 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/base/FindUButton.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/base/FindUButton.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.base +package com.kuit.findu.presentation.ui.base import androidx.annotation.StringRes import androidx.compose.foundation.background @@ -13,7 +13,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.ui.theme.FindUTheme @Composable fun FindUButton( diff --git a/app/src/main/java/com/example/findu/presentation/ui/base/InputField.kt b/app/src/main/java/com/kuit/findu/presentation/ui/base/InputField.kt similarity index 96% rename from app/src/main/java/com/example/findu/presentation/ui/base/InputField.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/base/InputField.kt index 6e2c81ed..74edf82b 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/base/InputField.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/base/InputField.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.base +package com.kuit.findu.presentation.ui.base import androidx.annotation.StringRes import androidx.compose.foundation.border @@ -17,7 +17,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.ui.theme.FindUTheme @Composable fun RoundedInputField( diff --git a/app/src/main/java/com/example/findu/presentation/ui/base/SearchTagChip.kt b/app/src/main/java/com/kuit/findu/presentation/ui/base/SearchTagChip.kt similarity index 81% rename from app/src/main/java/com/example/findu/presentation/ui/base/SearchTagChip.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/base/SearchTagChip.kt index 24ee1260..febd23be 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/base/SearchTagChip.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/base/SearchTagChip.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.base +package com.kuit.findu.presentation.ui.base import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.PaddingValues @@ -8,9 +8,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.colorResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.presentation.type.AnimalStateType -import com.example.findu.presentation.util.extension.roundedBackgroundWithPadding -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.presentation.type.AnimalStateType +import com.kuit.findu.presentation.util.extension.roundedBackgroundWithPadding +import com.kuit.findu.ui.theme.FindUTheme @Composable fun SearchTagChip(animalStateType: AnimalStateType, modifier: Modifier = Modifier) { diff --git a/app/src/main/java/com/example/findu/presentation/ui/base/Spacer.kt b/app/src/main/java/com/kuit/findu/presentation/ui/base/Spacer.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/base/Spacer.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/base/Spacer.kt index 67641587..e4952b90 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/base/Spacer.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/base/Spacer.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.base +package com.kuit.findu.presentation.ui.base import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.RowScope diff --git a/app/src/main/java/com/example/findu/presentation/ui/base/TopAppBar.kt b/app/src/main/java/com/kuit/findu/presentation/ui/base/TopAppBar.kt similarity index 95% rename from app/src/main/java/com/example/findu/presentation/ui/base/TopAppBar.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/base/TopAppBar.kt index b1a7642d..e2bb4d32 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/base/TopAppBar.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/base/TopAppBar.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.base +package com.kuit.findu.presentation.ui.base import androidx.annotation.DrawableRes import androidx.annotation.StringRes @@ -13,8 +13,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.ui.theme.FindUTheme @Composable fun FindUTopAppBar( diff --git a/app/src/main/java/com/example/findu/presentation/ui/common/AppSettingDialog.kt b/app/src/main/java/com/kuit/findu/presentation/ui/common/AppSettingDialog.kt similarity index 91% rename from app/src/main/java/com/example/findu/presentation/ui/common/AppSettingDialog.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/common/AppSettingDialog.kt index ae181fa7..cdf31363 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/common/AppSettingDialog.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/common/AppSettingDialog.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.common +package com.kuit.findu.presentation.ui.common import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -10,15 +10,14 @@ import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog -import com.example.findu.R -import com.example.findu.presentation.ui.base.RectangleFindUButton -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.ui.base.RectangleFindUButton +import com.kuit.findu.ui.theme.FindUTheme @Composable fun AppSettingDialog( diff --git a/app/src/main/java/com/example/findu/presentation/ui/common/LoadingIndicator.kt b/app/src/main/java/com/kuit/findu/presentation/ui/common/LoadingIndicator.kt similarity index 91% rename from app/src/main/java/com/example/findu/presentation/ui/common/LoadingIndicator.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/common/LoadingIndicator.kt index a808726d..a98457c9 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/common/LoadingIndicator.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/common/LoadingIndicator.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.common +package com.kuit.findu.presentation.ui.common import androidx.compose.material.CircularProgressIndicator import androidx.compose.runtime.Composable @@ -7,7 +7,7 @@ import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.ui.theme.FindUTheme @Composable fun LoadingIndicator( diff --git a/app/src/main/java/com/example/findu/presentation/ui/common/WheelPicker.kt b/app/src/main/java/com/kuit/findu/presentation/ui/common/WheelPicker.kt similarity index 97% rename from app/src/main/java/com/example/findu/presentation/ui/common/WheelPicker.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/common/WheelPicker.kt index 8c1f0dd2..deca3b79 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/common/WheelPicker.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/common/WheelPicker.kt @@ -1,7 +1,6 @@ -package com.example.findu.presentation.ui.common +package com.kuit.findu.presentation.ui.common import androidx.compose.animation.core.animateFloatAsState -import androidx.compose.foundation.border import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.PaddingValues @@ -32,7 +31,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.ui.theme.FindUTheme import kotlin.math.abs import kotlin.math.roundToInt diff --git a/app/src/main/java/com/example/findu/presentation/ui/extra/HomeExtraFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/extra/HomeExtraFragment.kt similarity index 91% rename from app/src/main/java/com/example/findu/presentation/ui/extra/HomeExtraFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/extra/HomeExtraFragment.kt index 88e59235..f4b645a5 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/extra/HomeExtraFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/extra/HomeExtraFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.extra +package com.kuit.findu.presentation.ui.extra import android.Manifest import android.content.pm.PackageManager @@ -18,16 +18,16 @@ import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle import androidx.navigation.fragment.findNavController -import com.example.findu.databinding.FragmentHomeExtraBinding -import com.example.findu.presentation.model.HomeExtraContent -import com.example.findu.presentation.type.HomeExtraButtonType -import com.example.findu.presentation.type.view.LoadState -import com.example.findu.presentation.ui.extra.view.ExtraHomeCenterScreen -import com.example.findu.presentation.ui.extra.view.ExtraHomeDepartmentScreen -import com.example.findu.presentation.ui.extra.view.ExtraHomeVolunteerScreen -import com.example.findu.presentation.ui.extra.viewmodel.HomeExtraUiEvent -import com.example.findu.presentation.ui.extra.viewmodel.HomeExtraViewModel -import com.example.findu.presentation.ui.home.dialog.HomeFindDialog +import com.kuit.findu.databinding.FragmentHomeExtraBinding +import com.kuit.findu.presentation.model.HomeExtraContent +import com.kuit.findu.presentation.type.HomeExtraButtonType +import com.kuit.findu.presentation.type.view.LoadState +import com.kuit.findu.presentation.ui.extra.view.ExtraHomeCenterScreen +import com.kuit.findu.presentation.ui.extra.view.ExtraHomeDepartmentScreen +import com.kuit.findu.presentation.ui.extra.view.ExtraHomeVolunteerScreen +import com.kuit.findu.presentation.ui.extra.viewmodel.HomeExtraUiEvent +import com.kuit.findu.presentation.ui.extra.viewmodel.HomeExtraViewModel +import com.kuit.findu.presentation.ui.home.dialog.HomeFindDialog import com.google.android.gms.location.LocationServices import dagger.hilt.android.AndroidEntryPoint diff --git a/app/src/main/java/com/example/findu/presentation/ui/extra/component/ExtraCenterItem.kt b/app/src/main/java/com/kuit/findu/presentation/ui/extra/component/ExtraCenterItem.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/extra/component/ExtraCenterItem.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/extra/component/ExtraCenterItem.kt index 3a28dadd..45c71761 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/extra/component/ExtraCenterItem.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/extra/component/ExtraCenterItem.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.extra.component +package com.kuit.findu.presentation.ui.extra.component import android.content.Intent import androidx.compose.foundation.layout.Column @@ -21,11 +21,11 @@ import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.net.toUri -import com.example.findu.R -import com.example.findu.domain.model.extra.Center -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.extra.Center +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun ExtraCenterItem( diff --git a/app/src/main/java/com/example/findu/presentation/ui/extra/component/ExtraDepartmentItem.kt b/app/src/main/java/com/kuit/findu/presentation/ui/extra/component/ExtraDepartmentItem.kt similarity index 91% rename from app/src/main/java/com/example/findu/presentation/ui/extra/component/ExtraDepartmentItem.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/extra/component/ExtraDepartmentItem.kt index 5e24a683..88d8b9b2 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/extra/component/ExtraDepartmentItem.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/extra/component/ExtraDepartmentItem.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.extra.component +package com.kuit.findu.presentation.ui.extra.component import android.content.Intent import androidx.compose.foundation.layout.Column @@ -22,11 +22,11 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.net.toUri -import com.example.findu.R -import com.example.findu.domain.model.extra.Department -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.extra.Department +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun ExtraDepartmentItem( diff --git a/app/src/main/java/com/example/findu/presentation/ui/extra/component/ExtraDistrictItem.kt b/app/src/main/java/com/kuit/findu/presentation/ui/extra/component/ExtraDistrictItem.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/extra/component/ExtraDistrictItem.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/extra/component/ExtraDistrictItem.kt index df9ba1c1..674f61da 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/extra/component/ExtraDistrictItem.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/extra/component/ExtraDistrictItem.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.extra.component +package com.kuit.findu.presentation.ui.extra.component import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -25,9 +25,9 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.presentation.util.extension.roundedBackgroundWithPadding -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.util.extension.roundedBackgroundWithPadding +import com.kuit.findu.ui.theme.FindUTheme @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/example/findu/presentation/ui/extra/component/ExtraVolunteerItem.kt b/app/src/main/java/com/kuit/findu/presentation/ui/extra/component/ExtraVolunteerItem.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/extra/component/ExtraVolunteerItem.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/extra/component/ExtraVolunteerItem.kt index 56ebe402..8a67c9bf 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/extra/component/ExtraVolunteerItem.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/extra/component/ExtraVolunteerItem.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.extra.component +package com.kuit.findu.presentation.ui.extra.component import android.content.Intent import androidx.compose.foundation.layout.Column @@ -19,11 +19,11 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.net.toUri -import com.example.findu.R -import com.example.findu.domain.model.extra.VolunteerWork -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.extra.VolunteerWork +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun ExtraVolunteerItem( diff --git a/app/src/main/java/com/example/findu/presentation/ui/extra/view/ExtraCenterScreen.kt b/app/src/main/java/com/kuit/findu/presentation/ui/extra/view/ExtraCenterScreen.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/extra/view/ExtraCenterScreen.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/extra/view/ExtraCenterScreen.kt index 5cdd3da3..19bcf307 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/extra/view/ExtraCenterScreen.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/extra/view/ExtraCenterScreen.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.extra.view +package com.kuit.findu.presentation.ui.extra.view import android.Manifest import android.content.pm.PackageManager @@ -33,16 +33,16 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.content.ContextCompat -import com.example.findu.R -import com.example.findu.domain.model.extra.Center -import com.example.findu.domain.model.extra.Sido -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.ui.base.FindUTopAppBar -import com.example.findu.presentation.ui.extra.component.ExtraCenterItem -import com.example.findu.presentation.ui.extra.component.ExtraDistrictItem -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.presentation.util.extension.roundedBackgroundWithPadding -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.extra.Center +import com.kuit.findu.domain.model.extra.Sido +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.ui.base.FindUTopAppBar +import com.kuit.findu.presentation.ui.extra.component.ExtraCenterItem +import com.kuit.findu.presentation.ui.extra.component.ExtraDistrictItem +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.presentation.util.extension.roundedBackgroundWithPadding +import com.kuit.findu.ui.theme.FindUTheme import com.naver.maps.geometry.LatLng import com.naver.maps.map.CameraPosition import com.naver.maps.map.CameraUpdate diff --git a/app/src/main/java/com/example/findu/presentation/ui/extra/view/ExtraDepartmentScreen.kt b/app/src/main/java/com/kuit/findu/presentation/ui/extra/view/ExtraDepartmentScreen.kt similarity index 87% rename from app/src/main/java/com/example/findu/presentation/ui/extra/view/ExtraDepartmentScreen.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/extra/view/ExtraDepartmentScreen.kt index 32b0c812..9d918dc5 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/extra/view/ExtraDepartmentScreen.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/extra/view/ExtraDepartmentScreen.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.extra.view +package com.kuit.findu.presentation.ui.extra.view import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -12,12 +12,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.domain.model.extra.Department -import com.example.findu.domain.model.extra.Sido -import com.example.findu.presentation.ui.base.FindUTopAppBar -import com.example.findu.presentation.ui.extra.component.ExtraDepartmentItem -import com.example.findu.presentation.ui.extra.component.ExtraDistrictItem +import com.kuit.findu.R +import com.kuit.findu.domain.model.extra.Department +import com.kuit.findu.domain.model.extra.Sido +import com.kuit.findu.presentation.ui.base.FindUTopAppBar +import com.kuit.findu.presentation.ui.extra.component.ExtraDepartmentItem +import com.kuit.findu.presentation.ui.extra.component.ExtraDistrictItem @Composable fun ExtraHomeDepartmentScreen( diff --git a/app/src/main/java/com/example/findu/presentation/ui/extra/view/ExtraVolunteerScreen.kt b/app/src/main/java/com/kuit/findu/presentation/ui/extra/view/ExtraVolunteerScreen.kt similarity index 86% rename from app/src/main/java/com/example/findu/presentation/ui/extra/view/ExtraVolunteerScreen.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/extra/view/ExtraVolunteerScreen.kt index 03dc0ab3..e2c71b43 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/extra/view/ExtraVolunteerScreen.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/extra/view/ExtraVolunteerScreen.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.extra.view +package com.kuit.findu.presentation.ui.extra.view import androidx.compose.foundation.layout.Column import androidx.compose.foundation.lazy.LazyColumn @@ -6,10 +6,10 @@ import androidx.compose.foundation.lazy.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview -import com.example.findu.R -import com.example.findu.domain.model.extra.VolunteerWork -import com.example.findu.presentation.ui.base.FindUTopAppBar -import com.example.findu.presentation.ui.extra.component.ExtraVolunteerItem +import com.kuit.findu.R +import com.kuit.findu.domain.model.extra.VolunteerWork +import com.kuit.findu.presentation.ui.base.FindUTopAppBar +import com.kuit.findu.presentation.ui.extra.component.ExtraVolunteerItem @Composable fun ExtraHomeVolunteerScreen( diff --git a/app/src/main/java/com/example/findu/presentation/ui/extra/viewmodel/HomeExtraViewModel.kt b/app/src/main/java/com/kuit/findu/presentation/ui/extra/viewmodel/HomeExtraViewModel.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/extra/viewmodel/HomeExtraViewModel.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/extra/viewmodel/HomeExtraViewModel.kt index 0a4f8c4d..5ed3fb4e 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/extra/viewmodel/HomeExtraViewModel.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/extra/viewmodel/HomeExtraViewModel.kt @@ -1,18 +1,18 @@ -package com.example.findu.presentation.ui.extra.viewmodel +package com.kuit.findu.presentation.ui.extra.viewmodel import android.util.Log import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.findu.domain.model.extra.Sido -import com.example.findu.domain.usecase.extra.GetCentersUseCase -import com.example.findu.domain.usecase.extra.GetDepartmentsUseCase -import com.example.findu.domain.usecase.extra.GetSidoUseCase -import com.example.findu.domain.usecase.extra.GetSigunguUseCase -import com.example.findu.domain.usecase.extra.GetVolunteersUseCase -import com.example.findu.presentation.model.HomeExtraContent -import com.example.findu.presentation.type.HomeExtraButtonType -import com.example.findu.presentation.type.view.LoadState +import com.kuit.findu.domain.model.extra.Sido +import com.kuit.findu.domain.usecase.extra.GetCentersUseCase +import com.kuit.findu.domain.usecase.extra.GetDepartmentsUseCase +import com.kuit.findu.domain.usecase.extra.GetSidoUseCase +import com.kuit.findu.domain.usecase.extra.GetSigunguUseCase +import com.kuit.findu.domain.usecase.extra.GetVolunteersUseCase +import com.kuit.findu.presentation.model.HomeExtraContent +import com.kuit.findu.presentation.type.HomeExtraButtonType +import com.kuit.findu.presentation.type.view.LoadState import com.naver.maps.geometry.LatLng import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.channels.Channel diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/HomeFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/HomeFragment.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/home/HomeFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/HomeFragment.kt index 2fe6f75c..93661b62 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/HomeFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home +package com.kuit.findu.presentation.ui.home import android.content.Intent import android.os.Bundle @@ -16,15 +16,15 @@ import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle import androidx.navigation.fragment.findNavController -import com.example.findu.databinding.FragmentHomeBinding -import com.example.findu.presentation.type.AnimalStateType -import com.example.findu.presentation.type.HomeExtraButtonType -import com.example.findu.presentation.type.view.LoadState -import com.example.findu.presentation.ui.home.composeview.HomeScreen -import com.example.findu.presentation.ui.home.viewmodel.HomeUiEffect -import com.example.findu.presentation.ui.home.viewmodel.HomeUiEvent -import com.example.findu.presentation.ui.home.viewmodel.HomeViewModel -import com.example.findu.presentation.util.permission.LocationPermissionManager.hasLocationPermission +import com.kuit.findu.databinding.FragmentHomeBinding +import com.kuit.findu.presentation.type.AnimalStateType +import com.kuit.findu.presentation.type.HomeExtraButtonType +import com.kuit.findu.presentation.type.view.LoadState +import com.kuit.findu.presentation.ui.home.composeview.HomeScreen +import com.kuit.findu.presentation.ui.home.viewmodel.HomeUiEffect +import com.kuit.findu.presentation.ui.home.viewmodel.HomeUiEvent +import com.kuit.findu.presentation.ui.home.viewmodel.HomeViewModel +import com.kuit.findu.presentation.util.permission.LocationPermissionManager.hasLocationPermission import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/SpaceDecoration.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/SpaceDecoration.kt similarity index 95% rename from app/src/main/java/com/example/findu/presentation/ui/home/SpaceDecoration.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/SpaceDecoration.kt index 4070db4c..ed960c42 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/SpaceDecoration.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/SpaceDecoration.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home +package com.kuit.findu.presentation.ui.home import android.graphics.Rect import android.view.View diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/adapter/HomeBannerAdapter.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/adapter/HomeBannerAdapter.kt similarity index 89% rename from app/src/main/java/com/example/findu/presentation/ui/home/adapter/HomeBannerAdapter.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/adapter/HomeBannerAdapter.kt index 05939b87..ebf3038c 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/adapter/HomeBannerAdapter.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/adapter/HomeBannerAdapter.kt @@ -1,9 +1,9 @@ -package com.example.findu.presentation.ui.home.adapter +package com.kuit.findu.presentation.ui.home.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.findu.databinding.ItemHomeVpBannerBinding +import com.kuit.findu.databinding.ItemHomeVpBannerBinding class HomeBannerAdapter( private val imageUrls: List diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/adapter/HomeRVAdapter.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/adapter/HomeRVAdapter.kt similarity index 89% rename from app/src/main/java/com/example/findu/presentation/ui/home/adapter/HomeRVAdapter.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/adapter/HomeRVAdapter.kt index c2cf1bc5..9136af1f 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/adapter/HomeRVAdapter.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/adapter/HomeRVAdapter.kt @@ -1,13 +1,13 @@ -package com.example.findu.presentation.ui.home.adapter +package com.kuit.findu.presentation.ui.home.adapter import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.findu.databinding.ItemHomeRvBinding -import com.example.findu.presentation.model.HomeRv -import com.example.findu.presentation.type.AnimalStateType +import com.kuit.findu.databinding.ItemHomeRvBinding +import com.kuit.findu.presentation.model.HomeRv +import com.kuit.findu.presentation.type.AnimalStateType class HomeRVAdapter( private val items: List, diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeBannerPager.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeBannerPager.kt similarity index 90% rename from app/src/main/java/com/example/findu/presentation/ui/home/component/HomeBannerPager.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeBannerPager.kt index 02c77421..f76173dd 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeBannerPager.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeBannerPager.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home.component +package com.kuit.findu.presentation.ui.home.component import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -15,9 +15,9 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import com.example.findu.presentation.type.HomeBannerType -import com.example.findu.presentation.util.extension.roundedBackgroundWithPadding -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.presentation.type.HomeBannerType +import com.kuit.findu.presentation.util.extension.roundedBackgroundWithPadding +import com.kuit.findu.ui.theme.FindUTheme import com.google.accompanist.pager.ExperimentalPagerApi import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.PagerState diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeButtonList.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeButtonList.kt similarity index 87% rename from app/src/main/java/com/example/findu/presentation/ui/home/component/HomeButtonList.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeButtonList.kt index a196d543..e2f3b88a 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeButtonList.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeButtonList.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home.component +package com.kuit.findu.presentation.ui.home.component import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -17,9 +17,9 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.presentation.type.HomeExtraButtonType -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.presentation.type.HomeExtraButtonType +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeProtectAnimalCard.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeProtectAnimalCard.kt similarity index 89% rename from app/src/main/java/com/example/findu/presentation/ui/home/component/HomeProtectAnimalCard.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeProtectAnimalCard.kt index 37e19c0e..441e43a3 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeProtectAnimalCard.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeProtectAnimalCard.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home.component +package com.kuit.findu.presentation.ui.home.component import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -24,13 +24,13 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import coil.compose.AsyncImage -import com.example.findu.R -import com.example.findu.domain.model.ProtectAnimal -import com.example.findu.presentation.type.AnimalStateType -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.ui.base.SearchTagChip -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.ProtectAnimal +import com.kuit.findu.presentation.type.AnimalStateType +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.ui.base.SearchTagChip +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun HomeProtectAnimalCard( diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeProtectAnimalList.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeProtectAnimalList.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/home/component/HomeProtectAnimalList.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeProtectAnimalList.kt index aa6ad092..370f0012 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeProtectAnimalList.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeProtectAnimalList.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home.component +package com.kuit.findu.presentation.ui.home.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -17,12 +17,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.domain.model.ProtectAnimal -import com.example.findu.presentation.type.HomeUserStatusType -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.ProtectAnimal +import com.kuit.findu.presentation.type.HomeUserStatusType +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun HomeProtectAnimalList( diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeReportCard.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportCard.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/home/component/HomeReportCard.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportCard.kt index 834b6c72..70dc7be5 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeReportCard.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportCard.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home.component +package com.kuit.findu.presentation.ui.home.component import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -25,14 +25,14 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.domain.model.HomeStatistics -import com.example.findu.domain.model.PeriodStatistics -import com.example.findu.presentation.type.HomeReportDurationType -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.presentation.util.extension.roundedBackgroundWithPadding -import com.example.findu.presentation.util.extension.toStringWithComma -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.HomeStatistics +import com.kuit.findu.domain.model.PeriodStatistics +import com.kuit.findu.presentation.type.HomeReportDurationType +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.presentation.util.extension.roundedBackgroundWithPadding +import com.kuit.findu.presentation.util.extension.toStringWithComma +import com.kuit.findu.ui.theme.FindUTheme @Composable fun HomeReportCard( diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeReportDialog.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportDialog.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/ui/home/component/HomeReportDialog.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportDialog.kt index 2c730b17..dce9e58c 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeReportDialog.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportDialog.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home.component +package com.kuit.findu.presentation.ui.home.component import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column @@ -19,11 +19,11 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog -import com.example.findu.R -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.presentation.util.extension.roundedBackgroundWithPadding -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.presentation.util.extension.roundedBackgroundWithPadding +import com.kuit.findu.ui.theme.FindUTheme @Composable fun HomeReportDialog( diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeReportedAnimalCard.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportedAnimalCard.kt similarity index 89% rename from app/src/main/java/com/example/findu/presentation/ui/home/component/HomeReportedAnimalCard.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportedAnimalCard.kt index 42318033..0c2d009f 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeReportedAnimalCard.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportedAnimalCard.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home.component +package com.kuit.findu.presentation.ui.home.component import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -22,14 +22,13 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import coil.compose.AsyncImage -import com.example.findu.R -import com.example.findu.domain.model.ReportAnimal -import com.example.findu.presentation.type.AnimalStateType -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.ui.base.SearchTagChip -import com.example.findu.presentation.ui.home.viewmodel.HomeUiEffect -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.ReportAnimal +import com.kuit.findu.presentation.type.AnimalStateType +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.ui.base.SearchTagChip +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun HomeReportedAnimalCard( diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeReportedAnimalList.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportedAnimalList.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/home/component/HomeReportedAnimalList.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportedAnimalList.kt index 41893f6f..287902dd 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeReportedAnimalList.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeReportedAnimalList.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home.component +package com.kuit.findu.presentation.ui.home.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -17,12 +17,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.domain.model.ReportAnimal -import com.example.findu.presentation.type.HomeUserStatusType -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.ReportAnimal +import com.kuit.findu.presentation.type.HomeUserStatusType +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun HomeReportedAnimalList( diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeScrollToTopButton.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeScrollToTopButton.kt similarity index 81% rename from app/src/main/java/com/example/findu/presentation/ui/home/component/HomeScrollToTopButton.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeScrollToTopButton.kt index 5efb35da..58e2cfcd 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeScrollToTopButton.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeScrollToTopButton.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home.component +package com.kuit.findu.presentation.ui.home.component import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -10,10 +10,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun HomeScrollToTopButton(onClick: () -> Unit, modifier: Modifier = Modifier) { diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeTopBar.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeTopBar.kt similarity index 89% rename from app/src/main/java/com/example/findu/presentation/ui/home/component/HomeTopBar.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeTopBar.kt index 74e36718..26383cf3 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeTopBar.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeTopBar.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home.component +package com.kuit.findu.presentation.ui.home.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.PaddingValues @@ -17,10 +17,10 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.presentation.util.extension.roundedBackgroundWithPadding -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.presentation.util.extension.roundedBackgroundWithPadding +import com.kuit.findu.ui.theme.FindUTheme @Composable fun HomeTopBar( diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeWebLinkButton.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeWebLinkButton.kt similarity index 85% rename from app/src/main/java/com/example/findu/presentation/ui/home/component/HomeWebLinkButton.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeWebLinkButton.kt index e87c6223..307693ea 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeWebLinkButton.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeWebLinkButton.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home.component +package com.kuit.findu.presentation.ui.home.component import android.content.Intent import android.net.Uri @@ -17,11 +17,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.presentation.util.extension.roundedBackgroundWithPadding -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.presentation.util.extension.roundedBackgroundWithPadding +import com.kuit.findu.ui.theme.FindUTheme @Composable fun HomeWebLinkButton( diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeWebLinkList.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeWebLinkList.kt similarity index 88% rename from app/src/main/java/com/example/findu/presentation/ui/home/component/HomeWebLinkList.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeWebLinkList.kt index 30719cbc..3d29e8ef 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/component/HomeWebLinkList.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/component/HomeWebLinkList.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home.component +package com.kuit.findu.presentation.ui.home.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -14,11 +14,11 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.util.WebViewUrl.CENTER_URL -import com.example.findu.presentation.util.WebViewUrl.PART_URL -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.util.WebViewUrl.CENTER_URL +import com.kuit.findu.presentation.util.WebViewUrl.PART_URL +import com.kuit.findu.ui.theme.FindUTheme @Composable fun HomeWebLinkList(modifier: Modifier = Modifier) { diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/composeview/HomeScreen.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/composeview/HomeScreen.kt similarity index 87% rename from app/src/main/java/com/example/findu/presentation/ui/home/composeview/HomeScreen.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/composeview/HomeScreen.kt index 4a4c3fc8..6ccdf2d9 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/composeview/HomeScreen.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/composeview/HomeScreen.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home.composeview +package com.kuit.findu.presentation.ui.home.composeview import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -26,24 +26,23 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.domain.model.ProtectAnimal -import com.example.findu.domain.model.ReportAnimal -import com.example.findu.presentation.type.HomeBannerType -import com.example.findu.presentation.type.HomeExtraButtonType -import com.example.findu.presentation.type.HomeReportDurationType -import com.example.findu.presentation.type.HomeUserStatusType -import com.example.findu.presentation.ui.home.component.HomeBannerPager -import com.example.findu.presentation.ui.home.component.HomeExtraButtonList -import com.example.findu.presentation.ui.home.component.HomeProtectAnimalList -import com.example.findu.presentation.ui.home.component.HomeReportCard -import com.example.findu.presentation.ui.home.component.HomeReportDialog -import com.example.findu.presentation.ui.home.component.HomeReportedAnimalList -import com.example.findu.presentation.ui.home.component.HomeScrollToTopButton -import com.example.findu.presentation.ui.home.component.HomeTopBar -import com.example.findu.presentation.ui.home.component.HomeWebLinkList -import com.example.findu.presentation.ui.home.viewmodel.HomeUiState -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.ProtectAnimal +import com.kuit.findu.domain.model.ReportAnimal +import com.kuit.findu.presentation.type.HomeBannerType +import com.kuit.findu.presentation.type.HomeExtraButtonType +import com.kuit.findu.presentation.type.HomeReportDurationType +import com.kuit.findu.presentation.ui.home.component.HomeBannerPager +import com.kuit.findu.presentation.ui.home.component.HomeExtraButtonList +import com.kuit.findu.presentation.ui.home.component.HomeProtectAnimalList +import com.kuit.findu.presentation.ui.home.component.HomeReportCard +import com.kuit.findu.presentation.ui.home.component.HomeReportDialog +import com.kuit.findu.presentation.ui.home.component.HomeReportedAnimalList +import com.kuit.findu.presentation.ui.home.component.HomeScrollToTopButton +import com.kuit.findu.presentation.ui.home.component.HomeTopBar +import com.kuit.findu.presentation.ui.home.component.HomeWebLinkList +import com.kuit.findu.presentation.ui.home.viewmodel.HomeUiState +import com.kuit.findu.ui.theme.FindUTheme import com.google.accompanist.pager.ExperimentalPagerApi import com.google.accompanist.pager.rememberPagerState import kotlinx.coroutines.delay diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/dialog/HomeFindDialog.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/dialog/HomeFindDialog.kt similarity index 90% rename from app/src/main/java/com/example/findu/presentation/ui/home/dialog/HomeFindDialog.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/dialog/HomeFindDialog.kt index 17cd8581..ffa5f9c1 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/dialog/HomeFindDialog.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/dialog/HomeFindDialog.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home.dialog +package com.kuit.findu.presentation.ui.home.dialog import android.app.Dialog import android.content.Context @@ -7,8 +7,8 @@ import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.LayoutInflater import androidx.navigation.NavController -import com.example.findu.R -import com.example.findu.databinding.DialogHomeFindBinding +import com.kuit.findu.R +import com.kuit.findu.databinding.DialogHomeFindBinding class HomeFindDialog( context: Context, diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/dialog/HomeReportDetailDialog.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/dialog/HomeReportDetailDialog.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/ui/home/dialog/HomeReportDetailDialog.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/dialog/HomeReportDetailDialog.kt index 33a38360..a794b87f 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/dialog/HomeReportDetailDialog.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/dialog/HomeReportDetailDialog.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.home.dialog +package com.kuit.findu.presentation.ui.home.dialog import android.app.Dialog import android.content.Context @@ -8,7 +8,7 @@ import android.graphics.drawable.ColorDrawable import android.net.Uri import android.os.Bundle import android.view.LayoutInflater -import com.example.findu.databinding.DialogHomeReportDetailBinding +import com.kuit.findu.databinding.DialogHomeReportDetailBinding class HomeReportDetailDialog( context: Context, diff --git a/app/src/main/java/com/example/findu/presentation/ui/home/viewmodel/HomeViewModel.kt b/app/src/main/java/com/kuit/findu/presentation/ui/home/viewmodel/HomeViewModel.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/home/viewmodel/HomeViewModel.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/home/viewmodel/HomeViewModel.kt index 2a325809..2b74cffe 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/home/viewmodel/HomeViewModel.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/home/viewmodel/HomeViewModel.kt @@ -1,16 +1,16 @@ -package com.example.findu.presentation.ui.home.viewmodel +package com.kuit.findu.presentation.ui.home.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.findu.domain.model.HomeData -import com.example.findu.domain.model.ProtectAnimal -import com.example.findu.domain.model.ReportAnimal -import com.example.findu.domain.usecase.GetNicknameUseCase -import com.example.findu.domain.usecase.home.GetHomeUseCase -import com.example.findu.presentation.type.HomeReportDurationType -import com.example.findu.presentation.type.HomeUserStatusType -import com.example.findu.presentation.type.view.LoadState -import com.example.findu.presentation.util.Nickname.GUEST_NAME +import com.kuit.findu.domain.model.HomeData +import com.kuit.findu.domain.model.ProtectAnimal +import com.kuit.findu.domain.model.ReportAnimal +import com.kuit.findu.domain.usecase.GetNicknameUseCase +import com.kuit.findu.domain.usecase.home.GetHomeUseCase +import com.kuit.findu.presentation.type.HomeReportDurationType +import com.kuit.findu.presentation.type.HomeUserStatusType +import com.kuit.findu.presentation.type.view.LoadState +import com.kuit.findu.presentation.util.Nickname.GUEST_NAME import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/example/findu/presentation/ui/info/AdoptInfoFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/info/AdoptInfoFragment.kt similarity index 88% rename from app/src/main/java/com/example/findu/presentation/ui/info/AdoptInfoFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/info/AdoptInfoFragment.kt index 9602e859..deae0b80 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/info/AdoptInfoFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/info/AdoptInfoFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.info +package com.kuit.findu.presentation.ui.info import android.os.Bundle import android.view.LayoutInflater @@ -6,7 +6,7 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController -import com.example.findu.databinding.FragmentAdoptInfoBinding +import com.kuit.findu.databinding.FragmentAdoptInfoBinding class AdoptInfoFragment : Fragment() { private var _binding: FragmentAdoptInfoBinding? = null diff --git a/app/src/main/java/com/example/findu/presentation/ui/info/InfoFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/info/InfoFragment.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/info/InfoFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/info/InfoFragment.kt index 5beea943..be3f8e0c 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/info/InfoFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/info/InfoFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.info +package com.kuit.findu.presentation.ui.info import android.os.Bundle import android.view.LayoutInflater @@ -7,9 +7,9 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager -import com.example.findu.R -import com.example.findu.databinding.FragmentInfoBinding -import com.example.findu.presentation.model.InfoRv +import com.kuit.findu.R +import com.kuit.findu.databinding.FragmentInfoBinding +import com.kuit.findu.presentation.model.InfoRv class InfoFragment : Fragment() { private var _binding: FragmentInfoBinding? = null diff --git a/app/src/main/java/com/example/findu/presentation/ui/info/InfoRvAdapter.kt b/app/src/main/java/com/kuit/findu/presentation/ui/info/InfoRvAdapter.kt similarity index 89% rename from app/src/main/java/com/example/findu/presentation/ui/info/InfoRvAdapter.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/info/InfoRvAdapter.kt index 70750a81..d8dd183d 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/info/InfoRvAdapter.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/info/InfoRvAdapter.kt @@ -1,11 +1,11 @@ -package com.example.findu.presentation.ui.info +package com.kuit.findu.presentation.ui.info import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.findu.databinding.ItemInfoRvBinding -import com.example.findu.presentation.model.InfoRv +import com.kuit.findu.databinding.ItemInfoRvBinding +import com.kuit.findu.presentation.model.InfoRv class InfoRvAdapter( private val items: List, diff --git a/app/src/main/java/com/example/findu/presentation/ui/info/ReportInfoFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/info/ReportInfoFragment.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/info/ReportInfoFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/info/ReportInfoFragment.kt index 73c57656..dbd51176 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/info/ReportInfoFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/info/ReportInfoFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.info +package com.kuit.findu.presentation.ui.info import android.content.Intent import android.net.Uri @@ -8,8 +8,8 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController -import com.example.findu.R -import com.example.findu.databinding.FragmentReportInfoBinding +import com.kuit.findu.R +import com.kuit.findu.databinding.FragmentReportInfoBinding class ReportInfoFragment : Fragment() { private var _binding: FragmentReportInfoBinding? = null diff --git a/app/src/main/java/com/example/findu/presentation/ui/info/VolunteerInfoFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/info/VolunteerInfoFragment.kt similarity index 91% rename from app/src/main/java/com/example/findu/presentation/ui/info/VolunteerInfoFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/info/VolunteerInfoFragment.kt index bb849e30..c57dee4f 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/info/VolunteerInfoFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/info/VolunteerInfoFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.info +package com.kuit.findu.presentation.ui.info import android.content.Intent import android.net.Uri @@ -8,7 +8,7 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController -import com.example.findu.databinding.FragmentVolunteerInfoBinding +import com.kuit.findu.databinding.FragmentVolunteerInfoBinding class VolunteerInfoFragment : Fragment() { private var _binding: FragmentVolunteerInfoBinding? = null diff --git a/app/src/main/java/com/example/findu/presentation/ui/login/LoginActivity.kt b/app/src/main/java/com/kuit/findu/presentation/ui/login/LoginActivity.kt similarity index 85% rename from app/src/main/java/com/example/findu/presentation/ui/login/LoginActivity.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/login/LoginActivity.kt index 7389450e..34289536 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/login/LoginActivity.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/login/LoginActivity.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.login +package com.kuit.findu.presentation.ui.login import android.content.Intent import android.os.Bundle @@ -9,13 +9,13 @@ import androidx.activity.viewModels import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import com.example.findu.R -import com.example.findu.presentation.ui.login.composeview.LoginScreen -import com.example.findu.presentation.ui.login.viewmodel.LoginViewModel -import com.example.findu.presentation.ui.main.MainActivity -import com.example.findu.presentation.ui.onboarding.OnboardingActivity -import com.example.findu.presentation.util.extension.showToast -import com.example.findu.presentation.util.kakao.KakaoLoginHelper +import com.kuit.findu.R +import com.kuit.findu.presentation.ui.login.composeview.LoginScreen +import com.kuit.findu.presentation.ui.login.viewmodel.LoginViewModel +import com.kuit.findu.presentation.ui.main.MainActivity +import com.kuit.findu.presentation.ui.onboarding.OnboardingActivity +import com.kuit.findu.presentation.util.extension.showToast +import com.kuit.findu.presentation.util.kakao.KakaoLoginHelper import com.kakao.sdk.auth.model.OAuthToken import com.kakao.sdk.user.UserApiClient import dagger.hilt.android.AndroidEntryPoint diff --git a/app/src/main/java/com/example/findu/presentation/ui/login/composeview/LoginScreen.kt b/app/src/main/java/com/kuit/findu/presentation/ui/login/composeview/LoginScreen.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/login/composeview/LoginScreen.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/login/composeview/LoginScreen.kt index 2ad6737c..32caac6c 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/login/composeview/LoginScreen.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/login/composeview/LoginScreen.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.login.composeview +package com.kuit.findu.presentation.ui.login.composeview import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -19,10 +19,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.presentation.util.extension.roundedBackgroundWithPadding -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.presentation.util.extension.roundedBackgroundWithPadding +import com.kuit.findu.ui.theme.FindUTheme @Composable fun LoginScreen( diff --git a/app/src/main/java/com/example/findu/presentation/ui/login/viewmodel/LoginViewModel.kt b/app/src/main/java/com/kuit/findu/presentation/ui/login/viewmodel/LoginViewModel.kt similarity index 86% rename from app/src/main/java/com/example/findu/presentation/ui/login/viewmodel/LoginViewModel.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/login/viewmodel/LoginViewModel.kt index 0aafd3fa..b7f70f43 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/login/viewmodel/LoginViewModel.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/login/viewmodel/LoginViewModel.kt @@ -1,13 +1,13 @@ -package com.example.findu.presentation.ui.login.viewmodel +package com.kuit.findu.presentation.ui.login.viewmodel import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.findu.domain.usecase.SetNicknameUseCase -import com.example.findu.domain.usecase.auth.PostGuestLoginUseCase -import com.example.findu.domain.usecase.auth.PostLoginUseCase -import com.example.findu.domain.usecase.token.SetAccessTokenUseCase -import com.example.findu.presentation.util.Nickname.GUEST_NAME +import com.kuit.findu.domain.usecase.SetNicknameUseCase +import com.kuit.findu.domain.usecase.auth.PostGuestLoginUseCase +import com.kuit.findu.domain.usecase.auth.PostLoginUseCase +import com.kuit.findu.domain.usecase.token.SetAccessTokenUseCase +import com.kuit.findu.presentation.util.Nickname.GUEST_NAME import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow diff --git a/app/src/main/java/com/example/findu/presentation/ui/main/MainActivity.kt b/app/src/main/java/com/kuit/findu/presentation/ui/main/MainActivity.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/main/MainActivity.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/main/MainActivity.kt index c76d362e..4581d6f3 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/main/MainActivity.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/main/MainActivity.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.main +package com.kuit.findu.presentation.ui.main import android.os.Bundle import android.view.View @@ -6,8 +6,8 @@ import androidx.appcompat.app.AppCompatActivity import androidx.navigation.NavController import androidx.navigation.fragment.NavHostFragment import androidx.navigation.ui.setupWithNavController -import com.example.findu.R -import com.example.findu.databinding.ActivityMainBinding +import com.kuit.findu.R +import com.kuit.findu.databinding.ActivityMainBinding import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/MyFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/MyFragment.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/my/MyFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/MyFragment.kt index 1a60696d..decd0d2a 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/MyFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/MyFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.my +package com.kuit.findu.presentation.ui.my import android.content.ActivityNotFoundException import android.content.Intent @@ -20,16 +20,16 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import com.bumptech.glide.Glide -import com.example.findu.BuildConfig -import com.example.findu.R -import com.example.findu.databinding.FragmentMyBinding -import com.example.findu.presentation.ui.login.LoginActivity -import com.example.findu.presentation.ui.my.dialog.MyLogoutDialog -import com.example.findu.presentation.ui.my.dialog.MyNicknameDialog -import com.example.findu.presentation.ui.my.dialog.MyProfileImageDialog -import com.example.findu.presentation.ui.my.dialog.MyWithdrawalDialog -import com.example.findu.presentation.ui.my.model.ProfileImageType -import com.example.findu.presentation.ui.my.viewmodel.MyViewModel +import com.kuit.findu.BuildConfig +import com.kuit.findu.R +import com.kuit.findu.databinding.FragmentMyBinding +import com.kuit.findu.presentation.ui.login.LoginActivity +import com.kuit.findu.presentation.ui.my.dialog.MyLogoutDialog +import com.kuit.findu.presentation.ui.my.dialog.MyNicknameDialog +import com.kuit.findu.presentation.ui.my.dialog.MyProfileImageDialog +import com.kuit.findu.presentation.ui.my.dialog.MyWithdrawalDialog +import com.kuit.findu.presentation.ui.my.model.ProfileImageType +import com.kuit.findu.presentation.ui.my.viewmodel.MyViewModel import com.google.firebase.Firebase import com.google.firebase.remoteconfig.remoteConfig import com.google.firebase.remoteconfig.remoteConfigSettings diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/MyInterestFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/MyInterestFragment.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/ui/my/MyInterestFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/MyInterestFragment.kt index 3b6bdcff..b2a5b46b 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/MyInterestFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/MyInterestFragment.kt @@ -1,20 +1,20 @@ -package com.example.findu.presentation.ui.my +package com.kuit.findu.presentation.ui.my import android.os.Bundle import android.util.Log -import androidx.fragment.app.Fragment 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.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager -import com.example.findu.databinding.FragmentMyInterestBinding -import com.example.findu.presentation.ui.my.adapter.MyInterestRvAdapter -import com.example.findu.presentation.ui.my.viewmodel.MyViewModel +import com.kuit.findu.databinding.FragmentMyInterestBinding +import com.kuit.findu.presentation.ui.my.adapter.MyInterestRvAdapter +import com.kuit.findu.presentation.ui.my.viewmodel.MyViewModel import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch @@ -63,7 +63,7 @@ class MyInterestFragment : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View { _binding = FragmentMyInterestBinding.inflate(inflater, container, false) diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/MyReportHistoryFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/MyReportHistoryFragment.kt similarity index 91% rename from app/src/main/java/com/example/findu/presentation/ui/my/MyReportHistoryFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/MyReportHistoryFragment.kt index 8402dde8..b1b08bb1 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/MyReportHistoryFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/MyReportHistoryFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.my +package com.kuit.findu.presentation.ui.my import android.os.Bundle import androidx.fragment.app.Fragment @@ -10,10 +10,10 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager -import com.example.findu.databinding.FragmentMyReportHistoryBinding -import com.example.findu.presentation.ui.my.adapter.MyReportHistoryAdapter -import com.example.findu.presentation.ui.my.dialog.MyDeleteHistoryDialog -import com.example.findu.presentation.ui.my.viewmodel.MyViewModel +import com.kuit.findu.databinding.FragmentMyReportHistoryBinding +import com.kuit.findu.presentation.ui.my.adapter.MyReportHistoryAdapter +import com.kuit.findu.presentation.ui.my.dialog.MyDeleteHistoryDialog +import com.kuit.findu.presentation.ui.my.viewmodel.MyViewModel import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/MyViewedAnimalFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/MyViewedAnimalFragment.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/ui/my/MyViewedAnimalFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/MyViewedAnimalFragment.kt index 733380d7..2d624521 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/MyViewedAnimalFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/MyViewedAnimalFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.my +package com.kuit.findu.presentation.ui.my import android.os.Bundle import androidx.fragment.app.Fragment @@ -10,9 +10,9 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager -import com.example.findu.databinding.FragmentMyViewedAnimalBinding -import com.example.findu.presentation.ui.my.adapter.MyViewedAnimalsRvAdapter -import com.example.findu.presentation.ui.my.viewmodel.MyViewModel +import com.kuit.findu.databinding.FragmentMyViewedAnimalBinding +import com.kuit.findu.presentation.ui.my.adapter.MyViewedAnimalsRvAdapter +import com.kuit.findu.presentation.ui.my.viewmodel.MyViewModel import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.delay import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/adapter/MyInterestRvAdapter.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/adapter/MyInterestRvAdapter.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/my/adapter/MyInterestRvAdapter.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/adapter/MyInterestRvAdapter.kt index ba79b2dc..7b7c4265 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/adapter/MyInterestRvAdapter.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/adapter/MyInterestRvAdapter.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.my.adapter +package com.kuit.findu.presentation.ui.my.adapter import android.view.LayoutInflater import android.view.View @@ -7,9 +7,9 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.findu.databinding.ItemMyHistoryBinding -import com.example.findu.presentation.model.MyInterestRv -import com.example.findu.presentation.type.AnimalStateType +import com.kuit.findu.databinding.ItemMyHistoryBinding +import com.kuit.findu.presentation.model.MyInterestRv +import com.kuit.findu.presentation.type.AnimalStateType class MyInterestRvAdapter( private val onKeepClick: (Long, Boolean, String) -> Unit, diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/adapter/MyReportHistoryAdapter.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/adapter/MyReportHistoryAdapter.kt similarity index 91% rename from app/src/main/java/com/example/findu/presentation/ui/my/adapter/MyReportHistoryAdapter.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/adapter/MyReportHistoryAdapter.kt index a13880e5..f575f59f 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/adapter/MyReportHistoryAdapter.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/adapter/MyReportHistoryAdapter.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.my.adapter +package com.kuit.findu.presentation.ui.my.adapter import android.view.LayoutInflater import android.view.View @@ -7,10 +7,10 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.findu.databinding.ItemMyHistoryBinding -import com.example.findu.presentation.model.MyReportHistoryRv -import com.example.findu.presentation.type.AnimalStateType -import com.example.findu.presentation.util.ViewUtils.addUnderLine +import com.kuit.findu.databinding.ItemMyHistoryBinding +import com.kuit.findu.presentation.model.MyReportHistoryRv +import com.kuit.findu.presentation.type.AnimalStateType +import com.kuit.findu.presentation.util.ViewUtils.addUnderLine class MyReportHistoryAdapter( private val onDeleteClick: (Long, () -> Unit) -> Unit, diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/adapter/MyViewedAnimalsRvAdapter.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/adapter/MyViewedAnimalsRvAdapter.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/my/adapter/MyViewedAnimalsRvAdapter.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/adapter/MyViewedAnimalsRvAdapter.kt index 3babd387..6a3a9b69 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/adapter/MyViewedAnimalsRvAdapter.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/adapter/MyViewedAnimalsRvAdapter.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.my.adapter +package com.kuit.findu.presentation.ui.my.adapter import android.view.LayoutInflater import android.view.View @@ -7,9 +7,9 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.findu.databinding.ItemMyHistoryBinding -import com.example.findu.presentation.model.MyViewedAnimalsRv -import com.example.findu.presentation.type.AnimalStateType +import com.kuit.findu.databinding.ItemMyHistoryBinding +import com.kuit.findu.presentation.model.MyViewedAnimalsRv +import com.kuit.findu.presentation.type.AnimalStateType class MyViewedAnimalsRvAdapter( private val onKeepClick: (Long, Boolean, String) -> Unit, diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/dialog/MyDeleteHistoryDialog.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/dialog/MyDeleteHistoryDialog.kt similarity index 89% rename from app/src/main/java/com/example/findu/presentation/ui/my/dialog/MyDeleteHistoryDialog.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/dialog/MyDeleteHistoryDialog.kt index 7190d488..b7349829 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/dialog/MyDeleteHistoryDialog.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/dialog/MyDeleteHistoryDialog.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.my.dialog +package com.kuit.findu.presentation.ui.my.dialog import android.app.Dialog import android.content.Context @@ -6,7 +6,7 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.LayoutInflater -import com.example.findu.databinding.DialogMyDeleteHistoryBinding +import com.kuit.findu.databinding.DialogMyDeleteHistoryBinding class MyDeleteHistoryDialog( context: Context, diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/dialog/MyLogoutDialog.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/dialog/MyLogoutDialog.kt similarity index 77% rename from app/src/main/java/com/example/findu/presentation/ui/my/dialog/MyLogoutDialog.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/dialog/MyLogoutDialog.kt index 6f12863c..20036ef5 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/dialog/MyLogoutDialog.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/dialog/MyLogoutDialog.kt @@ -1,15 +1,12 @@ -package com.example.findu.presentation.ui.my.dialog +package com.kuit.findu.presentation.ui.my.dialog import android.app.Dialog import android.content.Context -import android.content.Intent import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.LayoutInflater -import com.example.findu.databinding.DialogLogoutBinding -import com.example.findu.databinding.DialogMyWithdrawalBinding -import com.example.findu.presentation.ui.main.MainActivity +import com.kuit.findu.databinding.DialogLogoutBinding class MyLogoutDialog( context: Context, diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/dialog/MyNicknameDialog.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/dialog/MyNicknameDialog.kt similarity index 97% rename from app/src/main/java/com/example/findu/presentation/ui/my/dialog/MyNicknameDialog.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/dialog/MyNicknameDialog.kt index b99e4ca0..1e924d2f 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/dialog/MyNicknameDialog.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/dialog/MyNicknameDialog.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.my.dialog +package com.kuit.findu.presentation.ui.my.dialog import android.app.AlertDialog import android.content.Context @@ -10,8 +10,8 @@ import android.view.View import android.widget.* import androidx.core.content.ContextCompat import androidx.core.widget.addTextChangedListener -import com.example.findu.R -import com.example.findu.databinding.DialogMyNicknameEditBinding +import com.kuit.findu.R +import com.kuit.findu.databinding.DialogMyNicknameEditBinding class MyNicknameDialog( context: Context, diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/dialog/MyProfileImageDialog.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/dialog/MyProfileImageDialog.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/ui/my/dialog/MyProfileImageDialog.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/dialog/MyProfileImageDialog.kt index 517eeb98..ebcfe69b 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/dialog/MyProfileImageDialog.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/dialog/MyProfileImageDialog.kt @@ -1,14 +1,13 @@ -package com.example.findu.presentation.ui.my.dialog +package com.kuit.findu.presentation.ui.my.dialog import android.app.Dialog import android.content.Context -import android.content.Intent import android.net.Uri import android.os.Bundle import android.view.LayoutInflater import android.view.Window -import com.example.findu.R -import com.example.findu.databinding.DialogMyProfileImageBinding +import com.kuit.findu.R +import com.kuit.findu.databinding.DialogMyProfileImageBinding class MyProfileImageDialog( context: Context, diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/dialog/MyWithdrawalDialog.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/dialog/MyWithdrawalDialog.kt similarity index 89% rename from app/src/main/java/com/example/findu/presentation/ui/my/dialog/MyWithdrawalDialog.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/dialog/MyWithdrawalDialog.kt index 394ad143..933827a0 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/dialog/MyWithdrawalDialog.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/dialog/MyWithdrawalDialog.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.my.dialog +package com.kuit.findu.presentation.ui.my.dialog import android.app.Dialog import android.content.Context @@ -6,7 +6,7 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.LayoutInflater -import com.example.findu.databinding.DialogMyWithdrawalBinding +import com.kuit.findu.databinding.DialogMyWithdrawalBinding class MyWithdrawalDialog( context: Context, diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/inquiry/MyInquireFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/inquiry/MyInquireFragment.kt similarity index 97% rename from app/src/main/java/com/example/findu/presentation/ui/my/inquiry/MyInquireFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/inquiry/MyInquireFragment.kt index 4c8eceab..d5039135 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/inquiry/MyInquireFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/inquiry/MyInquireFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.my.inquiry +package com.kuit.findu.presentation.ui.my.inquiry import android.content.res.ColorStateList import android.os.Bundle @@ -15,11 +15,11 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import com.example.findu.R -import com.example.findu.databinding.FragmentMyInquireBinding -import com.example.findu.presentation.ui.my.viewmodel.InquiryViewModel +import com.kuit.findu.presentation.ui.my.viewmodel.InquiryViewModel import com.google.android.material.chip.Chip import com.google.android.material.textfield.TextInputLayout +import com.kuit.findu.R +import com.kuit.findu.databinding.FragmentMyInquireBinding import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/model/ProfileImageType.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/model/ProfileImageType.kt similarity index 86% rename from app/src/main/java/com/example/findu/presentation/ui/my/model/ProfileImageType.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/model/ProfileImageType.kt index beb57a3f..0148754d 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/model/ProfileImageType.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/model/ProfileImageType.kt @@ -1,7 +1,7 @@ -package com.example.findu.presentation.ui.my.model +package com.kuit.findu.presentation.ui.my.model import androidx.annotation.DrawableRes -import com.example.findu.R +import com.kuit.findu.R enum class ProfileImageType( diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/viewmodel/InquiryViewModel.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/viewmodel/InquiryViewModel.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/ui/my/viewmodel/InquiryViewModel.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/viewmodel/InquiryViewModel.kt index 03ea265f..c0fc4b0a 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/viewmodel/InquiryViewModel.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/viewmodel/InquiryViewModel.kt @@ -1,8 +1,8 @@ -package com.example.findu.presentation.ui.my.viewmodel +package com.kuit.findu.presentation.ui.my.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.findu.domain.usecase.PostInquiryUseCase +import com.kuit.findu.domain.usecase.PostInquiryUseCase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/example/findu/presentation/ui/my/viewmodel/MyViewModel.kt b/app/src/main/java/com/kuit/findu/presentation/ui/my/viewmodel/MyViewModel.kt similarity index 85% rename from app/src/main/java/com/example/findu/presentation/ui/my/viewmodel/MyViewModel.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/my/viewmodel/MyViewModel.kt index 024ad784..977b43d8 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/my/viewmodel/MyViewModel.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/my/viewmodel/MyViewModel.kt @@ -1,28 +1,28 @@ -package com.example.findu.presentation.ui.my.viewmodel +package com.kuit.findu.presentation.ui.my.viewmodel import android.content.Context import android.net.Uri import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.findu.domain.model.my.MyProfileData -import com.example.findu.domain.model.my.MyProfileImageUpdate -import com.example.findu.domain.usecase.interest.DeleteInterestAnimalUseCase -import com.example.findu.domain.usecase.interest.PostInterestAnimalUseCase -import com.example.findu.domain.usecase.my.DeleteUserUseCase -import com.example.findu.domain.usecase.my.GetInterestUseCase -import com.example.findu.domain.usecase.my.GetNickNameUseCase -import com.example.findu.domain.usecase.my.GetReportHistoryUseCase -import com.example.findu.domain.usecase.my.GetViewedAnimalUseCase -import com.example.findu.domain.usecase.my.PatchNickNameUseCase -import com.example.findu.domain.usecase.my.PatchProfileImageUseCase -import com.example.findu.domain.usecase.report.DeleteReportUseCase -import com.example.findu.domain.usecase.token.ClearTokenUseCase -import com.example.findu.presentation.mapper.todomain.toRvModel -import com.example.findu.presentation.model.MyInterestRv -import com.example.findu.presentation.model.MyReportHistoryRv -import com.example.findu.presentation.model.MyViewedAnimalsRv -import com.example.findu.presentation.util.UriUtil.toSingleImageFile +import com.kuit.findu.domain.model.my.MyProfileData +import com.kuit.findu.domain.model.my.MyProfileImageUpdate +import com.kuit.findu.domain.usecase.interest.DeleteInterestAnimalUseCase +import com.kuit.findu.domain.usecase.interest.PostInterestAnimalUseCase +import com.kuit.findu.domain.usecase.my.DeleteUserUseCase +import com.kuit.findu.domain.usecase.my.GetInterestUseCase +import com.kuit.findu.domain.usecase.my.GetNickNameUseCase +import com.kuit.findu.domain.usecase.my.GetReportHistoryUseCase +import com.kuit.findu.domain.usecase.my.GetViewedAnimalUseCase +import com.kuit.findu.domain.usecase.my.PatchNickNameUseCase +import com.kuit.findu.domain.usecase.my.PatchProfileImageUseCase +import com.kuit.findu.domain.usecase.report.DeleteReportUseCase +import com.kuit.findu.domain.usecase.token.ClearTokenUseCase +import com.kuit.findu.presentation.mapper.todomain.toRvModel +import com.kuit.findu.presentation.model.MyInterestRv +import com.kuit.findu.presentation.model.MyReportHistoryRv +import com.kuit.findu.presentation.model.MyViewedAnimalsRv +import com.kuit.findu.presentation.util.UriUtil.toSingleImageFile import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow @@ -30,6 +30,7 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import java.io.File import javax.inject.Inject @HiltViewModel @@ -43,8 +44,8 @@ class MyViewModel @Inject constructor( private val postInterestAnimalUseCase: PostInterestAnimalUseCase, private val deleteInterestAnimalUseCase: DeleteInterestAnimalUseCase, private val deleteReportUseCase: DeleteReportUseCase, - private val patchProfileImageUseCase : PatchProfileImageUseCase, - private val clearTokenUseCase: ClearTokenUseCase + private val patchProfileImageUseCase: PatchProfileImageUseCase, + private val clearTokenUseCase: ClearTokenUseCase, ) : ViewModel() { private val _interestAnimals = MutableStateFlow>(emptyList()) @@ -150,7 +151,7 @@ class MyViewModel @Inject constructor( fun updateProfileImageFromGallery(context: Context, uri: Uri) { viewModelScope.launch { - var file: java.io.File? = null + var file: File? = null try { file = withContext(Dispatchers.IO) { uri.toSingleImageFile(context) diff --git a/app/src/main/java/com/example/findu/presentation/ui/onboarding/OnboardingActivity.kt b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/OnboardingActivity.kt similarity index 90% rename from app/src/main/java/com/example/findu/presentation/ui/onboarding/OnboardingActivity.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/onboarding/OnboardingActivity.kt index 4d5df5f0..80f5769e 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/onboarding/OnboardingActivity.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/OnboardingActivity.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.onboarding +package com.kuit.findu.presentation.ui.onboarding import android.content.Intent import android.os.Bundle @@ -12,9 +12,9 @@ import androidx.compose.runtime.getValue import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import com.example.findu.presentation.ui.main.MainActivity -import com.example.findu.presentation.ui.onboarding.composeview.OnboardingScreen -import com.example.findu.presentation.ui.onboarding.viewmodel.OnboardingViewModel +import com.kuit.findu.presentation.ui.main.MainActivity +import com.kuit.findu.presentation.ui.onboarding.composeview.OnboardingScreen +import com.kuit.findu.presentation.ui.onboarding.viewmodel.OnboardingViewModel import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/findu/presentation/ui/onboarding/component/OnboardingButton.kt b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/component/OnboardingButton.kt similarity index 82% rename from app/src/main/java/com/example/findu/presentation/ui/onboarding/component/OnboardingButton.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/onboarding/component/OnboardingButton.kt index 0efe09fa..1f6ba40f 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/onboarding/component/OnboardingButton.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/component/OnboardingButton.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.onboarding.component +package com.kuit.findu.presentation.ui.onboarding.component import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxWidth @@ -9,10 +9,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.presentation.util.extension.roundedBackgroundWithPadding -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.presentation.util.extension.roundedBackgroundWithPadding +import com.kuit.findu.ui.theme.FindUTheme @Composable fun OnboardingButton( diff --git a/app/src/main/java/com/example/findu/presentation/ui/onboarding/component/OnboardingNickname.kt b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/component/OnboardingNickname.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/ui/onboarding/component/OnboardingNickname.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/onboarding/component/OnboardingNickname.kt index b0e88868..ade59e9e 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/onboarding/component/OnboardingNickname.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/component/OnboardingNickname.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.onboarding.component +package com.kuit.findu.presentation.ui.onboarding.component import androidx.compose.foundation.border import androidx.compose.foundation.interaction.MutableInteractionSource @@ -26,12 +26,12 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.example.findu.R -import com.example.findu.presentation.type.NicknameValidType -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.presentation.util.extension.roundedBackgroundWithPadding -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.type.NicknameValidType +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.presentation.util.extension.roundedBackgroundWithPadding +import com.kuit.findu.ui.theme.FindUTheme @Composable fun OnboardingNickname( diff --git a/app/src/main/java/com/example/findu/presentation/ui/onboarding/component/OnboardingNicknameTextBox.kt b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/component/OnboardingNicknameTextBox.kt similarity index 87% rename from app/src/main/java/com/example/findu/presentation/ui/onboarding/component/OnboardingNicknameTextBox.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/onboarding/component/OnboardingNicknameTextBox.kt index e5848d74..adeab836 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/onboarding/component/OnboardingNicknameTextBox.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/component/OnboardingNicknameTextBox.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.onboarding.component +package com.kuit.findu.presentation.ui.onboarding.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -16,10 +16,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.example.findu.R -import com.example.findu.presentation.util.extension.roundedBackgroundWithPadding -import com.example.findu.presentation.util.shape.TriangleShape -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.util.extension.roundedBackgroundWithPadding +import com.kuit.findu.presentation.util.shape.TriangleShape +import com.kuit.findu.ui.theme.FindUTheme @Composable fun OnboardingNicknameTextBox(modifier: Modifier = Modifier, isVisible: Boolean = false) { diff --git a/app/src/main/java/com/example/findu/presentation/ui/onboarding/component/OnboardingProfile.kt b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/component/OnboardingProfile.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/ui/onboarding/component/OnboardingProfile.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/onboarding/component/OnboardingProfile.kt index 96c3dd37..15ea494f 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/onboarding/component/OnboardingProfile.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/component/OnboardingProfile.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.onboarding.component +package com.kuit.findu.presentation.ui.onboarding.component import android.net.Uri import androidx.compose.foundation.Image @@ -20,11 +20,11 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.example.findu.R -import com.example.findu.presentation.type.DefaultProfileType -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.type.DefaultProfileType +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun OnboardingProfile( diff --git a/app/src/main/java/com/example/findu/presentation/ui/onboarding/component/OnboardingProfileBox.kt b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/component/OnboardingProfileBox.kt similarity index 87% rename from app/src/main/java/com/example/findu/presentation/ui/onboarding/component/OnboardingProfileBox.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/onboarding/component/OnboardingProfileBox.kt index 02886a1f..046c2cf0 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/onboarding/component/OnboardingProfileBox.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/component/OnboardingProfileBox.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.onboarding.component +package com.kuit.findu.presentation.ui.onboarding.component import android.net.Uri import androidx.compose.foundation.Image @@ -15,11 +15,11 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import coil.compose.AsyncImage -import com.example.findu.R -import com.example.findu.presentation.type.DefaultProfileType -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.type.DefaultProfileType +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun OnboardingProfileBox( diff --git a/app/src/main/java/com/example/findu/presentation/ui/onboarding/composeview/OnboardingScreen.kt b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/composeview/OnboardingScreen.kt similarity index 83% rename from app/src/main/java/com/example/findu/presentation/ui/onboarding/composeview/OnboardingScreen.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/onboarding/composeview/OnboardingScreen.kt index 353dcfea..982332c8 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/onboarding/composeview/OnboardingScreen.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/composeview/OnboardingScreen.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.onboarding.composeview +package com.kuit.findu.presentation.ui.onboarding.composeview import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -14,16 +14,16 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.presentation.type.DefaultProfileType -import com.example.findu.presentation.type.NicknameValidType -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.ui.onboarding.component.OnboardingButton -import com.example.findu.presentation.ui.onboarding.component.OnboardingNickname -import com.example.findu.presentation.ui.onboarding.component.OnboardingProfile -import com.example.findu.presentation.ui.onboarding.viewmodel.OnboardingUiState -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.type.DefaultProfileType +import com.kuit.findu.presentation.type.NicknameValidType +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.ui.onboarding.component.OnboardingButton +import com.kuit.findu.presentation.ui.onboarding.component.OnboardingNickname +import com.kuit.findu.presentation.ui.onboarding.component.OnboardingProfile +import com.kuit.findu.presentation.ui.onboarding.viewmodel.OnboardingUiState +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun OnboardingScreen( diff --git a/app/src/main/java/com/example/findu/presentation/ui/onboarding/viewmodel/OnboardingViewModel.kt b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/viewmodel/OnboardingViewModel.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/onboarding/viewmodel/OnboardingViewModel.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/onboarding/viewmodel/OnboardingViewModel.kt index ef61d5f5..b3a0e52a 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/onboarding/viewmodel/OnboardingViewModel.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/onboarding/viewmodel/OnboardingViewModel.kt @@ -1,14 +1,14 @@ -package com.example.findu.presentation.ui.onboarding.viewmodel +package com.kuit.findu.presentation.ui.onboarding.viewmodel import android.content.Context import android.net.Uri import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.findu.domain.usecase.auth.PostCheckNicknameUseCase -import com.example.findu.domain.usecase.auth.PostSignupUseCase -import com.example.findu.presentation.type.DefaultProfileType -import com.example.findu.presentation.type.NicknameValidType +import com.kuit.findu.domain.usecase.auth.PostCheckNicknameUseCase +import com.kuit.findu.domain.usecase.auth.PostSignupUseCase +import com.kuit.findu.presentation.type.DefaultProfileType +import com.kuit.findu.presentation.type.NicknameValidType import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.flow.MutableSharedFlow @@ -23,7 +23,7 @@ import javax.inject.Inject data class OnboardingUiState( val pageState: Int = 1, - val kakaoId:Long = -1L, + val kakaoId: Long = -1L, val profileImageUri: Uri? = null, val defaultProfileType: DefaultProfileType = DefaultProfileType.DEFAULT, val nickname: String = "", @@ -34,7 +34,7 @@ data class OnboardingUiState( class OnboardingViewModel @Inject constructor( @ApplicationContext private val context: Context, private val postCheckNicknameUseCase: PostCheckNicknameUseCase, - private val postSignupUseCase: PostSignupUseCase + private val postSignupUseCase: PostSignupUseCase, ) : ViewModel() { private val _uiState = MutableStateFlow(OnboardingUiState()) val uiState: StateFlow = _uiState.asStateFlow() @@ -121,7 +121,7 @@ class OnboardingViewModel @Inject constructor( kakaoId = uiState.value.kakaoId ).onSuccess { startMainActivity() - }.onFailure {e-> + }.onFailure { e -> Log.d("http", "Error Message: : $e") } } diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/MissingReportFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/MissingReportFragment.kt similarity index 90% rename from app/src/main/java/com/example/findu/presentation/ui/report/MissingReportFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/MissingReportFragment.kt index 20d94c9f..92a9bb8e 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/MissingReportFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/MissingReportFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report +package com.kuit.findu.presentation.ui.report import android.Manifest import android.content.Intent @@ -23,8 +23,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.platform.ViewCompositionStrategy -import androidx.core.content.ContentProviderCompat.requireContext -import androidx.core.content.ContextCompat.startActivity import androidx.core.net.toUri import androidx.fragment.app.Fragment import androidx.fragment.app.setFragmentResultListener @@ -32,21 +30,20 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle -import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.compose.rememberNavController import androidx.navigation.fragment.findNavController -import com.example.findu.databinding.FragmentMissingReportBinding -import com.example.findu.presentation.type.PermissionType -import com.example.findu.presentation.type.report.ReportType -import com.example.findu.presentation.ui.report.constants.ReportConstants -import com.example.findu.presentation.ui.report.dialog.ReportFinishDialog -import com.example.findu.presentation.ui.report.dialog.ReportLocationActivity -import com.example.findu.presentation.ui.report.dialog.ReportLocationDialog -import com.example.findu.presentation.ui.report.navigation.MissingReportNavHost -import com.example.findu.presentation.ui.report.navigation.MissingReportRoute -import com.example.findu.presentation.ui.report.viewmodel.MissingReportUiEffect -import com.example.findu.presentation.ui.report.viewmodel.MissingReportUiEvent -import com.example.findu.presentation.ui.report.viewmodel.MissingReportViewModel +import com.kuit.findu.databinding.FragmentMissingReportBinding +import com.kuit.findu.presentation.type.PermissionType +import com.kuit.findu.presentation.type.report.ReportType +import com.kuit.findu.presentation.ui.report.constants.ReportConstants +import com.kuit.findu.presentation.ui.report.dialog.ReportFinishDialog +import com.kuit.findu.presentation.ui.report.dialog.ReportLocationActivity +import com.kuit.findu.presentation.ui.report.dialog.ReportLocationDialog +import com.kuit.findu.presentation.ui.report.navigation.MissingReportNavHost +import com.kuit.findu.presentation.ui.report.navigation.MissingReportRoute +import com.kuit.findu.presentation.ui.report.viewmodel.MissingReportUiEffect +import com.kuit.findu.presentation.ui.report.viewmodel.MissingReportUiEvent +import com.kuit.findu.presentation.ui.report.viewmodel.MissingReportViewModel import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.isGranted import com.google.accompanist.permissions.rememberPermissionState diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/ReportCameraFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/ReportCameraFragment.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/report/ReportCameraFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/ReportCameraFragment.kt index b32b58b7..7de07f71 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/ReportCameraFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/ReportCameraFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report +package com.kuit.findu.presentation.ui.report import android.Manifest import android.content.ContentValues @@ -21,10 +21,10 @@ import androidx.core.content.ContextCompat import androidx.core.os.bundleOf import androidx.fragment.app.setFragmentResult import androidx.navigation.fragment.findNavController -import com.example.findu.databinding.FragmentReportCameraBinding -import com.example.findu.presentation.ui.report.constants.ReportConstants.IMAGE_RESULT_KEY -import com.example.findu.presentation.ui.report.constants.ReportConstants.IMAGE_URI -import com.example.findu.presentation.util.PermissionUtils.hasCameraPermission +import com.kuit.findu.databinding.FragmentReportCameraBinding +import com.kuit.findu.presentation.ui.report.constants.ReportConstants.IMAGE_RESULT_KEY +import com.kuit.findu.presentation.ui.report.constants.ReportConstants.IMAGE_URI +import com.kuit.findu.presentation.util.PermissionUtils.hasCameraPermission import dagger.hilt.android.AndroidEntryPoint import java.text.SimpleDateFormat import java.util.Locale diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/WitnessReportFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/WitnessReportFragment.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/report/WitnessReportFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/WitnessReportFragment.kt index 48de36de..629549e5 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/WitnessReportFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/WitnessReportFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report +package com.kuit.findu.presentation.ui.report import android.Manifest import android.content.Intent @@ -32,18 +32,18 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle import androidx.navigation.compose.rememberNavController import androidx.navigation.fragment.findNavController -import com.example.findu.databinding.FragmentWitnessReportBinding -import com.example.findu.presentation.type.PermissionType -import com.example.findu.presentation.type.report.ReportType -import com.example.findu.presentation.ui.report.constants.ReportConstants -import com.example.findu.presentation.ui.report.dialog.ReportFinishDialog -import com.example.findu.presentation.ui.report.dialog.ReportLocationActivity -import com.example.findu.presentation.ui.report.dialog.ReportLocationDialog -import com.example.findu.presentation.ui.report.navigation.WitnessReportNavHost -import com.example.findu.presentation.ui.report.navigation.WitnessReportRoute -import com.example.findu.presentation.ui.report.viewmodel.WitnessReportUiEffect -import com.example.findu.presentation.ui.report.viewmodel.WitnessReportUiEvent -import com.example.findu.presentation.ui.report.viewmodel.WitnessReportViewModel +import com.kuit.findu.databinding.FragmentWitnessReportBinding +import com.kuit.findu.presentation.type.PermissionType +import com.kuit.findu.presentation.type.report.ReportType +import com.kuit.findu.presentation.ui.report.constants.ReportConstants +import com.kuit.findu.presentation.ui.report.dialog.ReportFinishDialog +import com.kuit.findu.presentation.ui.report.dialog.ReportLocationActivity +import com.kuit.findu.presentation.ui.report.dialog.ReportLocationDialog +import com.kuit.findu.presentation.ui.report.navigation.WitnessReportNavHost +import com.kuit.findu.presentation.ui.report.navigation.WitnessReportRoute +import com.kuit.findu.presentation.ui.report.viewmodel.WitnessReportUiEffect +import com.kuit.findu.presentation.ui.report.viewmodel.WitnessReportUiEvent +import com.kuit.findu.presentation.ui.report.viewmodel.WitnessReportViewModel import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.isGranted import com.google.accompanist.permissions.rememberPermissionState diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/adapter/ReportBreedAdapter.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/adapter/ReportBreedAdapter.kt similarity index 86% rename from app/src/main/java/com/example/findu/presentation/ui/report/adapter/ReportBreedAdapter.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/adapter/ReportBreedAdapter.kt index 1588262d..15b00566 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/adapter/ReportBreedAdapter.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/adapter/ReportBreedAdapter.kt @@ -1,13 +1,13 @@ -package com.example.findu.presentation.ui.report.adapter +package com.kuit.findu.presentation.ui.report.adapter import android.content.Context import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter -import com.example.findu.R -import com.example.findu.databinding.ItemReportBreedsBinding -import com.example.findu.presentation.ui.report.model.ReportDummys +import com.kuit.findu.R +import com.kuit.findu.databinding.ItemReportBreedsBinding +import com.kuit.findu.presentation.ui.report.model.ReportDummys class ReportBreedAdapter( context: Context, diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportDateBottomSheet.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportDateBottomSheet.kt similarity index 96% rename from app/src/main/java/com/example/findu/presentation/ui/report/component/ReportDateBottomSheet.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportDateBottomSheet.kt index 09b5b588..b17054b0 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportDateBottomSheet.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportDateBottomSheet.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.component +package com.kuit.findu.presentation.ui.report.component import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -34,11 +34,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.presentation.ui.base.FindUButton -import com.example.findu.presentation.ui.base.VerticalSpacer -import com.example.findu.presentation.ui.common.WheelPicker -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.ui.base.FindUButton +import com.kuit.findu.presentation.ui.base.VerticalSpacer +import com.kuit.findu.presentation.ui.common.WheelPicker +import com.kuit.findu.ui.theme.FindUTheme import kotlinx.datetime.LocalDateTime import java.time.YearMonth diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportDateComponent.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportDateComponent.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/report/component/ReportDateComponent.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportDateComponent.kt index 6fb75c33..d9158968 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportDateComponent.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportDateComponent.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.component +package com.kuit.findu.presentation.ui.report.component import androidx.annotation.StringRes import androidx.compose.foundation.border @@ -16,9 +16,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme import java.time.LocalDateTime import java.time.format.DateTimeFormatter import java.util.Locale diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportDescriptionComponent.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportDescriptionComponent.kt similarity index 89% rename from app/src/main/java/com/example/findu/presentation/ui/report/component/ReportDescriptionComponent.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportDescriptionComponent.kt index 74b8b1d5..20571ffd 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportDescriptionComponent.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportDescriptionComponent.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.component +package com.kuit.findu.presentation.ui.report.component import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement @@ -16,10 +16,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.presentation.ui.base.HorizontalSpacer -import com.example.findu.presentation.ui.base.RoundedInputField -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.ui.base.HorizontalSpacer +import com.kuit.findu.presentation.ui.base.RoundedInputField +import com.kuit.findu.ui.theme.FindUTheme @Composable fun ReportDescriptionComponent( diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportFurColorComponent.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportFurColorComponent.kt similarity index 96% rename from app/src/main/java/com/example/findu/presentation/ui/report/component/ReportFurColorComponent.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportFurColorComponent.kt index 414952b4..53e870c8 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportFurColorComponent.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportFurColorComponent.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.component +package com.kuit.findu.presentation.ui.report.component import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -31,10 +31,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.domain.model.report.FurColorType -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.report.FurColorType +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @OptIn(ExperimentalLayoutApi::class) @Composable diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportImageComponent.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportImageComponent.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/report/component/ReportImageComponent.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportImageComponent.kt index 53e37f9d..d2255d60 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportImageComponent.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportImageComponent.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.component +package com.kuit.findu.presentation.ui.report.component import android.net.Uri import androidx.compose.animation.core.animateDpAsState @@ -37,13 +37,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.coerceAtLeast import androidx.compose.ui.unit.dp import coil.compose.AsyncImage -import com.example.findu.R -import com.example.findu.presentation.type.report.ReportType -import com.example.findu.presentation.ui.base.BaseVectorIcon -import com.example.findu.presentation.ui.base.FindUButton -import com.example.findu.presentation.ui.base.VerticalSpacer -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.type.report.ReportType +import com.kuit.findu.presentation.ui.base.BaseVectorIcon +import com.kuit.findu.presentation.ui.base.FindUButton +import com.kuit.findu.presentation.ui.base.VerticalSpacer +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun ReportImageComponent( diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportImageDialog.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportImageDialog.kt similarity index 95% rename from app/src/main/java/com/example/findu/presentation/ui/report/component/ReportImageDialog.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportImageDialog.kt index f20fec3d..2a5afa2e 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportImageDialog.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportImageDialog.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.component +package com.kuit.findu.presentation.ui.report.component import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -21,10 +21,10 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog -import com.example.findu.R -import com.example.findu.presentation.ui.base.VerticalSpacer -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.ui.base.VerticalSpacer +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun ReportImageDialog( diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportInputComponent.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportInputComponent.kt similarity index 90% rename from app/src/main/java/com/example/findu/presentation/ui/report/component/ReportInputComponent.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportInputComponent.kt index acfa6494..b0f13fd7 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportInputComponent.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportInputComponent.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.component +package com.kuit.findu.presentation.ui.report.component import androidx.annotation.StringRes import androidx.compose.foundation.interaction.MutableInteractionSource @@ -15,9 +15,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.presentation.ui.base.RoundedInputField -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.ui.base.RoundedInputField +import com.kuit.findu.ui.theme.FindUTheme @Composable fun ReportInputComponent( diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportLocationComponent.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportLocationComponent.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/ui/report/component/ReportLocationComponent.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportLocationComponent.kt index 11e31cb8..78b8d3ed 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/component/ReportLocationComponent.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/ReportLocationComponent.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.component +package com.kuit.findu.presentation.ui.report.component import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -17,7 +17,6 @@ import androidx.compose.material.Text import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color @@ -27,14 +26,12 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.presentation.ui.base.VerticalSpacer -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.ui.base.VerticalSpacer +import com.kuit.findu.ui.theme.FindUTheme import com.naver.maps.map.compose.CameraPositionState import com.naver.maps.map.compose.ExperimentalNaverMapApi import com.naver.maps.map.compose.MapUiSettings -import com.naver.maps.map.compose.MarkerComposable -import com.naver.maps.map.compose.MarkerState import com.naver.maps.map.compose.NaverMap @OptIn(ExperimentalNaverMapApi::class) diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/component/animalinfo/ReportAgeComponent.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/animalinfo/ReportAgeComponent.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/ui/report/component/animalinfo/ReportAgeComponent.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/component/animalinfo/ReportAgeComponent.kt index 81ba3432..ebe3d3fe 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/component/animalinfo/ReportAgeComponent.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/animalinfo/ReportAgeComponent.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.component.animalinfo +package com.kuit.findu.presentation.ui.report.component.animalinfo import androidx.compose.foundation.border import androidx.compose.foundation.interaction.MutableInteractionSource @@ -23,10 +23,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.presentation.ui.base.HorizontalSpacer -import com.example.findu.presentation.util.extension.isNotDigit -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.ui.base.HorizontalSpacer +import com.kuit.findu.presentation.util.extension.isNotDigit +import com.kuit.findu.ui.theme.FindUTheme @Composable fun ReportAgeComponent( diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/component/animalinfo/ReportBreedComponent.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/animalinfo/ReportBreedComponent.kt similarity index 97% rename from app/src/main/java/com/example/findu/presentation/ui/report/component/animalinfo/ReportBreedComponent.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/component/animalinfo/ReportBreedComponent.kt index ce3ab823..828ccd3e 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/component/animalinfo/ReportBreedComponent.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/animalinfo/ReportBreedComponent.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.component.animalinfo +package com.kuit.findu.presentation.ui.report.component.animalinfo import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.expandVertically @@ -48,10 +48,10 @@ import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.domain.model.breed.Breed -import com.example.findu.presentation.ui.base.VerticalSpacer -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.breed.Breed +import com.kuit.findu.presentation.ui.base.VerticalSpacer +import com.kuit.findu.ui.theme.FindUTheme import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.debounce import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/component/animalinfo/ReportSpeciesComponent.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/animalinfo/ReportSpeciesComponent.kt similarity index 95% rename from app/src/main/java/com/example/findu/presentation/ui/report/component/animalinfo/ReportSpeciesComponent.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/component/animalinfo/ReportSpeciesComponent.kt index 90b64092..488bb19d 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/component/animalinfo/ReportSpeciesComponent.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/animalinfo/ReportSpeciesComponent.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.component.animalinfo +package com.kuit.findu.presentation.ui.report.component.animalinfo import androidx.compose.animation.core.FastOutSlowInEasing import androidx.compose.animation.core.animateIntAsState @@ -30,10 +30,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.domain.model.breed.SpeciesType -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.breed.SpeciesType +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun ReportSpeciesComponent( diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/component/missing/MissingAnimalInfoComponent.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/missing/MissingAnimalInfoComponent.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/report/component/missing/MissingAnimalInfoComponent.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/component/missing/MissingAnimalInfoComponent.kt index d0b02ca4..35539169 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/component/missing/MissingAnimalInfoComponent.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/missing/MissingAnimalInfoComponent.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.component.missing +package com.kuit.findu.presentation.ui.report.component.missing import androidx.annotation.StringRes import androidx.compose.foundation.background @@ -18,11 +18,11 @@ import androidx.compose.ui.draw.shadow import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.domain.model.breed.SpeciesType -import com.example.findu.presentation.ui.base.VerticalSpacer -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.breed.SpeciesType +import com.kuit.findu.presentation.ui.base.VerticalSpacer +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun MissingAnimalInfoComponent( diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/component/missing/RFIDComponent.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/missing/RFIDComponent.kt similarity index 88% rename from app/src/main/java/com/example/findu/presentation/ui/report/component/missing/RFIDComponent.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/component/missing/RFIDComponent.kt index 637ef675..9fcf437f 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/component/missing/RFIDComponent.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/missing/RFIDComponent.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.component.missing +package com.kuit.findu.presentation.ui.report.component.missing import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement @@ -13,9 +13,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.presentation.ui.base.RoundedInputField -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.presentation.ui.base.RoundedInputField +import com.kuit.findu.ui.theme.FindUTheme @Composable fun RFIDComponent( diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/component/missing/ReportGenderComponent.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/missing/ReportGenderComponent.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/report/component/missing/ReportGenderComponent.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/component/missing/ReportGenderComponent.kt index eb4d76f2..937b40e2 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/component/missing/ReportGenderComponent.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/missing/ReportGenderComponent.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.component.missing +package com.kuit.findu.presentation.ui.report.component.missing import androidx.compose.animation.core.FastOutSlowInEasing import androidx.compose.animation.core.animateIntAsState @@ -28,10 +28,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.domain.model.report.Gender -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.report.Gender +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun ReportGenderComponent( diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/component/witness/WitnessAnimalInfoComponent.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/witness/WitnessAnimalInfoComponent.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/ui/report/component/witness/WitnessAnimalInfoComponent.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/component/witness/WitnessAnimalInfoComponent.kt index bcb41e23..5725053f 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/component/witness/WitnessAnimalInfoComponent.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/component/witness/WitnessAnimalInfoComponent.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.component.witness +package com.kuit.findu.presentation.ui.report.component.witness import androidx.annotation.StringRes import androidx.compose.foundation.background @@ -18,11 +18,11 @@ import androidx.compose.ui.draw.shadow import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.domain.model.breed.SpeciesType -import com.example.findu.presentation.ui.base.VerticalSpacer -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.breed.SpeciesType +import com.kuit.findu.presentation.ui.base.VerticalSpacer +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun WitnessAnimalInfoComponent( diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/constants/ReportConstants.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/constants/ReportConstants.kt similarity index 82% rename from app/src/main/java/com/example/findu/presentation/ui/report/constants/ReportConstants.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/constants/ReportConstants.kt index ab4f5311..6ec40a23 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/constants/ReportConstants.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/constants/ReportConstants.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.constants +package com.kuit.findu.presentation.ui.report.constants object ReportConstants { const val SCROLL_OFFSET = 220 diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/dialog/ReportFinishDialog.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/dialog/ReportFinishDialog.kt similarity index 82% rename from app/src/main/java/com/example/findu/presentation/ui/report/dialog/ReportFinishDialog.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/dialog/ReportFinishDialog.kt index 83691a38..42ed6c71 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/dialog/ReportFinishDialog.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/dialog/ReportFinishDialog.kt @@ -1,17 +1,14 @@ -package com.example.findu.presentation.ui.report.dialog +package com.kuit.findu.presentation.ui.report.dialog import android.app.Dialog import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.util.Log import android.view.LayoutInflater -import androidx.annotation.StringRes -import com.example.findu.R -import com.example.findu.databinding.DialogReportFinishedBinding -import com.example.findu.presentation.type.report.ReportType -import kotlinx.serialization.StringFormat +import com.kuit.findu.R +import com.kuit.findu.databinding.DialogReportFinishedBinding +import com.kuit.findu.presentation.type.report.ReportType class ReportFinishDialog( context: Context, diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/dialog/ReportImageDialog.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/dialog/ReportImageDialog.kt similarity index 89% rename from app/src/main/java/com/example/findu/presentation/ui/report/dialog/ReportImageDialog.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/dialog/ReportImageDialog.kt index 977773b2..5b71a705 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/dialog/ReportImageDialog.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/dialog/ReportImageDialog.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.dialog +package com.kuit.findu.presentation.ui.report.dialog import android.app.Dialog import android.content.Context @@ -6,7 +6,7 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.LayoutInflater -import com.example.findu.databinding.DialogReportImageBinding +import com.kuit.findu.databinding.DialogReportImageBinding class ReportImageDialog( context: Context, diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/dialog/ReportLocationActivity.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/dialog/ReportLocationActivity.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/report/dialog/ReportLocationActivity.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/dialog/ReportLocationActivity.kt index 1321523c..5aa4fa0f 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/dialog/ReportLocationActivity.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/dialog/ReportLocationActivity.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.dialog +package com.kuit.findu.presentation.ui.report.dialog import android.annotation.SuppressLint import android.content.Intent @@ -12,8 +12,8 @@ import androidx.appcompat.app.AppCompatActivity import androidx.webkit.WebViewAssetLoader import androidx.webkit.WebViewAssetLoader.AssetsPathHandler import androidx.webkit.WebViewClientCompat -import com.example.findu.databinding.ActivityReportLocationBinding -import com.example.findu.presentation.ui.report.dialog.ReportLocationDialog.Companion.POST_TAG +import com.kuit.findu.databinding.ActivityReportLocationBinding +import com.kuit.findu.presentation.ui.report.dialog.ReportLocationDialog.Companion.POST_TAG class ReportLocationActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/dialog/ReportLocationDialog.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/dialog/ReportLocationDialog.kt similarity index 91% rename from app/src/main/java/com/example/findu/presentation/ui/report/dialog/ReportLocationDialog.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/dialog/ReportLocationDialog.kt index c84f6796..bef0cd27 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/dialog/ReportLocationDialog.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/dialog/ReportLocationDialog.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.dialog +package com.kuit.findu.presentation.ui.report.dialog import android.Manifest import android.content.Intent @@ -7,7 +7,6 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.location.Location import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -20,14 +19,14 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import com.example.findu.BuildConfig -import com.example.findu.R -import com.example.findu.databinding.DialogReportLocationBinding -import com.example.findu.presentation.ui.report.viewmodel.LocationViewModel -import com.example.findu.presentation.util.PermissionUtils.REQUEST_CODE_LOCATION_PERMISSION -import com.example.findu.presentation.util.PermissionUtils.hasLocationPermission -import com.example.findu.presentation.util.PermissionUtils.requestLocationPermission -import com.example.findu.presentation.util.ViewUtils.addUnderLine +import com.kuit.findu.BuildConfig +import com.kuit.findu.R +import com.kuit.findu.databinding.DialogReportLocationBinding +import com.kuit.findu.presentation.ui.report.viewmodel.LocationViewModel +import com.kuit.findu.presentation.util.PermissionUtils.REQUEST_CODE_LOCATION_PERMISSION +import com.kuit.findu.presentation.util.PermissionUtils.hasLocationPermission +import com.kuit.findu.presentation.util.PermissionUtils.requestLocationPermission +import com.kuit.findu.presentation.util.ViewUtils.addUnderLine import com.google.android.gms.location.FusedLocationProviderClient import com.google.android.gms.location.LocationServices import com.naver.maps.geometry.LatLng diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/dialog/ReportNavigationDialog.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/dialog/ReportNavigationDialog.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/report/dialog/ReportNavigationDialog.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/dialog/ReportNavigationDialog.kt index adafb383..63341833 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/dialog/ReportNavigationDialog.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/dialog/ReportNavigationDialog.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.dialog +package com.kuit.findu.presentation.ui.report.dialog import android.app.Dialog import android.content.Context @@ -7,7 +7,7 @@ import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.Gravity import android.view.LayoutInflater -import com.example.findu.databinding.DialogReportNavigationBinding +import com.kuit.findu.databinding.DialogReportNavigationBinding class ReportNavigationDialog( context: Context, diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/model/GptUiState.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/model/GptUiState.kt similarity index 70% rename from app/src/main/java/com/example/findu/presentation/ui/report/model/GptUiState.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/model/GptUiState.kt index b6c46469..882dd7a4 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/model/GptUiState.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/model/GptUiState.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.model +package com.kuit.findu.presentation.ui.report.model sealed interface GptUiState { object Default : GptUiState diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/model/ReportDummys.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/model/ReportDummys.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/report/model/ReportDummys.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/model/ReportDummys.kt index 500c34d1..6edba7a6 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/model/ReportDummys.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/model/ReportDummys.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.model +package com.kuit.findu.presentation.ui.report.model import androidx.core.net.toUri diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/model/ReportUiState.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/model/ReportUiState.kt similarity index 79% rename from app/src/main/java/com/example/findu/presentation/ui/report/model/ReportUiState.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/model/ReportUiState.kt index ee67692e..ec1e5462 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/model/ReportUiState.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/model/ReportUiState.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.model +package com.kuit.findu.presentation.ui.report.model sealed interface ReportUiState { object Default : ReportUiState diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/navigation/MissingReportNavHost.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/navigation/MissingReportNavHost.kt similarity index 76% rename from app/src/main/java/com/example/findu/presentation/ui/report/navigation/MissingReportNavHost.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/navigation/MissingReportNavHost.kt index 1798e21c..b7a11e69 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/navigation/MissingReportNavHost.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/navigation/MissingReportNavHost.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.navigation +package com.kuit.findu.presentation.ui.report.navigation import androidx.compose.animation.core.tween import androidx.compose.animation.fadeIn @@ -8,10 +8,10 @@ import androidx.compose.runtime.Composable import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable -import com.example.findu.presentation.ui.report.screen.MissingReportAnimalInfoScreen -import com.example.findu.presentation.ui.report.screen.MissingReportScreen -import com.example.findu.presentation.ui.report.viewmodel.MissingReportUiEvent -import com.example.findu.presentation.ui.report.viewmodel.MissingReportUiState +import com.kuit.findu.presentation.ui.report.screen.MissingReportAnimalInfoScreen +import com.kuit.findu.presentation.ui.report.screen.MissingReportScreen +import com.kuit.findu.presentation.ui.report.viewmodel.MissingReportUiEvent +import com.kuit.findu.presentation.ui.report.viewmodel.MissingReportUiState @Composable fun MissingReportNavHost( diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/navigation/MissingReportRoute.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/navigation/MissingReportRoute.kt similarity index 78% rename from app/src/main/java/com/example/findu/presentation/ui/report/navigation/MissingReportRoute.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/navigation/MissingReportRoute.kt index 03657e33..eabb5d13 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/navigation/MissingReportRoute.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/navigation/MissingReportRoute.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.navigation +package com.kuit.findu.presentation.ui.report.navigation import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/navigation/WitnessReportNavHost.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/navigation/WitnessReportNavHost.kt similarity index 76% rename from app/src/main/java/com/example/findu/presentation/ui/report/navigation/WitnessReportNavHost.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/navigation/WitnessReportNavHost.kt index 83525958..edc1f846 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/navigation/WitnessReportNavHost.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/navigation/WitnessReportNavHost.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.navigation +package com.kuit.findu.presentation.ui.report.navigation import androidx.compose.animation.core.tween import androidx.compose.animation.fadeIn @@ -8,10 +8,10 @@ import androidx.compose.runtime.Composable import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable -import com.example.findu.presentation.ui.report.screen.WitnessReportAnimalInfoScreen -import com.example.findu.presentation.ui.report.screen.WitnessReportScreen -import com.example.findu.presentation.ui.report.viewmodel.WitnessReportUiEvent -import com.example.findu.presentation.ui.report.viewmodel.WitnessReportUiState +import com.kuit.findu.presentation.ui.report.screen.WitnessReportAnimalInfoScreen +import com.kuit.findu.presentation.ui.report.screen.WitnessReportScreen +import com.kuit.findu.presentation.ui.report.viewmodel.WitnessReportUiEvent +import com.kuit.findu.presentation.ui.report.viewmodel.WitnessReportUiState @Composable fun WitnessReportNavHost( diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/navigation/WitnessReportRoute.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/navigation/WitnessReportRoute.kt similarity index 78% rename from app/src/main/java/com/example/findu/presentation/ui/report/navigation/WitnessReportRoute.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/navigation/WitnessReportRoute.kt index c0064084..81b37db8 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/navigation/WitnessReportRoute.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/navigation/WitnessReportRoute.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.navigation +package com.kuit.findu.presentation.ui.report.navigation import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/screen/MissingReportScreen.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/screen/MissingReportScreen.kt similarity index 83% rename from app/src/main/java/com/example/findu/presentation/ui/report/screen/MissingReportScreen.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/screen/MissingReportScreen.kt index 65f43f32..c99e9f92 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/screen/MissingReportScreen.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/screen/MissingReportScreen.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.screen +package com.kuit.findu.presentation.ui.report.screen import android.net.Uri import androidx.activity.compose.BackHandler @@ -24,32 +24,31 @@ import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.domain.model.breed.Breed -import com.example.findu.domain.model.breed.SpeciesType -import com.example.findu.domain.model.report.FurColorType -import com.example.findu.presentation.type.report.ReportType -import com.example.findu.presentation.type.view.LoadState -import com.example.findu.presentation.ui.base.FindUButton -import com.example.findu.presentation.ui.base.FindUTopAppBar -import com.example.findu.presentation.ui.base.VerticalSpacer -import com.example.findu.presentation.ui.common.AppSettingDialog -import com.example.findu.presentation.ui.common.LoadingIndicatorDialog -import com.example.findu.presentation.ui.report.component.ReportDateBottomSheet -import com.example.findu.presentation.ui.report.component.ReportDateComponent -import com.example.findu.presentation.ui.report.component.ReportDescriptionComponent -import com.example.findu.presentation.ui.report.component.ReportFurColorComponent -import com.example.findu.presentation.ui.report.component.ReportImageComponent -import com.example.findu.presentation.ui.report.component.ReportImageDialog -import com.example.findu.presentation.ui.report.component.ReportInputComponent -import com.example.findu.presentation.ui.report.component.ReportLocationComponent -import com.example.findu.presentation.ui.report.component.missing.MissingAnimalInfoComponent -import com.example.findu.presentation.ui.report.component.missing.ReportGenderComponent -import com.example.findu.presentation.ui.report.viewmodel.MissingReportUiEvent -import com.example.findu.presentation.ui.report.viewmodel.MissingReportUiState -import com.example.findu.presentation.ui.report.viewmodel.WitnessReportUiEvent -import com.example.findu.presentation.util.extension.toKoreanDateString -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.breed.Breed +import com.kuit.findu.domain.model.breed.SpeciesType +import com.kuit.findu.domain.model.report.FurColorType +import com.kuit.findu.presentation.type.report.ReportType +import com.kuit.findu.presentation.type.view.LoadState +import com.kuit.findu.presentation.ui.base.FindUButton +import com.kuit.findu.presentation.ui.base.FindUTopAppBar +import com.kuit.findu.presentation.ui.base.VerticalSpacer +import com.kuit.findu.presentation.ui.common.AppSettingDialog +import com.kuit.findu.presentation.ui.common.LoadingIndicatorDialog +import com.kuit.findu.presentation.ui.report.component.ReportDateBottomSheet +import com.kuit.findu.presentation.ui.report.component.ReportDateComponent +import com.kuit.findu.presentation.ui.report.component.ReportDescriptionComponent +import com.kuit.findu.presentation.ui.report.component.ReportFurColorComponent +import com.kuit.findu.presentation.ui.report.component.ReportImageComponent +import com.kuit.findu.presentation.ui.report.component.ReportImageDialog +import com.kuit.findu.presentation.ui.report.component.ReportInputComponent +import com.kuit.findu.presentation.ui.report.component.ReportLocationComponent +import com.kuit.findu.presentation.ui.report.component.missing.MissingAnimalInfoComponent +import com.kuit.findu.presentation.ui.report.component.missing.ReportGenderComponent +import com.kuit.findu.presentation.ui.report.viewmodel.MissingReportUiEvent +import com.kuit.findu.presentation.ui.report.viewmodel.MissingReportUiState +import com.kuit.findu.presentation.util.extension.toKoreanDateString +import com.kuit.findu.ui.theme.FindUTheme import com.naver.maps.map.CameraPosition import com.naver.maps.map.compose.CameraPositionState import com.naver.maps.map.compose.rememberCameraPositionState diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/screen/ReportAnimalInfoScreen.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/screen/ReportAnimalInfoScreen.kt similarity index 85% rename from app/src/main/java/com/example/findu/presentation/ui/report/screen/ReportAnimalInfoScreen.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/screen/ReportAnimalInfoScreen.kt index a49df891..03add222 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/screen/ReportAnimalInfoScreen.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/screen/ReportAnimalInfoScreen.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.screen +package com.kuit.findu.presentation.ui.report.screen import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -14,21 +14,21 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.domain.model.breed.Breed -import com.example.findu.domain.model.breed.SpeciesType -import com.example.findu.presentation.ui.base.FindUButton -import com.example.findu.presentation.ui.base.FindUTopAppBar -import com.example.findu.presentation.ui.base.VerticalSpacer -import com.example.findu.presentation.ui.report.component.animalinfo.ReportAgeComponent -import com.example.findu.presentation.ui.report.component.animalinfo.ReportBreedComponent -import com.example.findu.presentation.ui.report.component.animalinfo.ReportSpeciesComponent -import com.example.findu.presentation.ui.report.viewmodel.MissingReportUiEvent -import com.example.findu.presentation.ui.report.viewmodel.MissingReportUiState -import com.example.findu.presentation.ui.report.viewmodel.WitnessReportUiEvent -import com.example.findu.presentation.ui.report.viewmodel.WitnessReportUiState -import com.example.findu.presentation.util.extension.noRippleClickable -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.breed.Breed +import com.kuit.findu.domain.model.breed.SpeciesType +import com.kuit.findu.presentation.ui.base.FindUButton +import com.kuit.findu.presentation.ui.base.FindUTopAppBar +import com.kuit.findu.presentation.ui.base.VerticalSpacer +import com.kuit.findu.presentation.ui.report.component.animalinfo.ReportAgeComponent +import com.kuit.findu.presentation.ui.report.component.animalinfo.ReportBreedComponent +import com.kuit.findu.presentation.ui.report.component.animalinfo.ReportSpeciesComponent +import com.kuit.findu.presentation.ui.report.viewmodel.MissingReportUiEvent +import com.kuit.findu.presentation.ui.report.viewmodel.MissingReportUiState +import com.kuit.findu.presentation.ui.report.viewmodel.WitnessReportUiEvent +import com.kuit.findu.presentation.ui.report.viewmodel.WitnessReportUiState +import com.kuit.findu.presentation.util.extension.noRippleClickable +import com.kuit.findu.ui.theme.FindUTheme @Composable fun WitnessReportAnimalInfoScreen( diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/screen/WitnessReportScreen.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/screen/WitnessReportScreen.kt similarity index 83% rename from app/src/main/java/com/example/findu/presentation/ui/report/screen/WitnessReportScreen.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/screen/WitnessReportScreen.kt index feb128fa..cb8378b0 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/screen/WitnessReportScreen.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/screen/WitnessReportScreen.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.screen +package com.kuit.findu.presentation.ui.report.screen import android.net.Uri import androidx.activity.compose.BackHandler @@ -23,38 +23,36 @@ import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.example.findu.R -import com.example.findu.domain.model.breed.Breed -import com.example.findu.domain.model.breed.SpeciesType -import com.example.findu.domain.model.report.FurColorType -import com.example.findu.presentation.type.report.ReportType -import com.example.findu.presentation.type.view.LoadState -import com.example.findu.presentation.ui.base.FindUButton -import com.example.findu.presentation.ui.base.FindUTopAppBar -import com.example.findu.presentation.ui.base.VerticalSpacer -import com.example.findu.presentation.ui.common.AppSettingDialog -import com.example.findu.presentation.ui.common.LoadingIndicatorDialog -import com.example.findu.presentation.ui.report.component.ReportDateBottomSheet -import com.example.findu.presentation.ui.report.component.ReportDateComponent -import com.example.findu.presentation.ui.report.component.ReportDescriptionComponent -import com.example.findu.presentation.ui.report.component.ReportFurColorComponent -import com.example.findu.presentation.ui.report.component.ReportImageComponent -import com.example.findu.presentation.ui.report.component.ReportImageDialog -import com.example.findu.presentation.ui.report.component.ReportLocationComponent -import com.example.findu.presentation.ui.report.component.witness.WitnessAnimalInfoComponent -import com.example.findu.presentation.ui.report.viewmodel.WitnessReportUiEvent -import com.example.findu.presentation.ui.report.viewmodel.WitnessReportUiState -import com.example.findu.presentation.util.extension.toKoreanDateString -import com.example.findu.ui.theme.FindUTheme +import com.kuit.findu.R +import com.kuit.findu.domain.model.breed.Breed +import com.kuit.findu.domain.model.breed.SpeciesType +import com.kuit.findu.domain.model.report.FurColorType +import com.kuit.findu.presentation.type.report.ReportType +import com.kuit.findu.presentation.type.view.LoadState +import com.kuit.findu.presentation.ui.base.FindUButton +import com.kuit.findu.presentation.ui.base.FindUTopAppBar +import com.kuit.findu.presentation.ui.base.VerticalSpacer +import com.kuit.findu.presentation.ui.common.AppSettingDialog +import com.kuit.findu.presentation.ui.common.LoadingIndicatorDialog +import com.kuit.findu.presentation.ui.report.component.ReportDateBottomSheet +import com.kuit.findu.presentation.ui.report.component.ReportDateComponent +import com.kuit.findu.presentation.ui.report.component.ReportDescriptionComponent +import com.kuit.findu.presentation.ui.report.component.ReportFurColorComponent +import com.kuit.findu.presentation.ui.report.component.ReportImageComponent +import com.kuit.findu.presentation.ui.report.component.ReportImageDialog +import com.kuit.findu.presentation.ui.report.component.ReportLocationComponent +import com.kuit.findu.presentation.ui.report.component.witness.WitnessAnimalInfoComponent +import com.kuit.findu.presentation.ui.report.viewmodel.WitnessReportUiEvent +import com.kuit.findu.presentation.ui.report.viewmodel.WitnessReportUiState +import com.kuit.findu.presentation.util.extension.toKoreanDateString +import com.kuit.findu.ui.theme.FindUTheme import com.naver.maps.map.CameraPosition import com.naver.maps.map.compose.CameraPositionState import com.naver.maps.map.compose.rememberCameraPositionState import kotlinx.coroutines.FlowPreview -import kotlinx.coroutines.flow.debounce import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch -import kotlinx.coroutines.time.debounce @OptIn(ExperimentalMaterialApi::class, FlowPreview::class) @Composable diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/viewmodel/LocationViewModel.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/viewmodel/LocationViewModel.kt similarity index 88% rename from app/src/main/java/com/example/findu/presentation/ui/report/viewmodel/LocationViewModel.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/viewmodel/LocationViewModel.kt index 6f6aced4..9fb43453 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/viewmodel/LocationViewModel.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/viewmodel/LocationViewModel.kt @@ -1,9 +1,8 @@ -package com.example.findu.presentation.ui.report.viewmodel +package com.kuit.findu.presentation.ui.report.viewmodel -import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.findu.domain.usecase.report.GetAddressUseCase +import com.kuit.findu.domain.usecase.report.GetAddressUseCase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/viewmodel/MissingReportViewModel.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/viewmodel/MissingReportViewModel.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/report/viewmodel/MissingReportViewModel.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/viewmodel/MissingReportViewModel.kt index c377017e..685aa7c0 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/viewmodel/MissingReportViewModel.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/viewmodel/MissingReportViewModel.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.viewmodel +package com.kuit.findu.presentation.ui.report.viewmodel import android.content.Context import android.net.Uri @@ -6,21 +6,21 @@ import android.util.Log import androidx.compose.foundation.text.input.TextFieldState import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.findu.domain.model.breed.Breed -import com.example.findu.domain.model.breed.BreedData -import com.example.findu.domain.model.breed.SpeciesType -import com.example.findu.domain.model.report.FurColorType -import com.example.findu.domain.model.report.Gender -import com.example.findu.domain.model.report.MissingReportData -import com.example.findu.domain.usecase.GetBreedDataUseCase -import com.example.findu.domain.usecase.report.GetAddressUseCase -import com.example.findu.domain.usecase.report.GetLatLngUseCase -import com.example.findu.domain.usecase.report.PostMissingReportUseCase -import com.example.findu.domain.usecase.report.UploadImagesUseCase -import com.example.findu.presentation.type.view.LoadState -import com.example.findu.presentation.util.UriUtil.toMultiPartBodys -import com.example.findu.presentation.util.extension.toDateString -import com.example.findu.presentation.util.extension.toNormalizeAddress +import com.kuit.findu.domain.model.breed.Breed +import com.kuit.findu.domain.model.breed.BreedData +import com.kuit.findu.domain.model.breed.SpeciesType +import com.kuit.findu.domain.model.report.FurColorType +import com.kuit.findu.domain.model.report.Gender +import com.kuit.findu.domain.model.report.MissingReportData +import com.kuit.findu.domain.usecase.GetBreedDataUseCase +import com.kuit.findu.domain.usecase.report.GetAddressUseCase +import com.kuit.findu.domain.usecase.report.GetLatLngUseCase +import com.kuit.findu.domain.usecase.report.PostMissingReportUseCase +import com.kuit.findu.domain.usecase.report.UploadImagesUseCase +import com.kuit.findu.presentation.type.view.LoadState +import com.kuit.findu.presentation.util.UriUtil.toMultiPartBodys +import com.kuit.findu.presentation.util.extension.toDateString +import com.kuit.findu.presentation.util.extension.toNormalizeAddress import com.naver.maps.geometry.LatLng import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext diff --git a/app/src/main/java/com/example/findu/presentation/ui/report/viewmodel/WitnessReportViewModel.kt b/app/src/main/java/com/kuit/findu/presentation/ui/report/viewmodel/WitnessReportViewModel.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/report/viewmodel/WitnessReportViewModel.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/report/viewmodel/WitnessReportViewModel.kt index c0a61a9b..14693b54 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/report/viewmodel/WitnessReportViewModel.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/report/viewmodel/WitnessReportViewModel.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.report.viewmodel +package com.kuit.findu.presentation.ui.report.viewmodel import android.content.Context import android.net.Uri @@ -6,23 +6,23 @@ import android.util.Log import androidx.compose.foundation.text.input.TextFieldState import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.findu.domain.model.breed.Breed -import com.example.findu.domain.model.breed.BreedData -import com.example.findu.domain.model.breed.SpeciesType -import com.example.findu.domain.model.breed.SpeciesType.Companion.fromString -import com.example.findu.domain.model.report.FurColorType -import com.example.findu.domain.model.report.WitnessReportData -import com.example.findu.domain.usecase.GetBreedDataUseCase -import com.example.findu.domain.usecase.PostAiDetectionUseCase -import com.example.findu.domain.usecase.report.GetAddressUseCase -import com.example.findu.domain.usecase.report.GetLatLngUseCase -import com.example.findu.domain.usecase.report.PostWitnessReportUseCase -import com.example.findu.domain.usecase.report.UploadImagesUseCase -import com.example.findu.presentation.type.view.LoadState -import com.example.findu.presentation.util.UriUtil.toMultiPartBodys -import com.example.findu.presentation.util.UriUtil.uriToBase64 -import com.example.findu.presentation.util.extension.toDateString -import com.example.findu.presentation.util.extension.toNormalizeAddress +import com.kuit.findu.domain.model.breed.Breed +import com.kuit.findu.domain.model.breed.BreedData +import com.kuit.findu.domain.model.breed.SpeciesType +import com.kuit.findu.domain.model.breed.SpeciesType.Companion.fromString +import com.kuit.findu.domain.model.report.FurColorType +import com.kuit.findu.domain.model.report.WitnessReportData +import com.kuit.findu.domain.usecase.GetBreedDataUseCase +import com.kuit.findu.domain.usecase.PostAiDetectionUseCase +import com.kuit.findu.domain.usecase.report.GetAddressUseCase +import com.kuit.findu.domain.usecase.report.GetLatLngUseCase +import com.kuit.findu.domain.usecase.report.PostWitnessReportUseCase +import com.kuit.findu.domain.usecase.report.UploadImagesUseCase +import com.kuit.findu.presentation.type.view.LoadState +import com.kuit.findu.presentation.util.UriUtil.toMultiPartBodys +import com.kuit.findu.presentation.util.UriUtil.uriToBase64 +import com.kuit.findu.presentation.util.extension.toDateString +import com.kuit.findu.presentation.util.extension.toNormalizeAddress import com.naver.maps.geometry.LatLng import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/BundleTag.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/BundleTag.kt similarity index 61% rename from app/src/main/java/com/example/findu/presentation/ui/search/BundleTag.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/BundleTag.kt index 648bb119..016328a0 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/BundleTag.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/BundleTag.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search +package com.kuit.findu.presentation.ui.search object BundleTag { const val SELECTED_FILTER_DATA = "selectedFilterData" diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/SearchFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/SearchFragment.kt similarity index 85% rename from app/src/main/java/com/example/findu/presentation/ui/search/SearchFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/SearchFragment.kt index b755654c..bb929f42 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/SearchFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/SearchFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search +package com.kuit.findu.presentation.ui.search import android.app.Dialog import android.os.Bundle @@ -8,12 +8,12 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.navigation.fragment.findNavController -import com.example.findu.R -import com.example.findu.databinding.FragmentSearchBinding -import com.example.findu.presentation.ui.home.dialog.HomeReportDetailDialog -import com.example.findu.presentation.ui.report.dialog.ReportNavigationDialog -import com.example.findu.presentation.ui.search.adapter.SearchVPAdapter -import com.example.findu.presentation.ui.search.viewmodel.SearchViewModel +import com.kuit.findu.R +import com.kuit.findu.databinding.FragmentSearchBinding +import com.kuit.findu.presentation.ui.home.dialog.HomeReportDetailDialog +import com.kuit.findu.presentation.ui.report.dialog.ReportNavigationDialog +import com.kuit.findu.presentation.ui.search.adapter.SearchVPAdapter +import com.kuit.findu.presentation.ui.search.viewmodel.SearchViewModel import com.google.android.material.tabs.TabLayoutMediator class SearchFragment : Fragment() { diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/SearchSpacingItemDecoration.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/SearchSpacingItemDecoration.kt similarity index 95% rename from app/src/main/java/com/example/findu/presentation/ui/search/SearchSpacingItemDecoration.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/SearchSpacingItemDecoration.kt index e31d39ca..a381543a 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/SearchSpacingItemDecoration.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/SearchSpacingItemDecoration.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search +package com.kuit.findu.presentation.ui.search import android.graphics.Rect import android.view.View diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchBreedAdapter.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchBreedAdapter.kt similarity index 88% rename from app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchBreedAdapter.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchBreedAdapter.kt index afb21566..5bb52f08 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchBreedAdapter.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchBreedAdapter.kt @@ -1,12 +1,12 @@ -package com.example.findu.presentation.ui.search.adapter +package com.kuit.findu.presentation.ui.search.adapter import android.content.Context import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter -import com.example.findu.R -import com.example.findu.databinding.ItemReportBreedsBinding +import com.kuit.findu.R +import com.kuit.findu.databinding.ItemReportBreedsBinding class SearchBreedAdapter ( context: Context, diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchBreedRVAdapter.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchBreedRVAdapter.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchBreedRVAdapter.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchBreedRVAdapter.kt index 0c3735b6..2b01fbb9 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchBreedRVAdapter.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchBreedRVAdapter.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search.adapter +package com.kuit.findu.presentation.ui.search.adapter import android.annotation.SuppressLint import android.view.LayoutInflater @@ -7,8 +7,8 @@ import android.widget.Filter import android.widget.Filterable import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.example.findu.R -import com.example.findu.databinding.ItemSearchBreedsBinding +import com.kuit.findu.R +import com.kuit.findu.databinding.ItemSearchBreedsBinding class SearchBreedRVAdapter( private val allItems: List, diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchDetailVPAdapter.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchDetailVPAdapter.kt similarity index 86% rename from app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchDetailVPAdapter.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchDetailVPAdapter.kt index 572dbb45..79378c56 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchDetailVPAdapter.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchDetailVPAdapter.kt @@ -1,11 +1,10 @@ -package com.example.findu.presentation.ui.search.adapter +package com.kuit.findu.presentation.ui.search.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.example.findu.databinding.ItemSearchDetailImgBinding -import com.example.findu.presentation.ui.search.model.DetailSearchRv +import com.kuit.findu.databinding.ItemSearchDetailImgBinding class SearchDetailVPAdapter(private val images:List) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchFilterLocationRVAdapter.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchFilterLocationRVAdapter.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchFilterLocationRVAdapter.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchFilterLocationRVAdapter.kt index 75b7ec5b..f45843d0 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchFilterLocationRVAdapter.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchFilterLocationRVAdapter.kt @@ -1,12 +1,12 @@ -package com.example.findu.presentation.ui.search.adapter +package com.kuit.findu.presentation.ui.search.adapter import android.annotation.SuppressLint import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.example.findu.R -import com.example.findu.databinding.ItemSearchLocationBinding +import com.kuit.findu.R +import com.kuit.findu.databinding.ItemSearchLocationBinding class SearchFilterLocationRVAdapter( private val locations: List, diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchListAdapter.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchListAdapter.kt similarity index 95% rename from app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchListAdapter.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchListAdapter.kt index f5587241..bdead7d3 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchListAdapter.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchListAdapter.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search.adapter +package com.kuit.findu.presentation.ui.search.adapter import android.view.LayoutInflater import android.view.ViewGroup @@ -7,11 +7,11 @@ import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.bumptech.glide.load.resource.bitmap.RoundedCorners -import com.example.findu.R -import com.example.findu.databinding.ItemSearchGridContentBinding -import com.example.findu.databinding.ItemSearchHeaderBinding -import com.example.findu.databinding.SearchHorizontalContentItemBinding -import com.example.findu.presentation.ui.search.model.SearchRv +import com.kuit.findu.R +import com.kuit.findu.databinding.ItemSearchGridContentBinding +import com.kuit.findu.databinding.ItemSearchHeaderBinding +import com.kuit.findu.databinding.SearchHorizontalContentItemBinding +import com.kuit.findu.presentation.ui.search.model.SearchRv sealed class SearchListItem { data object Header : SearchListItem() diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchListListener.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchListListener.kt similarity index 66% rename from app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchListListener.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchListListener.kt index 4045195e..efc64383 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchListListener.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchListListener.kt @@ -1,6 +1,6 @@ -package com.example.findu.presentation.ui.search.adapter +package com.kuit.findu.presentation.ui.search.adapter -import com.example.findu.presentation.ui.search.model.SearchRv +import com.kuit.findu.presentation.ui.search.model.SearchRv interface SearchListListener { fun onFilterClick() diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchVPAdapter.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchVPAdapter.kt similarity index 67% rename from app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchVPAdapter.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchVPAdapter.kt index 703c0506..7cdf72e8 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/adapter/SearchVPAdapter.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/adapter/SearchVPAdapter.kt @@ -1,11 +1,11 @@ -package com.example.findu.presentation.ui.search.adapter +package com.kuit.findu.presentation.ui.search.adapter import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.viewpager2.adapter.FragmentStateAdapter -import com.example.findu.presentation.ui.search.tablayout.SearchAllFragment -import com.example.findu.presentation.ui.search.tablayout.SearchReportFragment -import com.example.findu.presentation.ui.search.tablayout.SearchRescueFragment +import com.kuit.findu.presentation.ui.search.tablayout.SearchAllFragment +import com.kuit.findu.presentation.ui.search.tablayout.SearchReportFragment +import com.kuit.findu.presentation.ui.search.tablayout.SearchRescueFragment class SearchVPAdapter(fragmentActivity :FragmentActivity): FragmentStateAdapter(fragmentActivity){ override fun getItemCount(): Int { diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/detail/SearchDisappearDetailFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/detail/SearchDisappearDetailFragment.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/search/detail/SearchDisappearDetailFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/detail/SearchDisappearDetailFragment.kt index bccdbda2..4e99c236 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/detail/SearchDisappearDetailFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/detail/SearchDisappearDetailFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search.detail +package com.kuit.findu.presentation.ui.search.detail import android.content.ActivityNotFoundException import android.content.ClipData @@ -16,13 +16,13 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.navArgs import androidx.viewpager2.widget.MarginPageTransformer -import com.example.findu.R -import com.example.findu.data.mapper.todomain.toDetailSearchRvTag -import com.example.findu.data.mapper.todomain.toDetailSearchStatus -import com.example.findu.databinding.FragmentSearchDetailDisappearBinding -import com.example.findu.domain.model.search.DetailMissingData -import com.example.findu.presentation.ui.search.adapter.SearchDetailVPAdapter -import com.example.findu.presentation.ui.search.viewmodel.DetailSearchViewModel +import com.kuit.findu.R +import com.kuit.findu.data.mapper.todomain.toDetailSearchRvTag +import com.kuit.findu.data.mapper.todomain.toDetailSearchStatus +import com.kuit.findu.databinding.FragmentSearchDetailDisappearBinding +import com.kuit.findu.domain.model.search.DetailMissingData +import com.kuit.findu.presentation.ui.search.adapter.SearchDetailVPAdapter +import com.kuit.findu.presentation.ui.search.viewmodel.DetailSearchViewModel import com.naver.maps.geometry.LatLng import com.naver.maps.map.CameraUpdate import com.naver.maps.map.NaverMap diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/detail/SearchProtectingDetailFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/detail/SearchProtectingDetailFragment.kt similarity index 95% rename from app/src/main/java/com/example/findu/presentation/ui/search/detail/SearchProtectingDetailFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/detail/SearchProtectingDetailFragment.kt index 1ae0002a..dcf9ed54 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/detail/SearchProtectingDetailFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/detail/SearchProtectingDetailFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search.detail +package com.kuit.findu.presentation.ui.search.detail import android.content.ActivityNotFoundException import android.content.ClipData @@ -17,13 +17,13 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.navArgs import androidx.viewpager2.widget.MarginPageTransformer -import com.example.findu.R -import com.example.findu.data.mapper.todomain.toDetailSearchRvTag -import com.example.findu.data.mapper.todomain.toDetailSearchStatus -import com.example.findu.databinding.FragmentSearchDetailProtectingBinding -import com.example.findu.domain.model.search.DetailProtectData -import com.example.findu.presentation.ui.search.adapter.SearchDetailVPAdapter -import com.example.findu.presentation.ui.search.viewmodel.DetailSearchViewModel +import com.kuit.findu.R +import com.kuit.findu.data.mapper.todomain.toDetailSearchRvTag +import com.kuit.findu.data.mapper.todomain.toDetailSearchStatus +import com.kuit.findu.databinding.FragmentSearchDetailProtectingBinding +import com.kuit.findu.domain.model.search.DetailProtectData +import com.kuit.findu.presentation.ui.search.adapter.SearchDetailVPAdapter +import com.kuit.findu.presentation.ui.search.viewmodel.DetailSearchViewModel import com.naver.maps.geometry.LatLng import com.naver.maps.map.CameraUpdate import com.naver.maps.map.NaverMap diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/detail/SearchWitnessDetailFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/detail/SearchWitnessDetailFragment.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/ui/search/detail/SearchWitnessDetailFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/detail/SearchWitnessDetailFragment.kt index 9dec44e4..4123c400 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/detail/SearchWitnessDetailFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/detail/SearchWitnessDetailFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search.detail +package com.kuit.findu.presentation.ui.search.detail import android.content.ActivityNotFoundException import android.content.ClipData @@ -16,13 +16,13 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.navArgs import androidx.viewpager2.widget.MarginPageTransformer -import com.example.findu.R -import com.example.findu.data.mapper.todomain.toDetailSearchRvTag -import com.example.findu.data.mapper.todomain.toDetailSearchStatus -import com.example.findu.databinding.FragmentSearchDetailWitnessBinding -import com.example.findu.domain.model.search.DetailWitnessData -import com.example.findu.presentation.ui.search.adapter.SearchDetailVPAdapter -import com.example.findu.presentation.ui.search.viewmodel.DetailSearchViewModel +import com.kuit.findu.R +import com.kuit.findu.data.mapper.todomain.toDetailSearchRvTag +import com.kuit.findu.data.mapper.todomain.toDetailSearchStatus +import com.kuit.findu.databinding.FragmentSearchDetailWitnessBinding +import com.kuit.findu.domain.model.search.DetailWitnessData +import com.kuit.findu.presentation.ui.search.adapter.SearchDetailVPAdapter +import com.kuit.findu.presentation.ui.search.viewmodel.DetailSearchViewModel import com.naver.maps.geometry.LatLng import com.naver.maps.map.CameraUpdate import com.naver.maps.map.NaverMap diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/dialog/SearchFilterDateDialog.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/dialog/SearchFilterDateDialog.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/ui/search/dialog/SearchFilterDateDialog.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/dialog/SearchFilterDateDialog.kt index e763fe8e..670f9bff 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/dialog/SearchFilterDateDialog.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/dialog/SearchFilterDateDialog.kt @@ -1,14 +1,14 @@ -package com.example.findu.presentation.ui.search.dialog +package com.kuit.findu.presentation.ui.search.dialog import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.core.view.isVisible -import com.example.findu.R -import com.example.findu.databinding.DialogSearchFilterDateBinding -import com.example.findu.presentation.ui.search.model.SearchFilterUiModel -import com.example.findu.presentation.ui.search.model.Type +import com.kuit.findu.R +import com.kuit.findu.databinding.DialogSearchFilterDateBinding +import com.kuit.findu.presentation.ui.search.model.SearchFilterUiModel +import com.kuit.findu.presentation.ui.search.model.Type import com.google.android.material.bottomsheet.BottomSheetDialogFragment import java.time.LocalDate import java.time.format.DateTimeFormatter diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/filter/SearchBreedSelector.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/filter/SearchBreedSelector.kt similarity index 96% rename from app/src/main/java/com/example/findu/presentation/ui/search/filter/SearchBreedSelector.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/filter/SearchBreedSelector.kt index acdc0f83..ba1dfc2f 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/filter/SearchBreedSelector.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/filter/SearchBreedSelector.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search.filter +package com.kuit.findu.presentation.ui.search.filter import android.text.Editable import android.text.TextWatcher @@ -8,9 +8,9 @@ import android.widget.Toast import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager -import com.example.findu.R -import com.example.findu.databinding.FragmentSearchFilterBinding -import com.example.findu.presentation.ui.search.adapter.SearchBreedRVAdapter +import com.kuit.findu.R +import com.kuit.findu.databinding.FragmentSearchFilterBinding +import com.kuit.findu.presentation.ui.search.adapter.SearchBreedRVAdapter import com.google.android.material.chip.Chip class SearchBreedSelector( diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/filter/SearchCalendarSelector.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/filter/SearchCalendarSelector.kt similarity index 87% rename from app/src/main/java/com/example/findu/presentation/ui/search/filter/SearchCalendarSelector.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/filter/SearchCalendarSelector.kt index ef955478..4f18dd1a 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/filter/SearchCalendarSelector.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/filter/SearchCalendarSelector.kt @@ -1,12 +1,12 @@ -package com.example.findu.presentation.ui.search.filter +package com.kuit.findu.presentation.ui.search.filter import androidx.core.content.ContextCompat import androidx.fragment.app.FragmentManager -import com.example.findu.R -import com.example.findu.databinding.FragmentSearchFilterBinding -import com.example.findu.presentation.ui.search.dialog.SearchFilterDateDialog -import com.example.findu.presentation.ui.search.model.SearchFilterUiModel -import com.example.findu.presentation.ui.search.model.Type +import com.kuit.findu.R +import com.kuit.findu.databinding.FragmentSearchFilterBinding +import com.kuit.findu.presentation.ui.search.dialog.SearchFilterDateDialog +import com.kuit.findu.presentation.ui.search.model.SearchFilterUiModel +import com.kuit.findu.presentation.ui.search.model.Type import java.time.LocalDate import java.time.format.DateTimeFormatter diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/filter/SearchFilterFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/filter/SearchFilterFragment.kt similarity index 92% rename from app/src/main/java/com/example/findu/presentation/ui/search/filter/SearchFilterFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/filter/SearchFilterFragment.kt index 1d06ade4..465dd4e4 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/filter/SearchFilterFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/filter/SearchFilterFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search.filter +package com.kuit.findu.presentation.ui.search.filter import android.os.Bundle import android.view.LayoutInflater @@ -11,12 +11,12 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs -import com.example.findu.databinding.FragmentSearchFilterBinding -import com.example.findu.presentation.ui.search.BundleTag.SELECTED_FILTER_DATA -import com.example.findu.presentation.ui.search.model.SearchFilterUiModel -import com.example.findu.presentation.ui.search.model.SearchType -import com.example.findu.presentation.ui.search.viewmodel.SearchFilterViewModel -import com.example.findu.presentation.ui.search.viewmodel.SearchViewModel +import com.kuit.findu.databinding.FragmentSearchFilterBinding +import com.kuit.findu.presentation.ui.search.BundleTag.SELECTED_FILTER_DATA +import com.kuit.findu.presentation.ui.search.model.SearchFilterUiModel +import com.kuit.findu.presentation.ui.search.model.SearchType +import com.kuit.findu.presentation.ui.search.viewmodel.SearchFilterViewModel +import com.kuit.findu.presentation.ui.search.viewmodel.SearchViewModel import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/filter/SearchLocationSelector.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/filter/SearchLocationSelector.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/ui/search/filter/SearchLocationSelector.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/filter/SearchLocationSelector.kt index bd595cb5..422404e6 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/filter/SearchLocationSelector.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/filter/SearchLocationSelector.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search.filter +package com.kuit.findu.presentation.ui.search.filter import android.view.View import android.widget.ImageView @@ -6,10 +6,10 @@ import androidx.core.view.isGone import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager -import com.example.findu.R -import com.example.findu.databinding.FragmentSearchFilterBinding -import com.example.findu.presentation.ui.search.adapter.SearchFilterLocationRVAdapter -import com.example.findu.presentation.ui.search.viewmodel.SearchFilterViewModel +import com.kuit.findu.R +import com.kuit.findu.databinding.FragmentSearchFilterBinding +import com.kuit.findu.presentation.ui.search.adapter.SearchFilterLocationRVAdapter +import com.kuit.findu.presentation.ui.search.viewmodel.SearchFilterViewModel import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/filter/SearchSpeciesSelector.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/filter/SearchSpeciesSelector.kt similarity index 91% rename from app/src/main/java/com/example/findu/presentation/ui/search/filter/SearchSpeciesSelector.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/filter/SearchSpeciesSelector.kt index 1b597ff2..370a6aa6 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/filter/SearchSpeciesSelector.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/filter/SearchSpeciesSelector.kt @@ -1,10 +1,10 @@ -package com.example.findu.presentation.ui.search.filter +package com.kuit.findu.presentation.ui.search.filter import androidx.core.content.ContextCompat -import com.example.findu.R -import com.example.findu.databinding.FragmentSearchFilterBinding -import com.example.findu.domain.model.breed.SpeciesType -import com.example.findu.presentation.ui.search.viewmodel.SearchFilterViewModel +import com.kuit.findu.R +import com.kuit.findu.databinding.FragmentSearchFilterBinding +import com.kuit.findu.domain.model.breed.SpeciesType +import com.kuit.findu.presentation.ui.search.viewmodel.SearchFilterViewModel class SearchSpeciesSelector( private val binding: FragmentSearchFilterBinding, diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/model/DetailSearchRv.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/model/DetailSearchRv.kt similarity index 91% rename from app/src/main/java/com/example/findu/presentation/ui/search/model/DetailSearchRv.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/model/DetailSearchRv.kt index 7c40bf50..8a63856b 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/model/DetailSearchRv.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/model/DetailSearchRv.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search.model +package com.kuit.findu.presentation.ui.search.model data class DetailSearchRv( val imageUrl : String, diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/model/LocationData.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/model/LocationData.kt similarity index 98% rename from app/src/main/java/com/example/findu/presentation/ui/search/model/LocationData.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/model/LocationData.kt index fb60ea47..858c43c7 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/model/LocationData.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/model/LocationData.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search.model +package com.kuit.findu.presentation.ui.search.model object LocationData { val locationMap = mapOf( diff --git a/app/src/main/java/com/kuit/findu/presentation/ui/search/model/SearchDate.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/model/SearchDate.kt new file mode 100644 index 00000000..347e888f --- /dev/null +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/model/SearchDate.kt @@ -0,0 +1,3 @@ +package com.kuit.findu.presentation.ui.search.model + +enum class Type { DATE_START, DATE_END } \ No newline at end of file diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/model/SearchFilterUiModel.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/model/SearchFilterUiModel.kt similarity index 81% rename from app/src/main/java/com/example/findu/presentation/ui/search/model/SearchFilterUiModel.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/model/SearchFilterUiModel.kt index c1961293..ff272865 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/model/SearchFilterUiModel.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/model/SearchFilterUiModel.kt @@ -1,7 +1,7 @@ -package com.example.findu.presentation.ui.search.model +package com.kuit.findu.presentation.ui.search.model -import com.example.findu.domain.model.breed.SpeciesType -import com.example.findu.domain.model.search.SearchFilterData +import com.kuit.findu.domain.model.breed.SpeciesType +import com.kuit.findu.domain.model.search.SearchFilterData import java.io.Serializable data class SearchFilterUiModel( diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/model/SearchRv.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/model/SearchRv.kt similarity index 81% rename from app/src/main/java/com/example/findu/presentation/ui/search/model/SearchRv.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/model/SearchRv.kt index 3a18a5c3..f50d5d55 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/model/SearchRv.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/model/SearchRv.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search.model +package com.kuit.findu.presentation.ui.search.model import java.io.Serializable diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/model/SearchRvTag.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/model/SearchRvTag.kt similarity index 84% rename from app/src/main/java/com/example/findu/presentation/ui/search/model/SearchRvTag.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/model/SearchRvTag.kt index 3a42b84d..e9bcad0f 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/model/SearchRvTag.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/model/SearchRvTag.kt @@ -1,6 +1,6 @@ -package com.example.findu.presentation.ui.search.model +package com.kuit.findu.presentation.ui.search.model -import com.example.findu.R +import com.kuit.findu.R import java.io.Serializable enum class SearchRvTag( diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/model/SearchType.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/model/SearchType.kt similarity index 54% rename from app/src/main/java/com/example/findu/presentation/ui/search/model/SearchType.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/model/SearchType.kt index c8ab9316..85fb7efe 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/model/SearchType.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/model/SearchType.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search.model +package com.kuit.findu.presentation.ui.search.model enum class SearchType { ALL, diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/tablayout/SearchAllFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/tablayout/SearchAllFragment.kt similarity index 90% rename from app/src/main/java/com/example/findu/presentation/ui/search/tablayout/SearchAllFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/tablayout/SearchAllFragment.kt index a0e0e940..2356bb9c 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/tablayout/SearchAllFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/tablayout/SearchAllFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search.tablayout +package com.kuit.findu.presentation.ui.search.tablayout import android.os.Bundle @@ -14,19 +14,19 @@ import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.findu.R -import com.example.findu.data.mapper.todomain.toSearchRvTag -import com.example.findu.databinding.FragmentSearchAllBinding -import com.example.findu.domain.model.search.SearchAnimal -import com.example.findu.presentation.ui.search.BundleTag.SELECTED_FILTER_DATA -import com.example.findu.presentation.ui.search.SearchFragmentDirections -import com.example.findu.presentation.ui.search.SearchSpacingItemDecoration -import com.example.findu.presentation.ui.search.adapter.SearchListAdapter -import com.example.findu.presentation.ui.search.adapter.SearchListListener -import com.example.findu.presentation.ui.search.model.SearchFilterUiModel -import com.example.findu.presentation.ui.search.model.SearchRv -import com.example.findu.presentation.ui.search.model.SearchType -import com.example.findu.presentation.ui.search.viewmodel.SearchViewModel +import com.kuit.findu.R +import com.kuit.findu.data.mapper.todomain.toSearchRvTag +import com.kuit.findu.databinding.FragmentSearchAllBinding +import com.kuit.findu.domain.model.search.SearchAnimal +import com.kuit.findu.presentation.ui.search.BundleTag.SELECTED_FILTER_DATA +import com.kuit.findu.presentation.ui.search.SearchFragmentDirections +import com.kuit.findu.presentation.ui.search.SearchSpacingItemDecoration +import com.kuit.findu.presentation.ui.search.adapter.SearchListAdapter +import com.kuit.findu.presentation.ui.search.adapter.SearchListListener +import com.kuit.findu.presentation.ui.search.model.SearchFilterUiModel +import com.kuit.findu.presentation.ui.search.model.SearchRv +import com.kuit.findu.presentation.ui.search.model.SearchType +import com.kuit.findu.presentation.ui.search.viewmodel.SearchViewModel import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.delay import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/tablayout/SearchReportFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/tablayout/SearchReportFragment.kt similarity index 90% rename from app/src/main/java/com/example/findu/presentation/ui/search/tablayout/SearchReportFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/tablayout/SearchReportFragment.kt index 30949e3b..4cb79c7e 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/tablayout/SearchReportFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/tablayout/SearchReportFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search.tablayout +package com.kuit.findu.presentation.ui.search.tablayout import android.os.Bundle import android.util.Log @@ -13,19 +13,19 @@ import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.findu.R -import com.example.findu.data.mapper.todomain.toSearchRvTag -import com.example.findu.databinding.FragmentSearchReportBinding -import com.example.findu.domain.model.search.SearchAnimal -import com.example.findu.presentation.ui.search.BundleTag.SELECTED_FILTER_DATA -import com.example.findu.presentation.ui.search.SearchFragmentDirections -import com.example.findu.presentation.ui.search.SearchSpacingItemDecoration -import com.example.findu.presentation.ui.search.adapter.SearchListAdapter -import com.example.findu.presentation.ui.search.adapter.SearchListListener -import com.example.findu.presentation.ui.search.model.SearchFilterUiModel -import com.example.findu.presentation.ui.search.model.SearchRv -import com.example.findu.presentation.ui.search.model.SearchType -import com.example.findu.presentation.ui.search.viewmodel.SearchViewModel +import com.kuit.findu.R +import com.kuit.findu.data.mapper.todomain.toSearchRvTag +import com.kuit.findu.databinding.FragmentSearchReportBinding +import com.kuit.findu.domain.model.search.SearchAnimal +import com.kuit.findu.presentation.ui.search.BundleTag.SELECTED_FILTER_DATA +import com.kuit.findu.presentation.ui.search.SearchFragmentDirections +import com.kuit.findu.presentation.ui.search.SearchSpacingItemDecoration +import com.kuit.findu.presentation.ui.search.adapter.SearchListAdapter +import com.kuit.findu.presentation.ui.search.adapter.SearchListListener +import com.kuit.findu.presentation.ui.search.model.SearchFilterUiModel +import com.kuit.findu.presentation.ui.search.model.SearchRv +import com.kuit.findu.presentation.ui.search.model.SearchType +import com.kuit.findu.presentation.ui.search.viewmodel.SearchViewModel import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.delay import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/tablayout/SearchRescueFragment.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/tablayout/SearchRescueFragment.kt similarity index 90% rename from app/src/main/java/com/example/findu/presentation/ui/search/tablayout/SearchRescueFragment.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/tablayout/SearchRescueFragment.kt index 6a7c70d4..4c887848 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/tablayout/SearchRescueFragment.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/tablayout/SearchRescueFragment.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.search.tablayout +package com.kuit.findu.presentation.ui.search.tablayout import android.os.Bundle import android.util.Log @@ -13,19 +13,19 @@ import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.findu.R -import com.example.findu.data.mapper.todomain.toSearchRvTag -import com.example.findu.databinding.FragmentSearchRescueBinding -import com.example.findu.domain.model.search.SearchAnimal -import com.example.findu.presentation.ui.search.BundleTag.SELECTED_FILTER_DATA -import com.example.findu.presentation.ui.search.adapter.SearchListAdapter -import com.example.findu.presentation.ui.search.adapter.SearchListListener -import com.example.findu.presentation.ui.search.SearchFragmentDirections -import com.example.findu.presentation.ui.search.SearchSpacingItemDecoration -import com.example.findu.presentation.ui.search.model.SearchFilterUiModel -import com.example.findu.presentation.ui.search.model.SearchRv -import com.example.findu.presentation.ui.search.model.SearchType -import com.example.findu.presentation.ui.search.viewmodel.SearchViewModel +import com.kuit.findu.R +import com.kuit.findu.data.mapper.todomain.toSearchRvTag +import com.kuit.findu.databinding.FragmentSearchRescueBinding +import com.kuit.findu.domain.model.search.SearchAnimal +import com.kuit.findu.presentation.ui.search.BundleTag.SELECTED_FILTER_DATA +import com.kuit.findu.presentation.ui.search.adapter.SearchListAdapter +import com.kuit.findu.presentation.ui.search.adapter.SearchListListener +import com.kuit.findu.presentation.ui.search.SearchFragmentDirections +import com.kuit.findu.presentation.ui.search.SearchSpacingItemDecoration +import com.kuit.findu.presentation.ui.search.model.SearchFilterUiModel +import com.kuit.findu.presentation.ui.search.model.SearchRv +import com.kuit.findu.presentation.ui.search.model.SearchType +import com.kuit.findu.presentation.ui.search.viewmodel.SearchViewModel import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.delay import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/viewmodel/DetailSearchViewModel.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/viewmodel/DetailSearchViewModel.kt similarity index 91% rename from app/src/main/java/com/example/findu/presentation/ui/search/viewmodel/DetailSearchViewModel.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/viewmodel/DetailSearchViewModel.kt index 01ce17b4..cbfa1c13 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/viewmodel/DetailSearchViewModel.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/viewmodel/DetailSearchViewModel.kt @@ -1,13 +1,13 @@ -package com.example.findu.presentation.ui.search.viewmodel +package com.kuit.findu.presentation.ui.search.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.findu.domain.model.search.DetailMissingData -import com.example.findu.domain.model.search.DetailProtectData -import com.example.findu.domain.model.search.DetailWitnessData -import com.example.findu.domain.usecase.GetDetailSearchUseCase -import com.example.findu.domain.usecase.interest.DeleteInterestAnimalUseCase -import com.example.findu.domain.usecase.interest.PostInterestAnimalUseCase +import com.kuit.findu.domain.model.search.DetailMissingData +import com.kuit.findu.domain.model.search.DetailProtectData +import com.kuit.findu.domain.model.search.DetailWitnessData +import com.kuit.findu.domain.usecase.GetDetailSearchUseCase +import com.kuit.findu.domain.usecase.interest.DeleteInterestAnimalUseCase +import com.kuit.findu.domain.usecase.interest.PostInterestAnimalUseCase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/viewmodel/SearchFilterViewModel.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/viewmodel/SearchFilterViewModel.kt similarity index 86% rename from app/src/main/java/com/example/findu/presentation/ui/search/viewmodel/SearchFilterViewModel.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/viewmodel/SearchFilterViewModel.kt index 171347f5..24149d12 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/viewmodel/SearchFilterViewModel.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/viewmodel/SearchFilterViewModel.kt @@ -1,12 +1,12 @@ -package com.example.findu.presentation.ui.search.viewmodel +package com.kuit.findu.presentation.ui.search.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.findu.domain.model.breed.SpeciesType -import com.example.findu.domain.model.extra.Sido -import com.example.findu.domain.repository.BreedRepository -import com.example.findu.domain.usecase.extra.GetSidoUseCase -import com.example.findu.domain.usecase.extra.GetSigunguUseCase +import com.kuit.findu.domain.model.breed.SpeciesType +import com.kuit.findu.domain.model.extra.Sido +import com.kuit.findu.domain.repository.BreedRepository +import com.kuit.findu.domain.usecase.extra.GetSidoUseCase +import com.kuit.findu.domain.usecase.extra.GetSigunguUseCase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/example/findu/presentation/ui/search/viewmodel/SearchViewModel.kt b/app/src/main/java/com/kuit/findu/presentation/ui/search/viewmodel/SearchViewModel.kt similarity index 87% rename from app/src/main/java/com/example/findu/presentation/ui/search/viewmodel/SearchViewModel.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/search/viewmodel/SearchViewModel.kt index 8cd511c7..c5a80cd8 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/search/viewmodel/SearchViewModel.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/search/viewmodel/SearchViewModel.kt @@ -1,17 +1,17 @@ -package com.example.findu.presentation.ui.search.viewmodel +package com.kuit.findu.presentation.ui.search.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.findu.domain.model.breed.BreedData -import com.example.findu.domain.model.breed.SpeciesType -import com.example.findu.domain.model.search.SearchData -import com.example.findu.domain.usecase.GetBreedDataUseCase -import com.example.findu.domain.usecase.GetSearchUseCase -import com.example.findu.domain.usecase.interest.DeleteInterestAnimalUseCase -import com.example.findu.domain.usecase.interest.PostInterestAnimalUseCase -import com.example.findu.presentation.ui.search.model.SearchFilterUiModel -import com.example.findu.presentation.ui.search.model.SearchType -import com.example.findu.presentation.ui.search.model.toDomain +import com.kuit.findu.domain.model.breed.BreedData +import com.kuit.findu.domain.model.breed.SpeciesType +import com.kuit.findu.domain.model.search.SearchData +import com.kuit.findu.domain.usecase.GetBreedDataUseCase +import com.kuit.findu.domain.usecase.GetSearchUseCase +import com.kuit.findu.domain.usecase.interest.DeleteInterestAnimalUseCase +import com.kuit.findu.domain.usecase.interest.PostInterestAnimalUseCase +import com.kuit.findu.presentation.ui.search.model.SearchFilterUiModel +import com.kuit.findu.presentation.ui.search.model.SearchType +import com.kuit.findu.presentation.ui.search.model.toDomain import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/example/findu/presentation/ui/splash/SplashActivity.kt b/app/src/main/java/com/kuit/findu/presentation/ui/splash/SplashActivity.kt similarity index 87% rename from app/src/main/java/com/example/findu/presentation/ui/splash/SplashActivity.kt rename to app/src/main/java/com/kuit/findu/presentation/ui/splash/SplashActivity.kt index 77a662e1..97619987 100644 --- a/app/src/main/java/com/example/findu/presentation/ui/splash/SplashActivity.kt +++ b/app/src/main/java/com/kuit/findu/presentation/ui/splash/SplashActivity.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.ui.splash +package com.kuit.findu.presentation.ui.splash import android.content.Intent import android.os.Bundle @@ -11,12 +11,12 @@ import com.bumptech.glide.load.engine.GlideException import com.bumptech.glide.load.resource.gif.GifDrawable import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.target.Target -import com.example.findu.R -import com.example.findu.databinding.ActivitySplashBinding -import com.example.findu.domain.usecase.SetDeviceIdUseCase -import com.example.findu.domain.usecase.token.GetAccessTokenUseCase -import com.example.findu.presentation.ui.login.LoginActivity -import com.example.findu.presentation.ui.main.MainActivity +import com.kuit.findu.R +import com.kuit.findu.databinding.ActivitySplashBinding +import com.kuit.findu.domain.usecase.SetDeviceIdUseCase +import com.kuit.findu.domain.usecase.token.GetAccessTokenUseCase +import com.kuit.findu.presentation.ui.login.LoginActivity +import com.kuit.findu.presentation.ui.main.MainActivity import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/findu/presentation/util/Constraints.kt b/app/src/main/java/com/kuit/findu/presentation/util/Constraints.kt similarity index 90% rename from app/src/main/java/com/example/findu/presentation/util/Constraints.kt rename to app/src/main/java/com/kuit/findu/presentation/util/Constraints.kt index 6c657b03..7a3b7e66 100644 --- a/app/src/main/java/com/example/findu/presentation/util/Constraints.kt +++ b/app/src/main/java/com/kuit/findu/presentation/util/Constraints.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.util +package com.kuit.findu.presentation.util object WebViewUrl { const val PRIVACY_POLICY_URL = "" diff --git a/app/src/main/java/com/example/findu/presentation/util/FileUtil.kt b/app/src/main/java/com/kuit/findu/presentation/util/FileUtil.kt similarity index 94% rename from app/src/main/java/com/example/findu/presentation/util/FileUtil.kt rename to app/src/main/java/com/kuit/findu/presentation/util/FileUtil.kt index f50e1de2..21ca27eb 100644 --- a/app/src/main/java/com/example/findu/presentation/util/FileUtil.kt +++ b/app/src/main/java/com/kuit/findu/presentation/util/FileUtil.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.util +package com.kuit.findu.presentation.util import android.content.Context import android.graphics.Bitmap diff --git a/app/src/main/java/com/example/findu/presentation/util/PermissionUtils.kt b/app/src/main/java/com/kuit/findu/presentation/util/PermissionUtils.kt similarity index 96% rename from app/src/main/java/com/example/findu/presentation/util/PermissionUtils.kt rename to app/src/main/java/com/kuit/findu/presentation/util/PermissionUtils.kt index 22dfb7ea..c3c1be43 100644 --- a/app/src/main/java/com/example/findu/presentation/util/PermissionUtils.kt +++ b/app/src/main/java/com/kuit/findu/presentation/util/PermissionUtils.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.util +package com.kuit.findu.presentation.util import android.Manifest import android.app.Activity diff --git a/app/src/main/java/com/example/findu/presentation/util/UriUtil.kt b/app/src/main/java/com/kuit/findu/presentation/util/UriUtil.kt similarity index 98% rename from app/src/main/java/com/example/findu/presentation/util/UriUtil.kt rename to app/src/main/java/com/kuit/findu/presentation/util/UriUtil.kt index 77b122c5..9b411482 100644 --- a/app/src/main/java/com/example/findu/presentation/util/UriUtil.kt +++ b/app/src/main/java/com/kuit/findu/presentation/util/UriUtil.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.util +package com.kuit.findu.presentation.util import android.content.ContentResolver import android.content.Context diff --git a/app/src/main/java/com/example/findu/presentation/util/ViewUtils.kt b/app/src/main/java/com/kuit/findu/presentation/util/ViewUtils.kt similarity index 95% rename from app/src/main/java/com/example/findu/presentation/util/ViewUtils.kt rename to app/src/main/java/com/kuit/findu/presentation/util/ViewUtils.kt index 34a0c1de..cb491a3e 100644 --- a/app/src/main/java/com/example/findu/presentation/util/ViewUtils.kt +++ b/app/src/main/java/com/kuit/findu/presentation/util/ViewUtils.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.util +package com.kuit.findu.presentation.util import android.content.Context import android.graphics.Rect @@ -6,7 +6,6 @@ import android.os.IBinder import android.text.SpannableString import android.text.style.UnderlineSpan import android.view.View -import android.view.ViewTreeObserver import android.view.inputmethod.InputMethodManager import android.widget.ScrollView import android.widget.TextView diff --git a/app/src/main/java/com/example/findu/presentation/util/extension/CharExt.kt b/app/src/main/java/com/kuit/findu/presentation/util/extension/CharExt.kt similarity index 97% rename from app/src/main/java/com/example/findu/presentation/util/extension/CharExt.kt rename to app/src/main/java/com/kuit/findu/presentation/util/extension/CharExt.kt index 95d74314..abd9f8c8 100644 --- a/app/src/main/java/com/example/findu/presentation/util/extension/CharExt.kt +++ b/app/src/main/java/com/kuit/findu/presentation/util/extension/CharExt.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.util.extension +package com.kuit.findu.presentation.util.extension import kotlinx.datetime.Clock import kotlinx.datetime.DayOfWeek diff --git a/app/src/main/java/com/example/findu/presentation/util/extension/ContextExt.kt b/app/src/main/java/com/kuit/findu/presentation/util/extension/ContextExt.kt similarity index 75% rename from app/src/main/java/com/example/findu/presentation/util/extension/ContextExt.kt rename to app/src/main/java/com/kuit/findu/presentation/util/extension/ContextExt.kt index fd610cb6..4aa880cb 100644 --- a/app/src/main/java/com/example/findu/presentation/util/extension/ContextExt.kt +++ b/app/src/main/java/com/kuit/findu/presentation/util/extension/ContextExt.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.util.extension +package com.kuit.findu.presentation.util.extension import android.content.Context import android.widget.Toast diff --git a/app/src/main/java/com/example/findu/presentation/util/extension/IntExt.kt b/app/src/main/java/com/kuit/findu/presentation/util/extension/IntExt.kt similarity index 80% rename from app/src/main/java/com/example/findu/presentation/util/extension/IntExt.kt rename to app/src/main/java/com/kuit/findu/presentation/util/extension/IntExt.kt index 06c32621..af6c64e0 100644 --- a/app/src/main/java/com/example/findu/presentation/util/extension/IntExt.kt +++ b/app/src/main/java/com/kuit/findu/presentation/util/extension/IntExt.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.util.extension +package com.kuit.findu.presentation.util.extension import java.text.NumberFormat import java.util.Locale diff --git a/app/src/main/java/com/example/findu/presentation/util/extension/ModifierExt.kt b/app/src/main/java/com/kuit/findu/presentation/util/extension/ModifierExt.kt similarity index 96% rename from app/src/main/java/com/example/findu/presentation/util/extension/ModifierExt.kt rename to app/src/main/java/com/kuit/findu/presentation/util/extension/ModifierExt.kt index 364b357f..e9edff74 100644 --- a/app/src/main/java/com/example/findu/presentation/util/extension/ModifierExt.kt +++ b/app/src/main/java/com/kuit/findu/presentation/util/extension/ModifierExt.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.util.extension +package com.kuit.findu.presentation.util.extension import androidx.compose.foundation.background import androidx.compose.foundation.border diff --git a/app/src/main/java/com/example/findu/presentation/util/kakao/KaKaoLoginHelper.kt b/app/src/main/java/com/kuit/findu/presentation/util/kakao/KaKaoLoginHelper.kt similarity index 90% rename from app/src/main/java/com/example/findu/presentation/util/kakao/KaKaoLoginHelper.kt rename to app/src/main/java/com/kuit/findu/presentation/util/kakao/KaKaoLoginHelper.kt index 3a53e74d..99e1d48f 100644 --- a/app/src/main/java/com/example/findu/presentation/util/kakao/KaKaoLoginHelper.kt +++ b/app/src/main/java/com/kuit/findu/presentation/util/kakao/KaKaoLoginHelper.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.util.kakao +package com.kuit.findu.presentation.util.kakao import android.content.Context import com.kakao.sdk.auth.model.OAuthToken diff --git a/app/src/main/java/com/example/findu/presentation/util/permission/LocationPermissionManager.kt b/app/src/main/java/com/kuit/findu/presentation/util/permission/LocationPermissionManager.kt similarity index 95% rename from app/src/main/java/com/example/findu/presentation/util/permission/LocationPermissionManager.kt rename to app/src/main/java/com/kuit/findu/presentation/util/permission/LocationPermissionManager.kt index 0407bdca..d89d13bb 100644 --- a/app/src/main/java/com/example/findu/presentation/util/permission/LocationPermissionManager.kt +++ b/app/src/main/java/com/kuit/findu/presentation/util/permission/LocationPermissionManager.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.util.permission +package com.kuit.findu.presentation.util.permission import android.Manifest diff --git a/app/src/main/java/com/example/findu/presentation/util/shape/TriangleShpae.kt b/app/src/main/java/com/kuit/findu/presentation/util/shape/TriangleShpae.kt similarity index 93% rename from app/src/main/java/com/example/findu/presentation/util/shape/TriangleShpae.kt rename to app/src/main/java/com/kuit/findu/presentation/util/shape/TriangleShpae.kt index 8fedd0b7..af475ee6 100644 --- a/app/src/main/java/com/example/findu/presentation/util/shape/TriangleShpae.kt +++ b/app/src/main/java/com/kuit/findu/presentation/util/shape/TriangleShpae.kt @@ -1,4 +1,4 @@ -package com.example.findu.presentation.util.shape +package com.kuit.findu.presentation.util.shape import androidx.compose.ui.geometry.Size import androidx.compose.ui.graphics.Outline diff --git a/app/src/main/java/com/example/findu/ui/theme/Color.kt b/app/src/main/java/com/kuit/findu/ui/theme/Color.kt similarity index 97% rename from app/src/main/java/com/example/findu/ui/theme/Color.kt rename to app/src/main/java/com/kuit/findu/ui/theme/Color.kt index 0bb1c9a0..18329e6f 100644 --- a/app/src/main/java/com/example/findu/ui/theme/Color.kt +++ b/app/src/main/java/com/kuit/findu/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package com.example.findu.ui.theme +package com.kuit.findu.ui.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf diff --git a/app/src/main/java/com/example/findu/ui/theme/Theme.kt b/app/src/main/java/com/kuit/findu/ui/theme/Theme.kt similarity index 97% rename from app/src/main/java/com/example/findu/ui/theme/Theme.kt rename to app/src/main/java/com/kuit/findu/ui/theme/Theme.kt index 88f65593..b1a20bb0 100644 --- a/app/src/main/java/com/example/findu/ui/theme/Theme.kt +++ b/app/src/main/java/com/kuit/findu/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.example.findu.ui.theme +package com.kuit.findu.ui.theme import android.app.Activity import androidx.compose.material.MaterialTheme diff --git a/app/src/main/java/com/example/findu/ui/theme/Type.kt b/app/src/main/java/com/kuit/findu/ui/theme/Type.kt similarity index 98% rename from app/src/main/java/com/example/findu/ui/theme/Type.kt rename to app/src/main/java/com/kuit/findu/ui/theme/Type.kt index 1a7371a3..b5ac0dc5 100644 --- a/app/src/main/java/com/example/findu/ui/theme/Type.kt +++ b/app/src/main/java/com/kuit/findu/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package com.example.findu.ui.theme +package com.kuit.findu.ui.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf @@ -6,7 +6,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.sp -import com.example.findu.R +import com.kuit.findu.R // Pretendard 폰트 설정 val PretendardRegular = FontFamily(Font(R.font.pretendard_regular)) diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 7fe203b2..f93a23a8 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -7,7 +7,7 @@ + app:argType="com.kuit.findu.presentation.type.HomeExtraButtonType"/> + app:argType="com.kuit.findu.presentation.ui.search.model.SearchType" />