diff --git a/app/src/main/java/com/example/sprout/refactor/activity/BaseActivity.java b/app/src/main/java/com/example/sprout/refactor/activity/BaseActivity.java index fefc454..6b34794 100644 --- a/app/src/main/java/com/example/sprout/refactor/activity/BaseActivity.java +++ b/app/src/main/java/com/example/sprout/refactor/activity/BaseActivity.java @@ -58,7 +58,7 @@ case Start: startActivity(new Intent(BaseActivity.this, navigationMessage.getClazz())); break; - case Finsih: + case Finish: finish(); } }) diff --git a/app/src/main/java/com/example/sprout/refactor/messengers/NavigationMessage.java b/app/src/main/java/com/example/sprout/refactor/messengers/NavigationMessage.java index 90231a2..6c5327a 100644 --- a/app/src/main/java/com/example/sprout/refactor/messengers/NavigationMessage.java +++ b/app/src/main/java/com/example/sprout/refactor/messengers/NavigationMessage.java @@ -20,7 +20,7 @@ public enum Type { Start, // 指定のアクティビティを開始する - Finsih // アクティビティを終了する + Finish // アクティビティを終了する } public Type getType() { diff --git a/app/src/main/java/com/example/sprout/refactor/model/RoomResponseModel.java b/app/src/main/java/com/example/sprout/refactor/model/RoomResponseModel.java index 3a34899..8b416b4 100644 --- a/app/src/main/java/com/example/sprout/refactor/model/RoomResponseModel.java +++ b/app/src/main/java/com/example/sprout/refactor/model/RoomResponseModel.java @@ -13,7 +13,7 @@ * Created by matsumoto_k on 2017/12/19. */ public class RoomResponseModel { - private PublishSubject roomResopnseSubject = PublishSubject.create(); + private PublishSubject roomResponseSubject = PublishSubject.create(); private PublishSubject errorSubject = PublishSubject.create(); private RoomRepository roomRepository = null; private PreferenceUtil preferenceUtil = PreferenceUtil.getInstance(); @@ -29,7 +29,7 @@ .subscribe( roomResponse -> { if (roomResponse.canEnter()) { - roomResopnseSubject.onNext(roomResponse); + roomResponseSubject.onNext(roomResponse); } }, error -> { @@ -44,7 +44,7 @@ .subscribe( roomResponse -> { if (roomResponse.canEnter()) { - roomResopnseSubject.onNext(roomResponse); + roomResponseSubject.onNext(roomResponse); } }, error -> { @@ -58,7 +58,7 @@ .subscribeOn(Schedulers.computation()) .subscribe( roomResponse -> { - this.roomResopnseSubject.onNext(roomResponse); + this.roomResponseSubject.onNext(roomResponse); }, error -> { errorSubject.onNext(new Error(error)); @@ -67,7 +67,7 @@ } public Observable getRoomResopnseObservable() { - return roomResopnseSubject + return roomResponseSubject .hide() .doOnNext(roomResponse -> { preferenceUtil.saveInt(PreferenceUtil.Key.ROOM_ID, roomResponse.getRoom().getRoomId()); diff --git a/app/src/main/java/com/example/sprout/refactor/viewmodel/RegistrationViewModel.java b/app/src/main/java/com/example/sprout/refactor/viewmodel/RegistrationViewModel.java index 6aa8fd8..7b13147 100644 --- a/app/src/main/java/com/example/sprout/refactor/viewmodel/RegistrationViewModel.java +++ b/app/src/main/java/com/example/sprout/refactor/viewmodel/RegistrationViewModel.java @@ -33,7 +33,7 @@ // 既にアカウント登録されていたらされていたらルーム一覧に画面遷移する if (preferenceUtil.getBoolean(PreferenceUtil.Key.REGISTERED, false)) { navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Start, RoomListActivity.class)); - navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Finsih)); + navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Finish)); } subscribe(); } @@ -47,7 +47,7 @@ preferenceUtil.saveBoolean(PreferenceUtil.Key.REGISTERED, true); toastMessanger.showToast(new ToastMessage(Sprout.get().getResources().getString(R.string.success_registration), ToastMessage.Length.LONG)); navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Start, RoomListActivity.class)); - navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Finsih)); + navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Finish)); } ) ); diff --git a/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomCreateViewModel.java b/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomCreateViewModel.java index 578e662..da73aba 100644 --- a/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomCreateViewModel.java +++ b/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomCreateViewModel.java @@ -37,7 +37,7 @@ roomResponse -> { toastMessanger.showToast(new ToastMessage("ルームを作成しました", ToastMessage.Length.SHORT)); navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Start, RoomMainActivity.class)); - navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Finsih)); + navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Finish)); } ) ); @@ -69,7 +69,7 @@ } public void onClickBack() { - navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Finsih)); + navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Finish)); } public ObservableField getRoomName() { diff --git a/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomInputKeyViewModel.java b/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomInputKeyViewModel.java index e9887ff..23963ee 100644 --- a/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomInputKeyViewModel.java +++ b/app/src/main/java/com/example/sprout/refactor/viewmodel/RoomInputKeyViewModel.java @@ -31,7 +31,7 @@ roomResponse -> { if (roomResponse.canEnter()) { navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Start, RoomMainActivity.class)); - navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Finsih)); + navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Finish)); } } ) @@ -63,7 +63,7 @@ } public void onClickBack() { - navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Finsih)); + navigationMessenger.navigateTo(new NavigationMessage(NavigationMessage.Type.Finish)); } public ObservableField getPass() {