Skip to content

Commit

Permalink
[chore] #204 Modify package name
Browse files Browse the repository at this point in the history
  • Loading branch information
Haeeul committed Aug 26, 2022
1 parent 4afdf00 commit 6cb9574
Show file tree
Hide file tree
Showing 239 changed files with 971 additions and 976 deletions.

This file was deleted.

9 changes: 0 additions & 9 deletions afume-ui/src/main/res/drawable/afume_ui_select_box_shape.xml

This file was deleted.

This file was deleted.

This file was deleted.

8 changes: 0 additions & 8 deletions afume-ui/src/main/res/values/colors.xml

This file was deleted.

19 changes: 0 additions & 19 deletions afume-ui/src/main/res/values/dimen.xml

This file was deleted.

27 changes: 0 additions & 27 deletions afume-ui/src/main/res/values/styles.xml

This file was deleted.

3 changes: 0 additions & 3 deletions afume_ui_sample/src/main/res/values/strings.xml

This file was deleted.

4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
buildToolsVersion ConfigData.buildToolsVersion

defaultConfig {
applicationId "com.afume.afume_android"
applicationId "com.scents.note"
minSdkVersion ConfigData.minSdkVersion
targetSdkVersion ConfigData.targetSdkVersion
versionCode ConfigData.versionCode
Expand Down Expand Up @@ -40,7 +40,7 @@ android {
}

dependencies {
implementation project(path: ':afume-ui')
implementation project(path: ':scents-note-ui')

implementation Dependencies.supportV4

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afume.afume_ui
package com.scents.note

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand All @@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.afume.afume_ui.test", appContext.packageName)
assertEquals("com.scents.note", appContext.packageName)
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.afume.afume_android.data.remote.network
package com.scents.note.data.remote.network

import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import com.afume.afume_android.data.vo.request.RequestLogin
import com.scents.note.data.vo.request.RequestLogin
import kotlinx.coroutines.runBlocking
import org.junit.Assert
import org.junit.Before
Expand All @@ -11,9 +11,9 @@ import org.junit.runner.RunWith
import retrofit2.HttpException

@RunWith(AndroidJUnit4::class)
class AfumeServiceImplTest {
class ScentsNoteServiceImplTest {

private var api: AfumeService = AfumeServiceImpl.service
private var api: ScentsNoteService = ScentsNoteServiceImpl.service
private var token: String? = null

@Before
Expand All @@ -33,7 +33,7 @@ class AfumeServiceImplTest {
@Test
fun useAppContext() {
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
Assert.assertEquals("com.afume.afume_android", appContext.packageName)
Assert.assertEquals("com.scents.note", appContext.packageName)
}

@Test
Expand Down
44 changes: 22 additions & 22 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.afume.afume_android">
package="com.scents.note">

<uses-permission android:name="android.permission.INTERNET" />

<application
android:name=".AfumeApplication"
android:name="com.scents.note.ScentsNoteApplication"
android:allowBackup="false"
android:fullBackupContent="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.AfumeAndroid"
android:theme="@style/Theme.ScentsNoteAndroid"
android:usesCleartextTraffic="true"
tools:replace="android:allowBackup,android:theme">
<activity android:name=".ui.my.MyInquiryActivity"></activity>
<activity android:name="com.scents.note.ui.my.MyInquiryActivity" />
<activity
android:name=".ui.splash.SplashActivity"
android:name="com.scents.note.ui.splash.SplashActivity"
android:theme="@style/SplashTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".ui.search.SearchTextActivity" />
<activity android:name=".ui.setting.EditMyInfoActivity" />
<activity android:name=".ui.setting.EditPasswordActivity" android:windowSoftInputMode="stateAlwaysVisible" />
<activity android:name=".ui.ButtonActivity"/>
<activity android:name=".ui.signin.SignHomeActivity" />
<activity android:name=".ui.signin.SignInActivity" android:windowSoftInputMode="stateAlwaysVisible" />
<activity android:name=".ui.signup.SignUpEmailActivity" android:windowSoftInputMode="stateVisible" />
<activity android:name=".ui.signup.SignUpPasswordActivity" android:windowSoftInputMode="stateVisible"/>
<activity android:name=".ui.signup.SignUpGenderActivity" />
<activity android:name=".ui.signup.SignUpAgeActivity" />
<activity android:name=".ui.survey.SurveyActivity" />
<activity android:name=".ui.note.NoteActivity" android:windowSoftInputMode="stateAlwaysHidden"/>
<activity android:name=".ui.filter.FilterActivity" />
<activity android:name=".ui.detail.PerfumeDetailActivity" />
<activity android:name=".ui.signup.PrivacyPolicyActivity" />
<activity android:name=".ui.home.MoreNewPerfumeActivity" />
<activity android:name=".ui.MainActivity" />
<activity android:name="com.scents.note.ui.search.SearchTextActivity" />
<activity android:name="com.scents.note.ui.setting.EditMyInfoActivity" />
<activity android:name="com.scents.note.ui.setting.EditPasswordActivity" android:windowSoftInputMode="stateAlwaysVisible" />
<activity android:name="com.scents.note.ui.ButtonActivity"/>
<activity android:name="com.scents.note.ui.signin.SignHomeActivity" />
<activity android:name="com.scents.note.ui.signin.SignInActivity" android:windowSoftInputMode="stateAlwaysVisible" />
<activity android:name="com.scents.note.ui.signup.SignUpEmailActivity" android:windowSoftInputMode="stateVisible" />
<activity android:name="com.scents.note.ui.signup.SignUpPasswordActivity" android:windowSoftInputMode="stateVisible"/>
<activity android:name="com.scents.note.ui.signup.SignUpGenderActivity" />
<activity android:name="com.scents.note.ui.signup.SignUpAgeActivity" />
<activity android:name="com.scents.note.ui.survey.SurveyActivity" />
<activity android:name="com.scents.note.ui.note.NoteActivity" android:windowSoftInputMode="stateAlwaysHidden"/>
<activity android:name="com.scents.note.ui.filter.FilterActivity" />
<activity android:name="com.scents.note.ui.detail.PerfumeDetailActivity" />
<activity android:name="com.scents.note.ui.signup.PrivacyPolicyActivity" />
<activity android:name="com.scents.note.ui.home.MoreNewPerfumeActivity" />
<activity android:name="com.scents.note.ui.MainActivity" />
</application>

</manifest>

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.afume.afume_android
package com.scents.note

import android.app.Application
import android.content.Context
import androidx.appcompat.app.AppCompatDelegate
import com.afume.afume_android.data.local.preference.SharedPreferencesManager
import com.scents.note.data.local.preference.SharedPreferencesManager

class AfumeApplication : Application() {
class ScentsNoteApplication : Application() {

companion object {
lateinit var prefManager : SharedPreferencesManager
private var instance: AfumeApplication? = null
private var instance: ScentsNoteApplication? = null
fun applicationContext() : Context {
return instance!!.applicationContext
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.afume.afume_android.data.local.preference
package com.scents.note.data.local.preference

import android.content.Context
import android.content.SharedPreferences
import androidx.annotation.CallSuper
import androidx.core.content.edit
import com.afume.afume_android.AfumeApplication
import com.scents.note.ScentsNoteApplication

class SharedPreferencesManager (context: Context){
private val sharedPreferences : SharedPreferences = context.getSharedPreferences(PREFERENCES_KEY, Context.MODE_PRIVATE)
Expand Down Expand Up @@ -61,7 +61,7 @@ class SharedPreferencesManager (context: Context){
}

fun haveToken(): Boolean {
return AfumeApplication.prefManager.accessToken != ""
return ScentsNoteApplication.prefManager.accessToken != ""
}

companion object {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.afume.afume_android.data.remote
package com.scents.note.data.remote

import com.afume.afume_android.data.vo.request.*
import com.afume.afume_android.data.vo.response.*
import com.scents.note.data.vo.request.*
import com.scents.note.data.vo.response.*

interface RemoteDataSource {
suspend fun getValidateEmail(email : String): Boolean
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.afume.afume_android.data.remote
package com.scents.note.data.remote

import android.util.Log
import com.afume.afume_android.data.remote.network.AfumeServiceImpl
import com.afume.afume_android.data.vo.request.*
import com.afume.afume_android.data.vo.response.*
import com.scents.note.data.remote.network.ScentsNoteServiceImpl
import com.scents.note.data.vo.request.*
import com.scents.note.data.vo.response.*

class RemoteDataSourceImpl : RemoteDataSource{
val api = AfumeServiceImpl.service
val api = ScentsNoteServiceImpl.service

override suspend fun getValidateEmail(email: String): Boolean{
return api.getValidateEmail(email).data
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
package com.afume.afume_android.data.remote.network

import okhttp3.Interceptor
import okhttp3.Response
package com.scents.note.data.remote.network

//class NetworkInterceptor : Interceptor {
// override fun intercept(chain: Interceptor.Chain): Response {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.afume.afume_android.data.remote.network
package com.scents.note.data.remote.network

import com.afume.afume_android.data.vo.request.*
import com.afume.afume_android.data.vo.response.*
import com.scents.note.data.vo.request.*
import com.scents.note.data.vo.response.*
import io.reactivex.Single
import retrofit2.http.*

interface AfumeService {
interface ScentsNoteService {
//Sign - validate email
@GET("user/validate/email")
suspend fun getValidateEmail(
Expand Down
Loading

0 comments on commit 6cb9574

Please sign in to comment.