Skip to content

Commit

Permalink
[FIX/#267] 패키징 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
crownjoe committed Mar 22, 2024
1 parent 979d7da commit 6c59042
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,13 @@
android:screenOrientation="portrait" />

<activity
android:name="com.going.presentation.todo.edittrip.editinfo.EditTripInfoActivity"
android:name="com.going.presentation.entertrip.edittrip.editinfo.EditTripInfoActivity"
android:exported="false"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize" />

<activity
android:name="com.going.presentation.todo.edittrip.detail.DetailTripActivity"
android:name="com.going.presentation.entertrip.edittrip.detail.DetailTripActivity"
android:exported="false"
android:screenOrientation="portrait" />

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.going.presentation.todo.edittrip
package com.going.presentation.entertrip.edittrip

import android.content.Intent
import android.os.Bundle
Expand All @@ -8,7 +8,7 @@ import androidx.fragment.app.activityViewModels
import com.going.presentation.R
import com.going.presentation.dashboard.DashBoardActivity
import com.going.presentation.databinding.FragmentQuitTripDialogBinding
import com.going.presentation.todo.edittrip.detail.DetailTripViewModel
import com.going.presentation.entertrip.edittrip.detail.DetailTripViewModel
import com.going.ui.base.BaseDialog
import com.going.ui.extension.setOnSingleClickListener

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.going.presentation.todo.edittrip.detail
package com.going.presentation.entertrip.edittrip.detail

import android.app.Activity
import android.os.Bundle
Expand All @@ -8,8 +8,8 @@ import androidx.lifecycle.lifecycleScope
import com.going.presentation.R
import com.going.presentation.databinding.ActivityDetailTripBinding
import com.going.presentation.entertrip.invitetrip.invitecode.EnterTripActivity.Companion.TRIP_ID
import com.going.presentation.todo.edittrip.QuitTripDialogFragment
import com.going.presentation.todo.edittrip.editinfo.EditTripInfoActivity
import com.going.presentation.entertrip.edittrip.QuitTripDialogFragment
import com.going.presentation.entertrip.edittrip.editinfo.EditTripInfoActivity
import com.going.ui.base.BaseActivity
import com.going.ui.extension.setOnSingleClickListener
import com.going.ui.extension.toast
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.going.presentation.todo.edittrip.detail
package com.going.presentation.entertrip.edittrip.detail

import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.going.presentation.todo.edittrip.editinfo
package com.going.presentation.entertrip.edittrip.editinfo

import android.os.Bundle
import android.view.View
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.going.presentation.todo.edittrip.editinfo
package com.going.presentation.entertrip.edittrip.editinfo

import android.app.Activity
import android.content.Context
Expand All @@ -12,7 +12,7 @@ import androidx.lifecycle.lifecycleScope
import com.going.presentation.R
import com.going.presentation.databinding.ActivityEditTripInfoBinding
import com.going.presentation.entertrip.invitetrip.invitecode.EnterTripActivity.Companion.TRIP_ID
import com.going.presentation.todo.edittrip.detail.DetailTripActivity
import com.going.presentation.entertrip.edittrip.detail.DetailTripActivity
import com.going.ui.base.BaseActivity
import com.going.ui.extension.setOnSingleClickListener
import com.going.ui.extension.toast
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.going.presentation.todo.edittrip.editinfo
package com.going.presentation.entertrip.edittrip.editinfo

import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import com.going.presentation.profile.participant.ParticipantProfileActivity
import com.going.presentation.todo.TodoActivity.Companion.EXTRA_TRIP_ID
import com.going.presentation.todo.create.TodoCreateActivity
import com.going.presentation.todo.ourtodo.checkfriends.CheckFriendsActivity
import com.going.presentation.todo.edittrip.detail.DetailTripActivity
import com.going.presentation.entertrip.edittrip.detail.DetailTripActivity
import com.going.presentation.todo.ourtodo.friendlist.OurTodoFriendAdapter
import com.going.presentation.todo.ourtodo.invite.FriendInviteDialog
import com.going.presentation.todo.ourtodo.todolist.OurTodoViewPagerAdapter
Expand Down
4 changes: 2 additions & 2 deletions presentation/src/main/res/layout/activity_detail_trip.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

<variable
name="vm"
type="com.going.presentation.todo.edittrip.detail.DetailTripViewModel" />
type="com.going.presentation.entertrip.edittrip.detail.DetailTripViewModel" />
</data>

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white_000"
tools:context=".todo.edittrip.detail.DetailTripActivity">
tools:context=".entertrip.edittrip.detail.DetailTripActivity">

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/tb_edit_info"
Expand Down
4 changes: 2 additions & 2 deletions presentation/src/main/res/layout/activity_edit_trip_info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

<variable
name="viewModel"
type="com.going.presentation.todo.edittrip.editinfo.EditTripInfoViewModel" />
type="com.going.presentation.entertrip.edittrip.editinfo.EditTripInfoViewModel" />
</data>

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white_000"
tools:context=".todo.edittrip.editinfo.EditTripInfoActivity">
tools:context=".entertrip.edittrip.editinfo.EditTripInfoActivity">

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/tb_edit_trip_info"
Expand Down

0 comments on commit 6c59042

Please sign in to comment.