Skip to content

Commit

Permalink
Merge pull request #154 from Team-Motivoo/mod/##153-package-name-change
Browse files Browse the repository at this point in the history
[mod] #153 패키지명 변경
  • Loading branch information
l2zh authored Oct 6, 2024
2 parents 7e60b30 + 6231fe2 commit 728cab7
Show file tree
Hide file tree
Showing 208 changed files with 752 additions and 704 deletions.
18 changes: 18 additions & 0 deletions .idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ properties.load(project.rootProject.file('local.properties').newDataInputStream(


android {
namespace 'sopt.motivoo'
namespace 'sopt.teammotivoo'
compileSdk 34

defaultConfig {
applicationId "sopt.motivoo"
applicationId "sopt.teammotivoo"
minSdk 24
targetSdk 34
versionCode 1
Expand Down
Binary file added app/release/app-release.apk
Binary file not shown.
20 changes: 20 additions & 0 deletions app/release/output-metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "sopt.motivoo",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 1,
"versionName": "1.0.0",
"outputFile": "app-release.apk"
}
],
"elementType": "File"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.motivoo
package sopt.teammotivoo

import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
Expand Down
16 changes: 0 additions & 16 deletions app/src/main/java/sopt/motivoo/domain/repository/AuthRepository.kt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.motivoo
package sopt.teammotivoo

import android.app.Application
import androidx.appcompat.app.AppCompatDelegate
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package sopt.motivoo.data.datasource.local
package sopt.teammotivoo.data.datasource.local

import android.content.Context
import androidx.core.content.edit
import androidx.security.crypto.EncryptedSharedPreferences
import androidx.security.crypto.MasterKey
import com.google.firebase.BuildConfig
import dagger.hilt.android.qualifiers.ApplicationContext
import sopt.motivoo.domain.entity.MotivooStorage
import sopt.teammotivoo.domain.entity.MotivooStorage
import javax.inject.Inject
import javax.inject.Singleton

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package sopt.motivoo.data.datasource.local
package sopt.teammotivoo.data.datasource.local

import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.edit
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map
import sopt.motivoo.di.PreferencesKeys
import sopt.teammotivoo.di.PreferencesKeys
import javax.inject.Inject

class StepCountLocalDataSource @Inject constructor(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package sopt.motivoo.data.datasource.local
package sopt.teammotivoo.data.datasource.local

import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.edit
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map
import sopt.motivoo.di.PreferencesKeys
import sopt.teammotivoo.di.PreferencesKeys
import javax.inject.Inject

class UserLocalDataSource @Inject constructor(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package sopt.motivoo.data.datasource.remote
package sopt.teammotivoo.data.datasource.remote

import sopt.motivoo.data.model.request.auth.RequestLoginDto
import sopt.motivoo.data.model.response.auth.ResponseLoginDto
import sopt.motivoo.data.model.response.auth.ResponseLogoutDto
import sopt.motivoo.data.model.response.auth.ResponseWithDrawDto
import sopt.motivoo.data.service.AuthService
import sopt.teammotivoo.data.model.request.auth.RequestLoginDto
import sopt.teammotivoo.data.model.response.auth.ResponseLoginDto
import sopt.teammotivoo.data.model.response.auth.ResponseLogoutDto
import sopt.teammotivoo.data.model.response.auth.ResponseWithDrawDto
import sopt.teammotivoo.data.service.AuthService
import javax.inject.Inject

class AuthDataSource @Inject constructor(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package sopt.motivoo.data.datasource.remote
package sopt.teammotivoo.data.datasource.remote

import sopt.motivoo.data.model.request.DummyRequestData
import sopt.motivoo.data.model.response.DummyResponseData
import sopt.motivoo.data.service.DummyService
import sopt.teammotivoo.data.model.request.DummyRequestData
import sopt.teammotivoo.data.model.response.DummyResponseData
import sopt.teammotivoo.data.service.DummyService
import javax.inject.Inject

class DummyDataSource @Inject constructor(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package sopt.motivoo.data.datasource.remote
package sopt.teammotivoo.data.datasource.remote

import okhttp3.RequestBody
import sopt.motivoo.data.model.request.home.RequestMissionImageFileDto
import sopt.motivoo.data.model.request.home.RequestMissionTodayDto
import sopt.motivoo.data.model.response.home.ResponseHomeDto
import sopt.motivoo.data.model.response.home.ResponseMissionChoiceDto
import sopt.motivoo.data.model.response.home.ResponseMissionImageDto
import sopt.motivoo.data.model.response.home.ResponseMissionTodayDto
import sopt.motivoo.data.service.HomeService
import sopt.teammotivoo.data.model.request.home.RequestMissionImageFileDto
import sopt.teammotivoo.data.model.request.home.RequestMissionTodayDto
import sopt.teammotivoo.data.model.response.home.ResponseHomeDto
import sopt.teammotivoo.data.model.response.home.ResponseMissionChoiceDto
import sopt.teammotivoo.data.model.response.home.ResponseMissionImageDto
import sopt.teammotivoo.data.model.response.home.ResponseMissionTodayDto
import sopt.teammotivoo.data.service.HomeService
import javax.inject.Inject

class HomeDataSource @Inject constructor(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package sopt.motivoo.data.datasource.remote
package sopt.teammotivoo.data.datasource.remote

import sopt.motivoo.data.model.request.onboarding.RequestOnboardingDto
import sopt.motivoo.data.model.request.onboarding.RequestPostInviteCodeDto
import sopt.motivoo.data.model.response.onboarding.ResponseGetInviteCodeDto
import sopt.motivoo.data.model.response.onboarding.ResponseGetMatchedResultDto
import sopt.motivoo.data.model.response.onboarding.ResponseOnboardingDto
import sopt.motivoo.data.model.response.onboarding.ResponsePostInviteCodeDto
import sopt.motivoo.data.service.OnboardingService
import sopt.teammotivoo.data.model.request.onboarding.RequestOnboardingDto
import sopt.teammotivoo.data.model.request.onboarding.RequestPostInviteCodeDto
import sopt.teammotivoo.data.model.response.onboarding.ResponseGetInviteCodeDto
import sopt.teammotivoo.data.model.response.onboarding.ResponseGetMatchedResultDto
import sopt.teammotivoo.data.model.response.onboarding.ResponseOnboardingDto
import sopt.teammotivoo.data.model.response.onboarding.ResponsePostInviteCodeDto
import sopt.teammotivoo.data.service.OnboardingService
import javax.inject.Inject

class OnboardingDataSource @Inject constructor(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.motivoo.data.datasource.remote.intercepter
package sopt.teammotivoo.data.datasource.remote.intercepter

import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
Expand All @@ -7,10 +7,10 @@ import okhttp3.MediaType.Companion.toMediaType
import okhttp3.Request
import okhttp3.RequestBody.Companion.toRequestBody
import okhttp3.Response
import sopt.motivoo.BuildConfig
import sopt.motivoo.data.datasource.remote.listener.AuthTokenRefreshListener
import sopt.motivoo.data.model.response.auth.ResponseReissueDto
import sopt.motivoo.domain.entity.MotivooStorage
import sopt.teammotivoo.BuildConfig
import sopt.teammotivoo.data.datasource.remote.listener.AuthTokenRefreshListener
import sopt.teammotivoo.data.model.response.auth.ResponseReissueDto
import sopt.teammotivoo.domain.entity.MotivooStorage
import javax.inject.Inject

class AuthInterceptor @Inject constructor(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package sopt.motivoo.data.datasource.remote.intercepter
package sopt.teammotivoo.data.datasource.remote.intercepter

import okhttp3.Interceptor
import okhttp3.Response
import sopt.motivoo.data.datasource.remote.listener.NetworkErrorListener
import sopt.teammotivoo.data.datasource.remote.listener.NetworkErrorListener
import javax.inject.Inject

class ErrorInterceptor @Inject constructor(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.motivoo.data.datasource.remote.listener
package sopt.teammotivoo.data.datasource.remote.listener

interface AuthTokenRefreshListener {
fun onTokenRefreshFailed()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.motivoo.data.datasource.remote.listener
package sopt.teammotivoo.data.datasource.remote.listener

import javax.inject.Inject

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.motivoo.data.datasource.remote.listener
package sopt.teammotivoo.data.datasource.remote.listener

interface NetworkErrorListener {
fun onApiCallFailed()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.motivoo.data.datasource.remote.listener
package sopt.teammotivoo.data.datasource.remote.listener

import javax.inject.Inject

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package sopt.motivoo.data.error
package sopt.teammotivoo.data.error

import retrofit2.HttpException
import sopt.motivoo.domain.entity.error.ResponseHandler
import sopt.motivoo.domain.error.UserErrorHandler
import sopt.teammotivoo.domain.entity.error.ResponseHandler
import sopt.teammotivoo.domain.error.UserErrorHandler
import javax.inject.Inject

class UserErrorHandlerImpl @Inject constructor() : UserErrorHandler {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.motivoo.data.model.request
package sopt.teammotivoo.data.model.request

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.motivoo.data.model.request.auth
package sopt.teammotivoo.data.model.request.auth

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.motivoo.data.model.request.home
package sopt.teammotivoo.data.model.request.home

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.motivoo.data.model.request.home
package sopt.teammotivoo.data.model.request.home

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.motivoo.data.model.request.onboarding
package sopt.teammotivoo.data.model.request.onboarding

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.motivoo.data.model.request.onboarding
package sopt.teammotivoo.data.model.request.onboarding

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package sopt.motivoo.data.model.response
package sopt.teammotivoo.data.model.response

import kotlinx.serialization.Serializable
import sopt.motivoo.domain.entity.dummy.DummyInfoList
import sopt.teammotivoo.domain.entity.dummy.DummyInfoList

@Serializable
data class DummyResponseData(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package sopt.motivoo.data.model.response
package sopt.teammotivoo.data.model.response

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import sopt.motivoo.domain.entity.exercise.ExerciseData
import sopt.motivoo.domain.entity.exercise.ExerciseData.ExerciseItemInfo
import sopt.motivoo.util.extension.prettyString
import sopt.teammotivoo.domain.entity.exercise.ExerciseData
import sopt.teammotivoo.domain.entity.exercise.ExerciseData.ExerciseItemInfo
import sopt.teammotivoo.util.extension.prettyString
import java.time.LocalDate

@Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sopt.motivoo.data.model.response
package sopt.teammotivoo.data.model.response

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Loading

0 comments on commit 728cab7

Please sign in to comment.