Skip to content

Commit 3298c5d

Browse files
WooVictoryWooVictory
committed
Modify Activity Name
1 parent fb0e9f3 commit 3298c5d

27 files changed

+67
-95
lines changed

‎app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
android:label="@string/title_activity_meow_box_review"
3434
android:theme="@style/AppTheme" />
3535
<activity
36-
android:name=".View.Order.OrderFirstActivity"
36+
android:name=".View.Order.OrderFragment.OrderWithOutCatInfoActivity"
3737
android:windowSoftInputMode="adjustResize" />
3838
<activity
3939
android:name=".View.MeowBoxDetail.MeowBoxDetailActivity"
@@ -44,7 +44,7 @@
4444
android:label="@string/title_activity_my_page"
4545
android:windowSoftInputMode="adjustNothing"
4646
android:theme="@style/AppTheme" />
47-
<activity android:name=".View.MyPage.MySettingActivity"
47+
<activity android:name=".View.MyPage.MyPageSettingActivity"
4848
android:windowSoftInputMode="adjustNothing"/>
4949
<activity
5050
android:name=".View.Login.LoginActivity"
@@ -55,14 +55,14 @@
5555
<activity
5656
android:name=".View.MyPage.Suggest.MyPageSuggestActivity"
5757
android:windowSoftInputMode="adjustNothing" />
58-
<activity android:name=".View.MyPage.Setting.MyPageSettingActivity" />
58+
<activity android:name=".View.MyPage.Setting.SettingActivity" />
5959
<activity android:name=".View.MyPage.FAQ.QuestionActivity" />
6060
<activity android:name=".View.MyPage.Setting.Notice.Notice2Activity" />
6161
<activity android:name=".View.MyPage.OrderHistory.OrderHistoryActivity" />
6262
<activity android:name=".View.MyPage.Setting.Terms.Terms2Activity" />
6363
<activity android:name=".View.MyPage.OrderHistory.OrderHistoryDetail.OrderHistoryDetailActivity" />
6464
<activity
65-
android:name=".View.Order.OrderThirdActivity"
65+
android:name=".View.Order.OrderFragmentWithCatInfo.OrderWithCatInfoActivity"
6666
android:label="@string/title_activity_order_third"
6767
android:theme="@style/AppTheme" />
6868
<activity android:name=".View.MyPage.OrderHistory.OrderHistoryDetail.OrderHistoryDetailHeaderActivity" />

‎app/src/main/java/woo/sopt22/meowbox/ApplicationController.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@ class ApplicationController : Application() {
2929

3030
networkService = retrofit.create(NetworkService::class.java)
3131
}
32-
}
32+
}
33+

‎app/src/main/java/woo/sopt22/meowbox/Util/CustomDialog/CatCustomDialog.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import android.view.View
88
import android.widget.LinearLayout
99
import kotlinx.android.synthetic.main.cat_information_custom_dialog.*
1010
import woo.sopt22.meowbox.R
11-
import woo.sopt22.meowbox.View.Order.OrderFirstActivity
11+
import woo.sopt22.meowbox.View.Order.OrderFragment.OrderWithOutCatInfoActivity
1212

1313

1414
class CatCustomDialog(context: Context) : Dialog(context), View.OnClickListener {
@@ -22,7 +22,7 @@ class CatCustomDialog(context: Context) : Dialog(context), View.OnClickListener
2222
dismiss()
2323
}
2424
cat_question_apply_btn->{
25-
context.startActivity(Intent(context, OrderFirstActivity::class.java))
25+
context.startActivity(Intent(context, OrderWithOutCatInfoActivity::class.java))
2626
}
2727

2828
}

‎app/src/main/java/woo/sopt22/meowbox/View/Home/MainActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import woo.sopt22.meowbox.View.MeowBoxStory.MeowBoxStoryActivity
4545
import woo.sopt22.meowbox.View.MyPage.CircleImageView
4646
import woo.sopt22.meowbox.View.MyPage.MyPageActivity
4747
import woo.sopt22.meowbox.View.Order.LoginCustomDialog
48-
import woo.sopt22.meowbox.View.Order.OrderThirdActivity
48+
import woo.sopt22.meowbox.View.Order.OrderFragmentWithCatInfo.OrderWithCatInfoActivity
4949

5050

5151
class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener, View.OnClickListener {
@@ -510,7 +510,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
510510
dialog.window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
511511
dialog.show()
512512
} else {
513-
val intent = Intent(this, OrderThirdActivity::class.java)
513+
val intent = Intent(this, OrderWithCatInfoActivity::class.java)
514514
intent.putExtra("cat_idx",SharedPreference.instance!!.getPrefStringData("cat_idx")!!)
515515
startActivity(intent)
516516
}

‎app/src/main/java/woo/sopt22/meowbox/View/MeowBoxBirthDay/BirthdayStoryDetailActivity.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ import android.os.Bundle
99
import android.support.v4.view.ViewPager
1010
import android.view.View
1111
import kotlinx.android.synthetic.main.activity_birthday_story_detail.*
12-
import kotlinx.android.synthetic.main.content_meow_box_detail.*
1312
import woo.sopt22.meowbox.R
1413
import woo.sopt22.meowbox.Util.CustomDialog.CatCustomDialog
1514
import woo.sopt22.meowbox.Util.SharedPreference
1615
import woo.sopt22.meowbox.View.MeowBoxDetail.DetailModel
1716
import woo.sopt22.meowbox.View.MeowBoxDetail.DetailViewAdapter
1817
import woo.sopt22.meowbox.View.Order.LoginCustomDialog
19-
import woo.sopt22.meowbox.View.Order.OrderThirdActivity
18+
import woo.sopt22.meowbox.View.Order.OrderFragmentWithCatInfo.OrderWithCatInfoActivity
2019

2120
class BirthdayStoryDetailActivity : AppCompatActivity(), View.OnClickListener {
2221
override fun onClick(v: View?) {
@@ -32,7 +31,7 @@ class BirthdayStoryDetailActivity : AppCompatActivity(), View.OnClickListener {
3231
dialog.window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
3332
dialog.show()
3433
} else {
35-
val intent = Intent(this, OrderThirdActivity::class.java)
34+
val intent = Intent(this, OrderWithCatInfoActivity::class.java)
3635
intent.putExtra("cat_idx",SharedPreference.instance!!.getPrefStringData("cat_idx")!!)
3736
startActivity(intent)
3837
}

‎app/src/main/java/woo/sopt22/meowbox/View/MeowBoxBirthDay/MeowBoxtBirthDayStoryActivity.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import android.graphics.drawable.BitmapDrawable
77
import android.graphics.drawable.ColorDrawable
88
import android.os.Build
99
import android.os.Bundle
10-
import android.support.design.widget.Snackbar
1110
import android.support.design.widget.NavigationView
1211
import android.support.v4.content.res.ResourcesCompat
1312
import android.support.v4.view.GravityCompat
@@ -20,7 +19,6 @@ import android.view.View
2019
import android.widget.ImageView
2120
import android.widget.TextView
2221
import com.bumptech.glide.Glide
23-
import com.bumptech.glide.request.RequestOptions
2422
import kotlinx.android.synthetic.main.activity_meow_boxt_birth_day_story.*
2523
import kotlinx.android.synthetic.main.app_bar_meow_boxt_birth_day_story.*
2624
import kotlinx.android.synthetic.main.content_meow_boxt_birth_day_story.*
@@ -35,7 +33,7 @@ import woo.sopt22.meowbox.View.MeowBoxReview.MeowBoxReviewActivity
3533
import woo.sopt22.meowbox.View.MeowBoxStory.MeowBoxStoryActivity
3634
import woo.sopt22.meowbox.View.MyPage.MyPageActivity
3735
import woo.sopt22.meowbox.View.Order.LoginCustomDialog
38-
import woo.sopt22.meowbox.View.Order.OrderThirdActivity
36+
import woo.sopt22.meowbox.View.Order.OrderFragmentWithCatInfo.OrderWithCatInfoActivity
3937

4038
class MeowBoxtBirthDayStoryActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener, View.OnClickListener{
4139
override fun onClick(v: View?) {
@@ -172,7 +170,7 @@ class MeowBoxtBirthDayStoryActivity : AppCompatActivity(), NavigationView.OnNavi
172170
dialog.window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
173171
dialog.show()
174172
} else {
175-
val intent = Intent(this, OrderThirdActivity::class.java)
173+
val intent = Intent(this, OrderWithCatInfoActivity::class.java)
176174
intent.putExtra("cat_idx", SharedPreference.instance!!.getPrefStringData("cat_idx")!!)
177175
startActivity(intent)
178176
}

‎app/src/main/java/woo/sopt22/meowbox/View/MeowBoxDetail/MeowBoxDetailActivity.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import android.support.v4.view.GravityCompat
1313
import android.support.v4.view.ViewPager
1414
import android.support.v7.app.ActionBarDrawerToggle
1515
import android.support.v7.app.AppCompatActivity
16-
import android.util.Log
1716
import android.view.Menu
1817
import android.view.MenuItem
1918
import android.view.View
@@ -32,12 +31,11 @@ import woo.sopt22.meowbox.Util.ToastMaker
3231
import woo.sopt22.meowbox.View.Home.MainActivity
3332
import woo.sopt22.meowbox.View.Login.LoginActivity
3433
import woo.sopt22.meowbox.View.MeowBoxBirthDay.MeowBoxtBirthDayStoryActivity
35-
import woo.sopt22.meowbox.View.MeowBoxReview.CircleAnimIndicator
3634
import woo.sopt22.meowbox.View.MeowBoxReview.MeowBoxReviewActivity
3735
import woo.sopt22.meowbox.View.MeowBoxStory.MeowBoxStoryActivity
3836
import woo.sopt22.meowbox.View.MyPage.MyPageActivity
3937
import woo.sopt22.meowbox.View.Order.LoginCustomDialog
40-
import woo.sopt22.meowbox.View.Order.OrderThirdActivity
38+
import woo.sopt22.meowbox.View.Order.OrderFragmentWithCatInfo.OrderWithCatInfoActivity
4139

4240
class MeowBoxDetailActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener, View.OnClickListener {
4341

@@ -54,7 +52,7 @@ class MeowBoxDetailActivity : AppCompatActivity(), NavigationView.OnNavigationIt
5452
dialog.window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
5553
dialog.show()
5654
} else {
57-
val intent = Intent(this, OrderThirdActivity::class.java)
55+
val intent = Intent(this, OrderWithCatInfoActivity::class.java)
5856
intent.putExtra("cat_idx", SharedPreference.instance!!.getPrefStringData("cat_idx")!!)
5957
startActivity(intent)
6058

@@ -365,7 +363,7 @@ class MeowBoxDetailActivity : AppCompatActivity(), NavigationView.OnNavigationIt
365363
dialog.window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
366364
dialog.show()
367365
} else {
368-
val intent = Intent(this, OrderThirdActivity::class.java)
366+
val intent = Intent(this, OrderWithCatInfoActivity::class.java)
369367
intent.putExtra("cat_idx", SharedPreference.instance!!.getPrefStringData("cat_idx")!!)
370368
startActivity(intent)
371369
}

‎app/src/main/java/woo/sopt22/meowbox/View/MeowBoxReview/MeowBoxReviewActivity.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import woo.sopt22.meowbox.ApplicationController
3131
import woo.sopt22.meowbox.Model.Review.ReviewResponse
3232
import woo.sopt22.meowbox.Network.NetworkService
3333
import woo.sopt22.meowbox.R
34-
import woo.sopt22.meowbox.R.drawable.side_bar_profile_img
3534
import woo.sopt22.meowbox.Util.CustomDialog.CatCustomDialog
3635
import woo.sopt22.meowbox.Util.SharedPreference
3736
import woo.sopt22.meowbox.Util.ToastMaker
@@ -41,7 +40,7 @@ import woo.sopt22.meowbox.View.MeowBoxBirthDay.MeowBoxtBirthDayStoryActivity
4140
import woo.sopt22.meowbox.View.MeowBoxStory.MeowBoxStoryActivity
4241
import woo.sopt22.meowbox.View.MyPage.MyPageActivity
4342
import woo.sopt22.meowbox.View.Order.LoginCustomDialog
44-
import woo.sopt22.meowbox.View.Order.OrderThirdActivity
43+
import woo.sopt22.meowbox.View.Order.OrderFragmentWithCatInfo.OrderWithCatInfoActivity
4544

4645
class MeowBoxReviewActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
4746

@@ -371,7 +370,7 @@ class MeowBoxReviewActivity : AppCompatActivity(), NavigationView.OnNavigationIt
371370
dialog.window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
372371
dialog.show()
373372
} else {
374-
val intent = Intent(this, OrderThirdActivity::class.java)
373+
val intent = Intent(this, OrderWithCatInfoActivity::class.java)
375374
intent.putExtra("cat_idx",SharedPreference.instance!!.getPrefStringData("cat_idx")!!)
376375
startActivity(intent)
377376
}

‎app/src/main/java/woo/sopt22/meowbox/View/MeowBoxStory/MeowBoxStoryActivity.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import android.support.v4.content.res.ResourcesCompat
1212
import android.support.v4.view.GravityCompat
1313
import android.support.v7.app.ActionBarDrawerToggle
1414
import android.support.v7.app.AppCompatActivity
15-
import android.util.Log
1615
import android.view.Menu
1716
import android.view.MenuItem
1817
import android.view.View
@@ -33,7 +32,7 @@ import woo.sopt22.meowbox.View.MeowBoxBirthDay.MeowBoxtBirthDayStoryActivity
3332
import woo.sopt22.meowbox.View.MeowBoxReview.MeowBoxReviewActivity
3433
import woo.sopt22.meowbox.View.MyPage.MyPageActivity
3534
import woo.sopt22.meowbox.View.Order.LoginCustomDialog
36-
import woo.sopt22.meowbox.View.Order.OrderThirdActivity
35+
import woo.sopt22.meowbox.View.Order.OrderFragmentWithCatInfo.OrderWithCatInfoActivity
3736

3837
class MeowBoxStoryActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener, View.OnClickListener {
3938
override fun onClick(v: View?) {
@@ -49,7 +48,7 @@ class MeowBoxStoryActivity : AppCompatActivity(), NavigationView.OnNavigationIte
4948
dialog.window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
5049
dialog.show()
5150
} else {
52-
val intent = Intent(this, OrderThirdActivity::class.java)
51+
val intent = Intent(this, OrderWithCatInfoActivity::class.java)
5352
intent.putExtra("cat_idx", SharedPreference.instance!!.getPrefStringData("cat_idx")!!)
5453
startActivity(intent)
5554
}
@@ -66,7 +65,7 @@ class MeowBoxStoryActivity : AppCompatActivity(), NavigationView.OnNavigationIte
6665
dialog.window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
6766
dialog.show()
6867
} else {
69-
val intent = Intent(this, OrderThirdActivity::class.java)
68+
val intent = Intent(this, OrderWithCatInfoActivity::class.java)
7069
intent.putExtra("cat_idx", SharedPreference.instance!!.getPrefStringData("cat_idx")!!)
7170
startActivity(intent)
7271
}
@@ -196,7 +195,7 @@ class MeowBoxStoryActivity : AppCompatActivity(), NavigationView.OnNavigationIte
196195
dialog.window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
197196
dialog.show()
198197
} else {
199-
val intent = Intent(this, OrderThirdActivity::class.java)
198+
val intent = Intent(this, OrderWithCatInfoActivity::class.java)
200199
intent.putExtra("cat_idx", SharedPreference.instance!!.getPrefStringData("cat_idx")!!)
201200
startActivity(intent)
202201
}

‎app/src/main/java/woo/sopt22/meowbox/View/MyPage/MyPageActivity.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,24 @@ import woo.sopt22.meowbox.View.MeowBoxStory.MeowBoxStoryActivity
4444
import woo.sopt22.meowbox.View.MyPage.FAQ.QuestionActivity
4545
import woo.sopt22.meowbox.View.MyPage.OrderHistory.OrderHistoryActivity
4646
import woo.sopt22.meowbox.View.MyPage.ProgressBar.StateProgressBar
47-
import woo.sopt22.meowbox.View.MyPage.Setting.MyPageSettingActivity
47+
import woo.sopt22.meowbox.View.MyPage.Setting.SettingActivity
4848
import woo.sopt22.meowbox.View.MyPage.Suggest.MyPageSuggestActivity
4949
import woo.sopt22.meowbox.View.Order.LoginCustomDialog
50-
import woo.sopt22.meowbox.View.Order.OrderThirdActivity
50+
import woo.sopt22.meowbox.View.Order.OrderFragmentWithCatInfo.OrderWithCatInfoActivity
5151

5252
class MyPageActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener, View.OnClickListener {
5353
override fun onClick(v: View?) {
5454
when(v!!){
5555
mypage_setting -> {
56-
val intent = Intent(applicationContext, MySettingActivity::class.java)
56+
val intent = Intent(applicationContext, MyPageSettingActivity::class.java)
5757
startActivity(intent);
5858
}
5959
mypage_suggest_btn->{
6060
startActivity(Intent(this, MyPageSuggestActivity::class.java))
6161
}
6262

6363
mypage_setting_btn->{
64-
startActivity(Intent(this, MyPageSettingActivity::class.java))
64+
startActivity(Intent(this, SettingActivity::class.java))
6565
}
6666
mypage_qna_btn->{
6767
startActivity(Intent(this, QuestionActivity::class.java))
@@ -82,7 +82,7 @@ class MyPageActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelec
8282
dialog.window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
8383
dialog.show()
8484
} else {
85-
val intent = Intent(this, OrderThirdActivity::class.java)
85+
val intent = Intent(this, OrderWithCatInfoActivity::class.java)
8686
intent.putExtra("cat_idx",SharedPreference.instance!!.getPrefStringData("cat_idx")!!)
8787
startActivity(intent)
8888
}
@@ -424,7 +424,7 @@ class MyPageActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelec
424424
dialog.window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
425425
dialog.show()
426426
} else {
427-
val intent = Intent(this, OrderThirdActivity::class.java)
427+
val intent = Intent(this, OrderWithCatInfoActivity::class.java)
428428
intent.putExtra("cat_idx",SharedPreference.instance!!.getPrefStringData("cat_idx")!!)
429429
startActivity(intent)
430430
}

0 commit comments

Comments
 (0)