Skip to content

Commit

Permalink
[mod/#12] package name
Browse files Browse the repository at this point in the history
패키지이름 org.sopt.dosoptkwanheejo 로변경
  • Loading branch information
Jokwanhee committed Nov 17, 2023
1 parent 0a57055 commit e6439fb
Show file tree
Hide file tree
Showing 52 changed files with 182 additions and 199 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())

android {
namespace 'org.sopt.dosopttemplate'
namespace 'org.sopt.dosoptkwanheejo'
compileSdk 33

defaultConfig {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.dosopttemplate
package org.sopt.dosoptkwanheejo

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.sopt.dosopttemplate
package org.sopt.dosoptkwanheejo

import android.app.Application
import android.content.Context
import android.content.SharedPreferences
import org.sopt.dosopttemplate.db.remote.AuthApiHelper
import org.sopt.dosopttemplate.db.remote.RetrofitServicePool
import org.sopt.dosopttemplate.db.remote.UserApiHelper
import org.sopt.dosoptkwanheejo.db.remote.AuthApiHelper
import org.sopt.dosoptkwanheejo.db.remote.RetrofitServicePool
import org.sopt.dosoptkwanheejo.db.remote.UserApiHelper

class DoSoptApp : Application() {
override fun onCreate() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.sopt.dosopttemplate.adapter.user
package org.sopt.dosoptkwanheejo.adapter.user

import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import org.sopt.dosopttemplate.databinding.ItemUserBinding
import org.sopt.dosopttemplate.model.dto.resp.user.UserDataResp
import org.sopt.dosoptkwanheejo.databinding.ItemUserBinding
import org.sopt.dosoptkwanheejo.model.dto.resp.user.UserDataResp

class UserAdapter : ListAdapter<UserDataResp, UserViewHolder>(diffUtil) {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UserViewHolder {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package org.sopt.dosopttemplate.adapter.user
package org.sopt.dosoptkwanheejo.adapter.user

import androidx.recyclerview.widget.RecyclerView
import org.sopt.dosopttemplate.databinding.ItemUserBinding
import org.sopt.dosopttemplate.model.dto.resp.user.UserDataResp
import org.sopt.dosopttemplate.util.loadUrl
import org.sopt.dosopttemplate.util.roundedCornerGlide
import org.sopt.dosoptkwanheejo.databinding.ItemUserBinding
import org.sopt.dosoptkwanheejo.model.dto.resp.user.UserDataResp
import org.sopt.dosoptkwanheejo.util.loadUrl

class UserViewHolder(
private val binding: ItemUserBinding
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.sopt.dosopttemplate.api
package org.sopt.dosoptkwanheejo.api

import org.sopt.dosopttemplate.model.dto.req.LoginReq
import org.sopt.dosopttemplate.model.dto.req.SignUpReq
import org.sopt.dosopttemplate.model.dto.resp.auth.LoginResp
import org.sopt.dosoptkwanheejo.model.dto.req.LoginReq
import org.sopt.dosoptkwanheejo.model.dto.req.SignUpReq
import org.sopt.dosoptkwanheejo.model.dto.resp.auth.LoginResp
import retrofit2.Call
import retrofit2.http.Body
import retrofit2.http.POST
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.sopt.dosopttemplate.api
package org.sopt.dosoptkwanheejo.api

import org.sopt.dosopttemplate.model.dto.resp.user.UserResp
import org.sopt.dosoptkwanheejo.model.dto.resp.user.UserResp
import retrofit2.Call
import retrofit2.http.GET
import retrofit2.http.Query
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package org.sopt.dosopttemplate.base
package org.sopt.dosoptkwanheejo.base

import android.os.Bundle
import android.view.LayoutInflater
import androidx.appcompat.app.AppCompatActivity
import androidx.viewbinding.ViewBinding
import com.google.android.material.snackbar.Snackbar

abstract class BaseActivity<T : ViewBinding>(val bindingFactory: (LayoutInflater) -> T) :
AppCompatActivity() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package org.sopt.dosopttemplate.base
package org.sopt.dosoptkwanheejo.base

import android.content.DialogInterface
import android.os.Bundle
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.Window
import androidx.annotation.LayoutRes
import androidx.databinding.DataBindingUtil
import androidx.databinding.ViewDataBinding
import androidx.fragment.app.DialogFragment
import org.sopt.dosopttemplate.util.showShortSnackBar

abstract class BaseDialogFragment<T : ViewDataBinding> : DialogFragment() {
@get:LayoutRes
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.dosopttemplate.base
package org.sopt.dosoptkwanheejo.base

import android.os.Bundle
import android.view.LayoutInflater
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package org.sopt.dosopttemplate.db.local
package org.sopt.dosoptkwanheejo.db.local

import androidx.core.content.edit
import org.sopt.dosopttemplate.DoSoptApp.Companion.sharedPreferencesInstance
import org.sopt.dosopttemplate.model.User
import org.sopt.dosoptkwanheejo.DoSoptApp.Companion.sharedPreferencesInstance

class PreferenceManager {
fun setAutoLogin(auto: Boolean) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.sopt.dosopttemplate.db.remote
package org.sopt.dosoptkwanheejo.db.remote

import org.sopt.dosopttemplate.api.AuthAPI
import org.sopt.dosopttemplate.db.local.PreferenceManager
import org.sopt.dosopttemplate.db.remote.RetrofitManager.BASE_URL
import org.sopt.dosopttemplate.model.dto.RespResult
import org.sopt.dosopttemplate.model.dto.req.LoginReq
import org.sopt.dosopttemplate.model.dto.req.SignUpReq
import org.sopt.dosopttemplate.model.dto.resp.auth.LoginResp
import org.sopt.dosopttemplate.model.dto.resp.auth.SignUpResp
import org.sopt.dosopttemplate.util.toErrorResult
import org.sopt.dosoptkwanheejo.api.AuthAPI
import org.sopt.dosoptkwanheejo.db.local.PreferenceManager
import org.sopt.dosoptkwanheejo.db.remote.RetrofitManager.BASE_URL
import org.sopt.dosoptkwanheejo.model.dto.RespResult
import org.sopt.dosoptkwanheejo.model.dto.req.LoginReq
import org.sopt.dosoptkwanheejo.model.dto.req.SignUpReq
import org.sopt.dosoptkwanheejo.model.dto.resp.auth.LoginResp
import org.sopt.dosoptkwanheejo.model.dto.resp.auth.SignUpResp
import org.sopt.dosoptkwanheejo.util.toErrorResult
import retrofit2.Call
import retrofit2.Response

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package org.sopt.dosopttemplate.db.remote
package org.sopt.dosoptkwanheejo.db.remote

import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
import kotlinx.serialization.json.Json
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
import org.sopt.dosopttemplate.BuildConfig
import org.sopt.dosopttemplate.BuildConfig.BASE_URL
import org.sopt.dosopttemplate.api.AuthAPI
import org.sopt.dosopttemplate.api.UserAPI
import org.sopt.dosopttemplate.db.remote.RetrofitManager.USER_BASE_URL
import org.sopt.dosoptkwanheejo.BuildConfig
import org.sopt.dosoptkwanheejo.BuildConfig.BASE_URL
import org.sopt.dosoptkwanheejo.api.AuthAPI
import org.sopt.dosoptkwanheejo.api.UserAPI
import org.sopt.dosoptkwanheejo.db.remote.RetrofitManager.USER_BASE_URL
import retrofit2.Retrofit

object RetrofitManager {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package org.sopt.dosopttemplate.db.remote
package org.sopt.dosoptkwanheejo.db.remote

import android.util.Log
import org.sopt.dosopttemplate.api.AuthAPI
import org.sopt.dosopttemplate.api.UserAPI
import org.sopt.dosopttemplate.model.dto.resp.user.UserResp
import org.sopt.dosoptkwanheejo.api.UserAPI
import org.sopt.dosoptkwanheejo.model.dto.resp.user.UserResp
import retrofit2.Call
import retrofit2.Response

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.dosopttemplate.model
package org.sopt.dosoptkwanheejo.model

enum class HomeBottomItem {
ANDROID, HOME, MYPAGE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.dosopttemplate.model
package org.sopt.dosoptkwanheejo.model


data class Music(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.sopt.dosopttemplate.model
package org.sopt.dosoptkwanheejo.model

import android.os.Parcelable
import kotlinx.parcelize.Parcelize
import org.sopt.dosopttemplate.util.MBTI
import org.sopt.dosoptkwanheejo.util.MBTI

@Parcelize
data class User(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.dosopttemplate.model.dto
package org.sopt.dosoptkwanheejo.model.dto

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 org.sopt.dosopttemplate.model.dto.req
package org.sopt.dosoptkwanheejo.model.dto.req

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 org.sopt.dosopttemplate.model.dto.req
package org.sopt.dosoptkwanheejo.model.dto.req

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.sopt.dosopttemplate.model.dto.resp.auth
package org.sopt.dosoptkwanheejo.model.dto.resp.auth

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import org.sopt.dosopttemplate.model.dto.RespResult
import org.sopt.dosoptkwanheejo.model.dto.RespResult

@Serializable
data class LoginResp(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.dosopttemplate.model.dto.resp.auth
package org.sopt.dosoptkwanheejo.model.dto.resp.auth

sealed class SignUpResp {
data class Success(val location: String): SignUpResp()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.dosopttemplate.model.dto.resp.user
package org.sopt.dosoptkwanheejo.model.dto.resp.user

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 org.sopt.dosopttemplate.model.dto.resp.user
package org.sopt.dosoptkwanheejo.model.dto.resp.user

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 org.sopt.dosopttemplate.model.dto.resp.user
package org.sopt.dosoptkwanheejo.model.dto.resp.user

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 org.sopt.dosopttemplate.presentation.detail
package org.sopt.dosoptkwanheejo.presentation.detail

import org.sopt.dosopttemplate.base.BaseActivity
import org.sopt.dosopttemplate.databinding.ActivityHomeDetailBinding
import org.sopt.dosoptkwanheejo.base.BaseActivity
import org.sopt.dosoptkwanheejo.databinding.ActivityHomeDetailBinding

class HomeDetailActivity :
BaseActivity<ActivityHomeDetailBinding>(ActivityHomeDetailBinding::inflate) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.sopt.dosopttemplate.presentation.home
package org.sopt.dosoptkwanheejo.presentation.home

import android.os.Bundle
import android.view.View
import org.sopt.dosopttemplate.R
import org.sopt.dosopttemplate.base.BaseFragment
import org.sopt.dosopttemplate.databinding.FragmentAndroidBinding
import org.sopt.dosoptkwanheejo.R
import org.sopt.dosoptkwanheejo.base.BaseFragment
import org.sopt.dosoptkwanheejo.databinding.FragmentAndroidBinding

class AndroidFragment : BaseFragment<FragmentAndroidBinding>() {
override val layoutId: Int
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package org.sopt.dosopttemplate.presentation.home
package org.sopt.dosoptkwanheejo.presentation.home

import android.content.res.Configuration
import androidx.activity.OnBackPressedCallback
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import org.sopt.dosopttemplate.DoSoptApp
import org.sopt.dosopttemplate.R
import org.sopt.dosopttemplate.base.BaseActivity
import org.sopt.dosopttemplate.databinding.ActivityHomeBinding
import org.sopt.dosopttemplate.model.HomeBottomItem
import org.sopt.dosopttemplate.presentation.home.viewmodel.HomeViewModel
import org.sopt.dosopttemplate.repository.UserRepository
import org.sopt.dosopttemplate.util.UserViewModelFactory
import org.sopt.dosopttemplate.util.showShortToastMessage
import org.sopt.dosoptkwanheejo.DoSoptApp
import org.sopt.dosoptkwanheejo.R
import org.sopt.dosoptkwanheejo.base.BaseActivity
import org.sopt.dosoptkwanheejo.databinding.ActivityHomeBinding
import org.sopt.dosoptkwanheejo.model.HomeBottomItem
import org.sopt.dosoptkwanheejo.presentation.home.viewmodel.HomeViewModel
import org.sopt.dosoptkwanheejo.repository.UserRepository
import org.sopt.dosoptkwanheejo.util.UserViewModelFactory
import org.sopt.dosoptkwanheejo.util.showShortToastMessage

class HomeActivity : BaseActivity<ActivityHomeBinding>(ActivityHomeBinding::inflate) {
private var backPressedTime = 0L
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package org.sopt.dosopttemplate.presentation.home
package org.sopt.dosoptkwanheejo.presentation.home

import android.os.Bundle
import android.view.View
import androidx.fragment.app.activityViewModels
import androidx.recyclerview.widget.GridLayoutManager
import org.sopt.dosopttemplate.R
import org.sopt.dosopttemplate.adapter.user.UserAdapter
import org.sopt.dosopttemplate.base.BaseFragment
import org.sopt.dosopttemplate.databinding.FragmentHomeBinding
import org.sopt.dosopttemplate.model.HomeBottomItem
import org.sopt.dosopttemplate.model.dto.resp.user.UserResp
import org.sopt.dosopttemplate.presentation.home.dialog.HomeAddDialogFragment
import org.sopt.dosopttemplate.presentation.home.viewmodel.HomeViewModel
import org.sopt.dosoptkwanheejo.R
import org.sopt.dosoptkwanheejo.adapter.user.UserAdapter
import org.sopt.dosoptkwanheejo.base.BaseFragment
import org.sopt.dosoptkwanheejo.databinding.FragmentHomeBinding
import org.sopt.dosoptkwanheejo.model.HomeBottomItem
import org.sopt.dosoptkwanheejo.model.dto.resp.user.UserResp
import org.sopt.dosoptkwanheejo.presentation.home.dialog.HomeAddDialogFragment
import org.sopt.dosoptkwanheejo.presentation.home.viewmodel.HomeViewModel

class HomeFragment : BaseFragment<FragmentHomeBinding>() {
override val layoutId: Int
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package org.sopt.dosopttemplate.presentation.home
package org.sopt.dosoptkwanheejo.presentation.home

import android.os.Bundle
import android.view.View
import org.sopt.dosopttemplate.DoSoptApp.Companion.sharedPreferencesInstance
import org.sopt.dosopttemplate.R
import org.sopt.dosopttemplate.base.BaseFragment
import org.sopt.dosopttemplate.databinding.FragmentMypageBinding
import org.sopt.dosopttemplate.db.local.PreferenceManager
import org.sopt.dosopttemplate.db.local.PreferenceManager.Companion.ID
import org.sopt.dosopttemplate.db.local.PreferenceManager.Companion.MBTI
import org.sopt.dosopttemplate.db.local.PreferenceManager.Companion.NICKNAME
import org.sopt.dosoptkwanheejo.DoSoptApp.Companion.sharedPreferencesInstance
import org.sopt.dosoptkwanheejo.R
import org.sopt.dosoptkwanheejo.base.BaseFragment
import org.sopt.dosoptkwanheejo.databinding.FragmentMypageBinding
import org.sopt.dosoptkwanheejo.db.local.PreferenceManager.Companion.ID
import org.sopt.dosoptkwanheejo.db.local.PreferenceManager.Companion.MBTI
import org.sopt.dosoptkwanheejo.db.local.PreferenceManager.Companion.NICKNAME

class MyPageFragment : BaseFragment<FragmentMypageBinding>() {
override val layoutId: Int
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.sopt.dosopttemplate.presentation.home.dialog
package org.sopt.dosoptkwanheejo.presentation.home.dialog

import android.os.Bundle
import android.view.View
import androidx.core.view.isVisible
import org.sopt.dosopttemplate.R
import org.sopt.dosopttemplate.base.BaseDialogFragment
import org.sopt.dosopttemplate.databinding.DialogFragmentHomeAddBinding
import org.sopt.dosopttemplate.util.hideKeyboard
import org.sopt.dosopttemplate.util.showShortSnackBar
import org.sopt.dosoptkwanheejo.R
import org.sopt.dosoptkwanheejo.base.BaseDialogFragment
import org.sopt.dosoptkwanheejo.databinding.DialogFragmentHomeAddBinding
import org.sopt.dosoptkwanheejo.util.hideKeyboard
import org.sopt.dosoptkwanheejo.util.showShortSnackBar

class HomeAddDialogFragment : BaseDialogFragment<DialogFragmentHomeAddBinding>() {
override val layoutResId: Int
Expand Down
Loading

0 comments on commit e6439fb

Please sign in to comment.