From a9881efcf369c79252eb3116610405930f602b39 Mon Sep 17 00:00:00 2001 From: Dosssik Date: Mon, 22 Oct 2018 19:20:03 +0500 Subject: [PATCH 01/36] Updated kotlin fragment template for support lib >= 27 --- .../root/src/app_package/ui/fragment/BlankFragment.kt.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl b/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl index 29a7c218..8eeb662e 100644 --- a/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl +++ b/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl @@ -35,7 +35,7 @@ class ${className} : MvpFragment(), ${viewName} { } - override fun onViewCreated(view: View?, savedInstanceState: Bundle?) { + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) } From 040da05c41b84d7a303ac6cfcae44d2df57297db Mon Sep 17 00:00:00 2001 From: Yuri Shmakov Date: Sun, 25 Nov 2018 00:50:16 +0700 Subject: [PATCH 02/36] [artifact] Prepare version 1.5.6 --- README.md | 10 +++++----- build.gradle | 4 ++-- sample-custom-strategy/build.gradle | 2 +- sample-github/build.gradle | 6 +++--- sample-kotlin/build.gradle | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 88628785..ed240398 100644 --- a/README.md +++ b/README.md @@ -76,22 +76,22 @@ Base modules integration: ```groovy dependencies { ... - compile 'com.arello-mobile:moxy:1.5.5' - annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.5' + compile 'com.arello-mobile:moxy:1.5.6' + annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.6' } ``` For additional base view classes `MvpActivity` and `MvpFragment` add this: ```groovy dependencies { ... - compile 'com.arello-mobile:moxy-android:1.5.5' + compile 'com.arello-mobile:moxy-android:1.5.6' } ``` If you are planning to use AppCompat, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this: ```groovy dependencies { ... - compile 'com.arello-mobile:moxy-app-compat:1.5.5' + compile 'com.arello-mobile:moxy-app-compat:1.5.6' compile 'com.android.support:appcompat-v7:$support_version' } ``` @@ -102,7 +102,7 @@ apply plugin: 'kotlin-kapt' dependencies { ... - kapt 'com.arello-mobile:moxy-compiler:1.5.5' + kapt 'com.arello-mobile:moxy-compiler:1.5.6' } ``` diff --git a/build.gradle b/build.gradle index 6e919f67..c9151251 100644 --- a/build.gradle +++ b/build.gradle @@ -20,8 +20,8 @@ allprojects { } ext { - targetVersionCode = 45 - targetVersionName = "1.5.5" + targetVersionCode = 46 + targetVersionName = "1.5.6" deps = [ android : 'com.google.android:android:1.6_r2', diff --git a/sample-custom-strategy/build.gradle b/sample-custom-strategy/build.gradle index 71a5aa53..4ae7711c 100644 --- a/sample-custom-strategy/build.gradle +++ b/sample-custom-strategy/build.gradle @@ -44,7 +44,7 @@ dependencies { implementation "com.android.support:appcompat-v7:$supportVersion" implementation "com.android.support:design:$supportVersion" - def moxyVersion = '1.5.5' + def moxyVersion = '1.5.6' implementation "com.arello-mobile:moxy:$moxyVersion" implementation "com.arello-mobile:moxy-app-compat:$moxyVersion" kapt "com.arello-mobile:moxy-compiler:$moxyVersion" diff --git a/sample-github/build.gradle b/sample-github/build.gradle index 31722875..6f820c72 100644 --- a/sample-github/build.gradle +++ b/sample-github/build.gradle @@ -65,7 +65,7 @@ dependencies { testImplementation "org.hamcrest:hamcrest-all:1.3" testImplementation "org.robolectric:robolectric:3.1-rc1" - implementation 'com.arello-mobile:moxy:1.5.5' - implementation 'com.arello-mobile:moxy-app-compat:1.5.5' - annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.5' + implementation 'com.arello-mobile:moxy:1.5.6' + implementation 'com.arello-mobile:moxy-app-compat:1.5.6' + annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.6' } \ No newline at end of file diff --git a/sample-kotlin/build.gradle b/sample-kotlin/build.gradle index f517206b..c42f0808 100644 --- a/sample-kotlin/build.gradle +++ b/sample-kotlin/build.gradle @@ -42,9 +42,9 @@ android { dependencies { implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.arello-mobile:moxy:1.5.5' - implementation 'com.arello-mobile:moxy-app-compat:1.5.5' - kapt 'com.arello-mobile:moxy-compiler:1.5.5' + implementation 'com.arello-mobile:moxy:1.5.6' + implementation 'com.arello-mobile:moxy-app-compat:1.5.6' + kapt 'com.arello-mobile:moxy-compiler:1.5.6' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } From ff566400d89a519a52bfb5f4cf7717d2d7d58100 Mon Sep 17 00:00:00 2001 From: Nikita Ivanov Date: Thu, 21 Mar 2019 16:05:43 +0300 Subject: [PATCH 03/36] all packages renamed to omegar --- .../mvp/MvpActivity.java | 2 +- .../mvp/MvpApplication.java | 2 +- .../mvp/MvpDialogFragment.java | 2 +- .../mvp/MvpFragment.java | 2 +- .../com/moxy_androidx_sapmle/MainActivity.kt | 7 ++--- .../com/moxy_androidx_sapmle/MainPresenter.kt | 4 +-- .../mvp/MvpAppCompatActivity.java | 2 +- .../mvp/MvpAppCompatFragment.java | 2 +- .../mvp/MvpAppCompatActivity.java | 2 +- .../mvp/MvpAppCompatDialogFragment.java | 2 +- .../mvp/MvpAppCompatFragment.java | 2 +- .../mvp/compiler/AnnotationRule.java | 2 +- .../mvp/compiler/ElementProcessor.java | 2 +- .../mvp/compiler/JavaFilesGenerator.java | 2 +- .../mvp/compiler/MvpCompiler.java | 26 ++++++++--------- .../mvp/compiler/PresenterInjectorRules.java | 14 +++++----- .../mvp/compiler/Util.java | 2 +- .../InjectPresenterProcessor.java | 12 ++++---- .../PresenterBinderClassGenerator.java | 16 +++++------ .../PresenterProviderMethod.java | 4 +-- .../presenterbinder/TagProviderMethod.java | 4 +-- .../presenterbinder/TargetClassInfo.java | 2 +- .../presenterbinder/TargetPresenterField.java | 6 ++-- .../reflector/MoxyReflectorGenerator.java | 8 +++--- .../compiler/viewstate/ViewInterfaceInfo.java | 2 +- .../viewstate/ViewInterfaceProcessor.java | 12 ++++---- .../mvp/compiler/viewstate/ViewMethod.java | 4 +-- .../viewstate/ViewStateClassGenerator.java | 14 +++++----- .../InjectViewStateProcessor.java | 21 +++++++------- .../viewstateprovider/PresenterInfo.java | 2 +- .../ViewStateProviderClassGenerator.java | 12 ++++---- .../mvp/compiler/CompilerTest.java | 2 +- .../mvp/compiler/MultiModulesTest.java | 4 +-- .../compiler/PresentersBinderErrorTest.java | 2 +- .../mvp/compiler/PresentersBinderTest.java | 4 +-- .../mvp/compiler/ViewStateProviderTest.java | 4 +-- .../mvp/compiler/ViewStateTest.java | 8 +++--- .../app/AppPresenter$$ViewStateProvider.java | 6 ++-- .../multimodules/app/AppPresenter.java | 4 +-- .../multimodules/app/AppView$$State.java | 2 +- .../resources/multimodules/app/AppView.java | 2 +- .../multimodules/app/MoxyReflector.java | 2 ++ .../Lib1Presenter$$ViewStateProvider.java | 6 ++-- .../multimodules/lib1/Lib1Presenter.java | 4 +-- .../multimodules/lib1/Lib1View$$State.java | 2 +- .../resources/multimodules/lib1/Lib1View.java | 2 +- ...EmptyViewPresenter$$ViewStateProvider.java | 6 ++-- .../presenter/EmptyViewPresenter.java | 4 +-- .../GenericPresenter$$ViewStateProvider.java | 6 ++-- .../resources/presenter/GenericPresenter.java | 4 +-- ...ericPresenterTarget$$PresentersBinder.java | 8 +++--- .../target/GenericPresenterTarget.java | 4 +-- .../NotImplementViewInterfaceTarget.java | 2 +- ...jectPresenterTarget$$PresentersBinder.java | 8 +++--- .../target/SimpleInjectPresenterTarget.java | 2 +- ...videPresenterTarget$$PresentersBinder.java | 8 +++--- .../target/SimpleProvidePresenterTarget.java | 4 +-- .../test/resources/view/EmptyView$$State.java | 2 +- .../src/test/resources/view/EmptyView.java | 2 +- .../view/ExtendsOfGenericView$$State.java | 6 ++-- .../resources/view/ExtendsOfGenericView.java | 2 -- .../view/GenericMethodsView$$State.java | 6 ++-- .../resources/view/GenericMethodsView.java | 2 +- .../resources/view/GenericView$$State.java | 6 ++-- .../src/test/resources/view/GenericView.java | 3 +- .../view/GenericWithExtendsView$$State.java | 6 ++-- .../view/GenericWithExtendsView.java | 2 +- .../view/OverloadingView$$State.java | 6 ++-- .../test/resources/view/OverloadingView.java | 2 +- .../resources/view/SimpleView$$State.java | 6 ++-- .../src/test/resources/view/SimpleView.java | 2 +- .../resources/view/StrategiesView$$State.java | 10 +++---- .../test/resources/view/StrategiesView.java | 10 +++---- .../ChildView$$State.java | 4 +-- .../strategies_inheritance/ChildView.java | 2 +- .../ParentView$$State.java | 4 +-- .../strategies_inheritance/ParentView.java | 4 +-- .../strategies/ChildDefaultStrategy.java | 2 +- .../strategies/ParentDefaultStrategy.java | 2 +- .../strategies/Strategy1.java | 2 +- .../strategies/Strategy2.java | 2 +- .../mvp/DefaultView.java | 2 +- .../mvp/DefaultViewState.java | 4 +-- .../mvp/GenerateViewState.java | 2 +- .../mvp/InjectViewState.java | 4 +-- .../mvp/MvpDelegate.java | 6 ++-- .../mvp/MvpFacade.java | 2 +- .../mvp/MvpPresenter.java | 6 ++-- .../mvp/MvpProcessor.java | 15 +++++----- .../{arellomobile => omegar}/mvp/MvpView.java | 2 +- .../{arellomobile => omegar}/mvp/Pair.java | 2 +- .../mvp/PresenterBinder.java | 4 +-- .../mvp/PresenterStore.java | 2 +- .../mvp/PresentersCounter.java | 2 +- .../mvp/RegisterMoxyReflectorPackages.java | 2 +- .../mvp/ViewStateProvider.java | 4 +-- .../mvp/presenter/InjectPresenter.java | 2 +- .../mvp/presenter/PresenterField.java | 3 +- .../mvp/presenter/PresenterType.java | 8 ++++-- .../mvp/presenter/ProvidePresenter.java | 6 ++-- .../mvp/presenter/ProvidePresenterTag.java | 7 +++-- .../mvp/viewstate/MvpViewState.java | 7 +++-- .../mvp/viewstate/ViewCommand.java | 6 ++-- .../mvp/viewstate/ViewCommands.java | 8 +++--- .../strategy/AddToEndSingleStrategy.java | 6 ++-- .../viewstate/strategy/AddToEndStrategy.java | 6 ++-- .../strategy/OneExecutionStateStrategy.java | 6 ++-- .../strategy/SingleStateStrategy.java | 6 ++-- .../mvp/viewstate/strategy/SkipStrategy.java | 6 ++-- .../mvp/viewstate/strategy/StateStrategy.java | 13 +++++---- .../viewstate/strategy/StateStrategyType.java | 2 +- .../presenter/InjectViewStatePresenter2.java | 15 ---------- .../view/DelegateLocalPresenter2TestView.java | 10 ------- .../view/DelegateLocalPresenterTestView.java | 10 ------- .../mvp/compiler/CompilerTest.java | 2 +- .../mvp/compiler/ErrorProcessor.java | 2 +- .../mvp/compiler/ViewStateClassTest.java | 2 +- .../compiler/ViewStateProviderClassTest.java | 2 +- .../mvp/inheritance_test/InheritanceTest.java | 10 +++---- .../resources/ChildViewWithoutInject.java | 2 +- .../resources/SuperViewWithInject.java | 4 +-- .../resources/TestPresenter.java | 4 +-- .../inheritance_test}/resources/TestView.java | 4 +-- .../resources/ViewWithoutInject.java | 4 +-- .../mvp/memory_leak_test/MemoryLeakTest.java | 6 ++-- .../resources/TestPresenter.java | 4 +-- .../memory_leak_test}/resources/TestView.java | 4 +-- .../resources/TestViewImplementation.java | 6 ++-- .../InjectViewStatePositivePresenter.java | 8 +++--- .../presenter/InjectViewStatePresenter.java | 4 +-- .../presenter/InjectViewStatePresenter2.java | 15 ++++++++++ .../mvp/presenter/NoViewStatePresenter.java | 2 +- .../PositiveViewStateProviderPresenter.java | 8 +++--- .../mvp/presenter/TestViewPresenter.java | 6 ++-- .../ProvideMethodsTest.java | 12 ++++---- .../resources/LocalProvidedView.java | 8 +++--- .../resources/SuperView.java | 8 +++--- .../resources/TestPresenter.java | 4 +-- .../resources/TestView.java | 4 +-- .../resources/TwoLocalProvidedView.java | 8 +++--- .../TwoWeakWithDiffPresenterIdView.java | 12 ++++---- .../TwoWeakWithSamePresenterIdView.java | 12 ++++---- .../resources/WeakProvidedView.java | 10 +++---- .../mvp/tests/LocalPresenterTest.java | 14 +++++----- .../mvp/tests/MvpDelegateTest.java | 8 +++--- .../mvp/view/ChildView.java | 8 +++--- .../mvp/view/CounterTestView.java | 2 +- .../mvp/view/DelegateGlobalTestView.java | 8 +++--- .../view/DelegateLocalPresenter2TestView.java | 10 +++++++ .../view/DelegateLocalPresenterTestView.java | 10 +++++++ .../mvp/view/ParentView.java | 10 +++---- .../mvp/view/PositiveViewStateView.java | 4 +-- .../mvp/view/SimpleInterface.java | 2 +- .../mvp/view/TestView.java | 4 +-- .../mvp/view/TestView2.java | 4 +-- .../mvp/view/TestViewChild.java | 4 +-- .../mvp/view/TestViewChild2.java | 4 +-- .../InjectViewStateForClassPresenter.java | 6 ++-- .../InjectViewStateForGenericPresenter.java | 6 ++-- ...njectViewStateForGenericViewPresenter.java | 6 ++-- .../PositiveParamsViewPresenter.java | 4 +-- ...itiveViewStateProviderForNotPresenter.java | 5 +--- .../PositiveViewStateProviderPresenter.java | 4 +-- .../PresenterWithoutEmptyConstructor.java | 4 +-- ...ldWithIncorrectStrategyClassPresenter.java | 4 +-- ...ithoutGenerateViewAnnotationPresenter.java | 4 +-- .../presenter/WithViewGenericPresenter.java | 8 +----- .../presenter/WithViewGenericPresenter2.java | 10 ++----- .../test/resources/view/EmptyParamsView.java | 9 +++--- .../IncorrectCountOfParametersParamsView.java | 9 +++--- .../view/IncorrectParametersParamsView.java | 8 +++--- ...senterAnnotationInsideNotMvpViewClass.java | 6 ++-- .../view/InjectPresenterTypeBehaviorView.java | 6 ++-- .../view/InjectPresenterWithGenericView.java | 7 ++--- ...jectPresenterWithGenericViewIncorrect.java | 8 +++--- ...njectPresenterWithIncorrectParamsView.java | 8 +++--- .../InjectPresenterWithIncorrectViewView.java | 6 ++-- ...tPresenterWithoutEmptyConstructorView.java | 4 +-- .../view/ObjectInjectPresenterView.java | 4 +-- .../resources/view/PositiveParamsView.java | 7 ++--- .../resources/view/PositiveViewStateView.java | 2 +- .../view/SeveralMethodParamsView.java | 8 +++--- .../resources/view/SeveralParamsView.java | 2 +- ...teChildWithIncorrectStrategyClassView.java | 4 --- ...tateChildWithIncorrectStrategyTagView.java | 5 +--- .../resources/view/ViewStateForClassView.java | 4 +-- .../view/ViewStateForGenericView.java | 3 +- .../resources/view/ViewStateForNotView.java | 2 +- .../resources/view/ViewStateParent2View.java | 6 ++-- .../ViewStateParentStrategyClassView.java | 6 ++-- .../view/ViewStateParentStrategyTagView.java | 5 ++-- .../resources/view/ViewStateParentView.java | 6 ++-- .../WithoutGenerateViewAnnotationView.java | 2 +- .../mvp/MoxyReflector.java | 2 +- sample-github/src/main/AndroidManifest.xml | 8 +++--- .../mvp/sample/github/app/GithubApi.java | 10 +++---- .../mvp/sample/github/app/GithubApp.java | 6 ++-- .../mvp/sample/github/app/GithubError.java | 2 +- .../mvp/sample/github/common/Utils.java | 2 +- .../mvp/sample/github/di/AppComponent.java | 16 +++++------ .../sample/github/di/modules/ApiModule.java | 4 +-- .../sample/github/di/modules/BusModule.java | 4 +-- .../github/di/modules/ContextModule.java | 2 +- .../github/di/modules/GithubModule.java | 6 ++-- .../github/di/modules/RetrofitModule.java | 2 +- .../mvp/sample/github/mvp/GithubService.java | 8 +++--- .../sample/github/mvp/common/AuthUtils.java | 2 +- .../sample/github/mvp/common/PrefUtils.java | 4 +-- .../sample/github/mvp/models/Repository.java | 2 +- .../mvp/sample/github/mvp/models/User.java | 2 +- .../github/mvp/models/gson/SearchResult.java | 4 +-- .../github/mvp/presenters/BasePresenter.java | 2 +- .../github/mvp/presenters/HomePresenter.java | 6 ++-- .../mvp/presenters/RepositoriesPresenter.java | 14 +++++----- .../presenters/RepositoryLikesPresenter.java | 4 +-- .../mvp/presenters/RepositoryPresenter.java | 6 ++-- .../mvp/presenters/SignInPresenter.java | 12 ++++---- .../mvp/presenters/SignOutPresenter.java | 6 ++-- .../mvp/presenters/SplashPresenter.java | 6 ++-- .../mvp/sample/github/mvp/views/HomeView.java | 4 +-- .../github/mvp/views/RepositoriesView.java | 4 +-- .../github/mvp/views/RepositoryLikeView.java | 2 +- .../github/mvp/views/RepositoryLikesView.java | 2 +- .../github/mvp/views/RepositoryView.java | 4 +-- .../sample/github/mvp/views/SignInView.java | 2 +- .../sample/github/mvp/views/SignOutView.java | 2 +- .../sample/github/mvp/views/SplashView.java | 2 +- .../github/ui/activities/HomeActivity.java | 28 +++++++++---------- .../github/ui/activities/SignInActivity.java | 8 +++--- .../github/ui/activities/SplashActivity.java | 8 +++--- .../github/ui/adapters/MvpBaseAdapter.java | 2 +- .../ui/adapters/RepositoriesAdapter.java | 14 +++++----- .../github/ui/fragments/DetailsFragment.java | 18 ++++++------ .../ui/views/FrameSwipeRefreshLayout.java | 2 +- .../sample/github/ui/views/LikeButton.java | 2 +- .../github/ui/views/RepositoryWidget.java | 10 +++---- .../src/main/res/layout/activity_home.xml | 4 +-- .../src/main/res/layout/activity_sign_in.xml | 2 +- .../layout/fragment_repository_details.xml | 2 +- .../mvp/presenters/HomePresenterTest.java | 6 ++-- .../presenters/RepositoriesPresenterTest.java | 14 +++++----- .../presenters/RepositoryPresenterTest.java | 8 +++--- .../mvp/presenters/SignInPresenterTest.java | 16 +++++------ .../mvp/presenters/SignOutPresenterTest.java | 8 +++--- .../mvp/presenters/SplashPresenterTest.java | 10 +++---- .../github/test/GithubSampleTestRunner.java | 4 +-- .../mvp/sample/github/test/TestComponent.java | 12 ++++---- .../sample/github/test/TestComponentRule.java | 6 ++-- sample-kotlin/src/main/AndroidManifest.xml | 2 +- .../mvp/sample/kotlin/DialogPresenter.kt | 2 +- .../mvp/sample/kotlin/DialogView.kt | 2 +- .../mvp/sample/kotlin/MainActivity.kt | 3 +- .../src/main/res/layout/activity_main.xml | 2 +- 253 files changed, 694 insertions(+), 719 deletions(-) rename moxy-android/src/main/java/com/{arellomobile => omegar}/mvp/MvpActivity.java (97%) rename moxy-android/src/main/java/com/{arellomobile => omegar}/mvp/MvpApplication.java (88%) rename moxy-android/src/main/java/com/{arellomobile => omegar}/mvp/MvpDialogFragment.java (98%) rename moxy-android/src/main/java/com/{arellomobile => omegar}/mvp/MvpFragment.java (98%) rename moxy-androidx/src/main/java/com/{arellomobile => omegar}/mvp/MvpAppCompatActivity.java (98%) rename moxy-androidx/src/main/java/com/{arellomobile => omegar}/mvp/MvpAppCompatFragment.java (98%) rename moxy-app-compat/src/main/java/com/{arellomobile => omegar}/mvp/MvpAppCompatActivity.java (97%) rename moxy-app-compat/src/main/java/com/{arellomobile => omegar}/mvp/MvpAppCompatDialogFragment.java (98%) rename moxy-app-compat/src/main/java/com/{arellomobile => omegar}/mvp/MvpAppCompatFragment.java (98%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/AnnotationRule.java (97%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/ElementProcessor.java (84%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/JavaFilesGenerator.java (85%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/MvpCompiler.java (90%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/PresenterInjectorRules.java (94%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/Util.java (99%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/presenterbinder/InjectPresenterProcessor.java (95%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/presenterbinder/PresenterBinderClassGenerator.java (94%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/presenterbinder/PresenterProviderMethod.java (88%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/presenterbinder/TagProviderMethod.java (87%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/presenterbinder/TargetClassInfo.java (89%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/presenterbinder/TargetPresenterField.java (93%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/reflector/MoxyReflectorGenerator.java (97%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/viewstate/ViewInterfaceInfo.java (96%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/viewstate/ViewInterfaceProcessor.java (95%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/viewstate/ViewMethod.java (97%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/viewstate/ViewStateClassGenerator.java (92%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/viewstateprovider/InjectViewStateProcessor.java (89%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/viewstateprovider/PresenterInfo.java (90%) rename moxy-compiler/src/main/java/com/{arellomobile => omegar}/mvp/compiler/viewstateprovider/ViewStateProviderClassGenerator.java (85%) rename moxy-compiler/src/test/java/com/{arellomobile => omegar}/mvp/compiler/CompilerTest.java (99%) rename moxy-compiler/src/test/java/com/{arellomobile => omegar}/mvp/compiler/MultiModulesTest.java (95%) rename moxy-compiler/src/test/java/com/{arellomobile => omegar}/mvp/compiler/PresentersBinderErrorTest.java (95%) rename moxy-compiler/src/test/java/com/{arellomobile => omegar}/mvp/compiler/PresentersBinderTest.java (93%) rename moxy-compiler/src/test/java/com/{arellomobile => omegar}/mvp/compiler/ViewStateProviderTest.java (94%) rename moxy-compiler/src/test/java/com/{arellomobile => omegar}/mvp/compiler/ViewStateTest.java (90%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/DefaultView.java (80%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/DefaultViewState.java (63%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/GenerateViewState.java (92%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/InjectViewState.java (88%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/MvpDelegate.java (97%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/MvpFacade.java (97%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/MvpPresenter.java (96%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/MvpProcessor.java (88%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/MvpView.java (76%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/Pair.java (98%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/PresenterBinder.java (74%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/PresenterStore.java (97%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/PresentersCounter.java (98%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/RegisterMoxyReflectorPackages.java (89%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/ViewStateProvider.java (77%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/presenter/InjectPresenter.java (92%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/presenter/PresenterField.java (94%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/presenter/PresenterType.java (70%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/presenter/ProvidePresenter.java (92%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/presenter/ProvidePresenterTag.java (86%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/viewstate/MvpViewState.java (93%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/viewstate/ViewCommand.java (79%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/viewstate/ViewCommands.java (91%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/viewstate/strategy/AddToEndSingleStrategy.java (86%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/viewstate/strategy/AddToEndStrategy.java (80%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/viewstate/strategy/OneExecutionStateStrategy.java (81%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/viewstate/strategy/SingleStateStrategy.java (83%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/viewstate/strategy/SkipStrategy.java (78%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/viewstate/strategy/StateStrategy.java (78%) rename moxy/src/main/java/com/{arellomobile => omegar}/mvp/viewstate/strategy/StateStrategyType.java (90%) delete mode 100644 moxy/src/test/java/com/arellomobile/mvp/presenter/InjectViewStatePresenter2.java delete mode 100644 moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenter2TestView.java delete mode 100644 moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenterTestView.java rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/compiler/CompilerTest.java (99%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/compiler/ErrorProcessor.java (97%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/compiler/ViewStateClassTest.java (96%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/compiler/ViewStateProviderClassTest.java (94%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/inheritance_test/InheritanceTest.java (76%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/inheritance_test/resources/ChildViewWithoutInject.java (73%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/inheritance_test/resources/SuperViewWithInject.java (64%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/inheritance_test/resources/TestPresenter.java (62%) rename moxy/src/test/java/com/{arellomobile/mvp/memory_leak_test => omegar/mvp/inheritance_test}/resources/TestView.java (55%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/inheritance_test/resources/ViewWithoutInject.java (62%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/memory_leak_test/MemoryLeakTest.java (89%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/memory_leak_test/resources/TestPresenter.java (57%) rename moxy/src/test/java/com/{arellomobile/mvp/inheritance_test => omegar/mvp/memory_leak_test}/resources/TestView.java (55%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/memory_leak_test/resources/TestViewImplementation.java (60%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/presenter/InjectViewStatePositivePresenter.java (50%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/presenter/InjectViewStatePresenter.java (65%) create mode 100644 moxy/src/test/java/com/omegar/mvp/presenter/InjectViewStatePresenter2.java rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/presenter/NoViewStatePresenter.java (77%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/presenter/PositiveViewStateProviderPresenter.java (50%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/presenter/TestViewPresenter.java (61%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/provide_methods_test/ProvideMethodsTest.java (80%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/provide_methods_test/resources/LocalProvidedView.java (67%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/provide_methods_test/resources/SuperView.java (76%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/provide_methods_test/resources/TestPresenter.java (56%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/provide_methods_test/resources/TestView.java (54%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/provide_methods_test/resources/TwoLocalProvidedView.java (65%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/provide_methods_test/resources/TwoWeakWithDiffPresenterIdView.java (78%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/provide_methods_test/resources/TwoWeakWithSamePresenterIdView.java (70%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/provide_methods_test/resources/WeakProvidedView.java (66%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/tests/LocalPresenterTest.java (91%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/tests/MvpDelegateTest.java (82%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/view/ChildView.java (55%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/view/CounterTestView.java (93%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/view/DelegateGlobalTestView.java (57%) create mode 100644 moxy/src/test/java/com/omegar/mvp/view/DelegateLocalPresenter2TestView.java create mode 100644 moxy/src/test/java/com/omegar/mvp/view/DelegateLocalPresenterTestView.java rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/view/ParentView.java (57%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/view/PositiveViewStateView.java (67%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/view/SimpleInterface.java (79%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/view/TestView.java (65%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/view/TestView2.java (67%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/view/TestViewChild.java (67%) rename moxy/src/test/java/com/{arellomobile => omegar}/mvp/view/TestViewChild2.java (68%) rename moxy/stub-reflector/src/main/java/com/{arellomobile => omegar}/mvp/MoxyReflector.java (96%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/app/GithubApi.java (68%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/app/GithubApp.java (80%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/app/GithubError.java (92%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/common/Utils.java (88%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/di/AppComponent.java (51%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/di/modules/ApiModule.java (76%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/di/modules/BusModule.java (73%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/di/modules/ContextModule.java (87%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/di/modules/GithubModule.java (66%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/di/modules/RetrofitModule.java (96%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/GithubService.java (68%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/common/AuthUtils.java (86%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/common/PrefUtils.java (80%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/models/Repository.java (99%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/models/User.java (97%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/models/gson/SearchResult.java (69%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/presenters/BasePresenter.java (91%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/presenters/HomePresenter.java (70%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/presenters/RepositoriesPresenter.java (86%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/presenters/RepositoryLikesPresenter.java (93%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/presenters/RepositoryPresenter.java (84%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/presenters/SignInPresenter.java (81%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/presenters/SignOutPresenter.java (63%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/presenters/SplashPresenter.java (68%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/views/HomeView.java (83%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/views/RepositoriesView.java (87%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/views/RepositoryLikeView.java (87%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/views/RepositoryLikesView.java (89%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/views/RepositoryView.java (68%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/views/SignInView.java (92%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/views/SignOutView.java (76%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/views/SplashView.java (78%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/ui/activities/HomeActivity.java (85%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/ui/activities/SignInActivity.java (92%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/ui/activities/SplashActivity.java (75%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/ui/adapters/MvpBaseAdapter.java (92%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/ui/adapters/RepositoriesAdapter.java (91%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/ui/fragments/DetailsFragment.java (81%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/ui/views/FrameSwipeRefreshLayout.java (93%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/ui/views/LikeButton.java (95%) rename sample-github/src/main/java/com/{arellomobile => omegar}/mvp/sample/github/ui/views/RepositoryWidget.java (85%) rename sample-github/src/test/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/presenters/HomePresenterTest.java (82%) rename sample-github/src/test/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/presenters/RepositoriesPresenterTest.java (89%) rename sample-github/src/test/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/presenters/RepositoryPresenterTest.java (85%) rename sample-github/src/test/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/presenters/SignInPresenterTest.java (88%) rename sample-github/src/test/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/presenters/SignOutPresenterTest.java (78%) rename sample-github/src/test/java/com/{arellomobile => omegar}/mvp/sample/github/mvp/presenters/SplashPresenterTest.java (74%) rename sample-github/src/test/java/com/{arellomobile => omegar}/mvp/sample/github/test/GithubSampleTestRunner.java (90%) rename sample-github/src/test/java/com/{arellomobile => omegar}/mvp/sample/github/test/TestComponent.java (61%) rename sample-github/src/test/java/com/{arellomobile => omegar}/mvp/sample/github/test/TestComponentRule.java (80%) rename sample-kotlin/src/main/kotlin/com/{arellomobile => omegar}/mvp/sample/kotlin/DialogPresenter.kt (89%) rename sample-kotlin/src/main/kotlin/com/{arellomobile => omegar}/mvp/sample/kotlin/DialogView.kt (89%) rename sample-kotlin/src/main/kotlin/com/{arellomobile => omegar}/mvp/sample/kotlin/MainActivity.kt (94%) diff --git a/moxy-android/src/main/java/com/arellomobile/mvp/MvpActivity.java b/moxy-android/src/main/java/com/omegar/mvp/MvpActivity.java similarity index 97% rename from moxy-android/src/main/java/com/arellomobile/mvp/MvpActivity.java rename to moxy-android/src/main/java/com/omegar/mvp/MvpActivity.java index ad577c76..b1f62909 100644 --- a/moxy-android/src/main/java/com/arellomobile/mvp/MvpActivity.java +++ b/moxy-android/src/main/java/com/omegar/mvp/MvpActivity.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import android.app.Activity; import android.os.Bundle; diff --git a/moxy-android/src/main/java/com/arellomobile/mvp/MvpApplication.java b/moxy-android/src/main/java/com/omegar/mvp/MvpApplication.java similarity index 88% rename from moxy-android/src/main/java/com/arellomobile/mvp/MvpApplication.java rename to moxy-android/src/main/java/com/omegar/mvp/MvpApplication.java index 90119d80..6e5947e1 100644 --- a/moxy-android/src/main/java/com/arellomobile/mvp/MvpApplication.java +++ b/moxy-android/src/main/java/com/omegar/mvp/MvpApplication.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import android.app.Application; diff --git a/moxy-android/src/main/java/com/arellomobile/mvp/MvpDialogFragment.java b/moxy-android/src/main/java/com/omegar/mvp/MvpDialogFragment.java similarity index 98% rename from moxy-android/src/main/java/com/arellomobile/mvp/MvpDialogFragment.java rename to moxy-android/src/main/java/com/omegar/mvp/MvpDialogFragment.java index fdb8c148..b4740260 100644 --- a/moxy-android/src/main/java/com/arellomobile/mvp/MvpDialogFragment.java +++ b/moxy-android/src/main/java/com/omegar/mvp/MvpDialogFragment.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import android.app.DialogFragment; import android.app.Fragment; diff --git a/moxy-android/src/main/java/com/arellomobile/mvp/MvpFragment.java b/moxy-android/src/main/java/com/omegar/mvp/MvpFragment.java similarity index 98% rename from moxy-android/src/main/java/com/arellomobile/mvp/MvpFragment.java rename to moxy-android/src/main/java/com/omegar/mvp/MvpFragment.java index f3b9502b..a3f98774 100644 --- a/moxy-android/src/main/java/com/arellomobile/mvp/MvpFragment.java +++ b/moxy-android/src/main/java/com/omegar/mvp/MvpFragment.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import android.app.Fragment; import android.os.Build; diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt index 68fd1ef1..023e3e03 100644 --- a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt +++ b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt @@ -2,10 +2,9 @@ package example.com.moxy_androidx_sapmle import android.os.Bundle import android.util.Log -import androidx.appcompat.app.AppCompatActivity -import com.arellomobile.mvp.MvpAppCompatActivity -import com.arellomobile.mvp.MvpView -import com.arellomobile.mvp.presenter.InjectPresenter +import com.omegar.mvp.MvpAppCompatActivity +import com.omegar.mvp.MvpView +import com.omegar.mvp.presenter.InjectPresenter interface MainView : MvpView { fun printLog(msg: String) diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt index 6c37df14..ab64a95c 100644 --- a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt +++ b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt @@ -1,8 +1,8 @@ package example.com.moxy_androidx_sapmle import android.util.Log -import com.arellomobile.mvp.InjectViewState -import com.arellomobile.mvp.MvpPresenter +import com.omegar.mvp.InjectViewState +import com.omegar.mvp.MvpPresenter @InjectViewState class MainPresenter : MvpPresenter() { diff --git a/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatActivity.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java similarity index 98% rename from moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatActivity.java rename to moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java index f28fa328..d5f03d20 100755 --- a/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatActivity.java +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import android.os.Bundle; diff --git a/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatFragment.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java similarity index 98% rename from moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatFragment.java rename to moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java index 16799c15..38babd6e 100644 --- a/moxy-androidx/src/main/java/com/arellomobile/mvp/MvpAppCompatFragment.java +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import android.os.Bundle; import androidx.fragment.app.Fragment; diff --git a/moxy-app-compat/src/main/java/com/arellomobile/mvp/MvpAppCompatActivity.java b/moxy-app-compat/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java similarity index 97% rename from moxy-app-compat/src/main/java/com/arellomobile/mvp/MvpAppCompatActivity.java rename to moxy-app-compat/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java index c464e4b8..42035469 100644 --- a/moxy-app-compat/src/main/java/com/arellomobile/mvp/MvpAppCompatActivity.java +++ b/moxy-app-compat/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; diff --git a/moxy-app-compat/src/main/java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java b/moxy-app-compat/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java similarity index 98% rename from moxy-app-compat/src/main/java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java rename to moxy-app-compat/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java index 8deff68b..772c5cf0 100644 --- a/moxy-app-compat/src/main/java/com/arellomobile/mvp/MvpAppCompatDialogFragment.java +++ b/moxy-app-compat/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import android.os.Bundle; import android.support.v4.app.Fragment; diff --git a/moxy-app-compat/src/main/java/com/arellomobile/mvp/MvpAppCompatFragment.java b/moxy-app-compat/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java similarity index 98% rename from moxy-app-compat/src/main/java/com/arellomobile/mvp/MvpAppCompatFragment.java rename to moxy-app-compat/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java index 184724c4..45f06c24 100644 --- a/moxy-app-compat/src/main/java/com/arellomobile/mvp/MvpAppCompatFragment.java +++ b/moxy-app-compat/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import android.os.Bundle; import android.support.v4.app.Fragment; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/AnnotationRule.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/AnnotationRule.java similarity index 97% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/AnnotationRule.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/AnnotationRule.java index 59a4864f..53f3566f 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/AnnotationRule.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/AnnotationRule.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.compiler; +package com.omegar.mvp.compiler; import java.util.Arrays; import java.util.HashSet; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/ElementProcessor.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/ElementProcessor.java similarity index 84% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/ElementProcessor.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/ElementProcessor.java index fd48e23e..84d2430c 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/ElementProcessor.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/ElementProcessor.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.compiler; +package com.omegar.mvp.compiler; import javax.lang.model.element.Element; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/JavaFilesGenerator.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/JavaFilesGenerator.java similarity index 85% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/JavaFilesGenerator.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/JavaFilesGenerator.java index 903c0178..6d762813 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/JavaFilesGenerator.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/JavaFilesGenerator.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.compiler; +package com.omegar.mvp.compiler; import com.squareup.javapoet.JavaFile; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java similarity index 90% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/MvpCompiler.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java index 4c6f88d1..ec79ea01 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/MvpCompiler.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java @@ -1,16 +1,16 @@ -package com.arellomobile.mvp.compiler; - -import com.arellomobile.mvp.GenerateViewState; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.RegisterMoxyReflectorPackages; -import com.arellomobile.mvp.compiler.presenterbinder.InjectPresenterProcessor; -import com.arellomobile.mvp.compiler.presenterbinder.PresenterBinderClassGenerator; -import com.arellomobile.mvp.compiler.reflector.MoxyReflectorGenerator; -import com.arellomobile.mvp.compiler.viewstate.ViewInterfaceProcessor; -import com.arellomobile.mvp.compiler.viewstate.ViewStateClassGenerator; -import com.arellomobile.mvp.compiler.viewstateprovider.InjectViewStateProcessor; -import com.arellomobile.mvp.compiler.viewstateprovider.ViewStateProviderClassGenerator; -import com.arellomobile.mvp.presenter.InjectPresenter; +package com.omegar.mvp.compiler; + +import com.omegar.mvp.GenerateViewState; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.RegisterMoxyReflectorPackages; +import com.omegar.mvp.compiler.presenterbinder.InjectPresenterProcessor; +import com.omegar.mvp.compiler.presenterbinder.PresenterBinderClassGenerator; +import com.omegar.mvp.compiler.reflector.MoxyReflectorGenerator; +import com.omegar.mvp.compiler.viewstate.ViewInterfaceProcessor; +import com.omegar.mvp.compiler.viewstate.ViewStateClassGenerator; +import com.omegar.mvp.compiler.viewstateprovider.InjectViewStateProcessor; +import com.omegar.mvp.compiler.viewstateprovider.ViewStateProviderClassGenerator; +import com.omegar.mvp.presenter.InjectPresenter; import com.google.auto.service.AutoService; import com.squareup.javapoet.JavaFile; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/PresenterInjectorRules.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/PresenterInjectorRules.java similarity index 94% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/PresenterInjectorRules.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/PresenterInjectorRules.java index 350bfcf2..74cfa436 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/PresenterInjectorRules.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/PresenterInjectorRules.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.compiler; +package com.omegar.mvp.compiler; import java.util.ArrayList; import java.util.Collection; @@ -8,9 +8,9 @@ import java.util.List; import java.util.Map; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.presenter.InjectPresenter; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.presenter.InjectPresenter; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; @@ -24,7 +24,7 @@ import javax.tools.Diagnostic; -import static com.arellomobile.mvp.compiler.Util.fillGenerics; +import static com.omegar.mvp.compiler.Util.fillGenerics; /** * Date: 17-Feb-16 @@ -106,7 +106,7 @@ private String getViewClassFromGeneric(TypeElement typeElement, DeclaredType dec Map types = new HashMap<>(); for (int i = 0; i < typeArguments.size(); i++) { - types.put(typeParameters.get(i).toString(), fillGenerics(parentTypes, typeArguments.get(i))); + types.put(typeParameters.get(i).toString(), Util.fillGenerics(parentTypes, typeArguments.get(i))); } if (superclassElement.toString().equals(MvpPresenter.class.getCanonicalName())) { @@ -127,7 +127,7 @@ private String getViewClassFromGeneric(TypeElement typeElement, DeclaredType dec return ((DeclaredType) superclass).asElement().getSimpleName().toString(); } // MvpPresenter is typed only on View class - return fillGenerics(parentTypes, typeArguments); + return Util.fillGenerics(parentTypes, typeArguments); } parentTypes = types; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/Util.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java similarity index 99% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/Util.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java index 98b3ec95..a9ef3d47 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/Util.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.arellomobile.mvp.compiler; +package com.omegar.mvp.compiler; import java.util.Collections; import java.util.HashMap; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/InjectPresenterProcessor.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/InjectPresenterProcessor.java similarity index 95% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/InjectPresenterProcessor.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/InjectPresenterProcessor.java index faac2e0e..9b66a09e 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/InjectPresenterProcessor.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/InjectPresenterProcessor.java @@ -1,10 +1,10 @@ -package com.arellomobile.mvp.compiler.presenterbinder; +package com.omegar.mvp.compiler.presenterbinder; -import com.arellomobile.mvp.compiler.ElementProcessor; -import com.arellomobile.mvp.compiler.Util; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.ProvidePresenter; -import com.arellomobile.mvp.presenter.ProvidePresenterTag; +import com.omegar.mvp.compiler.ElementProcessor; +import com.omegar.mvp.compiler.Util; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.presenter.ProvidePresenterTag; import java.util.ArrayList; import java.util.List; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/PresenterBinderClassGenerator.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/PresenterBinderClassGenerator.java similarity index 94% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/PresenterBinderClassGenerator.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/PresenterBinderClassGenerator.java index 1165499e..64711bd6 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/PresenterBinderClassGenerator.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/PresenterBinderClassGenerator.java @@ -1,11 +1,11 @@ -package com.arellomobile.mvp.compiler.presenterbinder; - -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.MvpProcessor; -import com.arellomobile.mvp.PresenterBinder; -import com.arellomobile.mvp.compiler.JavaFilesGenerator; -import com.arellomobile.mvp.compiler.Util; -import com.arellomobile.mvp.presenter.PresenterField; +package com.omegar.mvp.compiler.presenterbinder; + +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.MvpProcessor; +import com.omegar.mvp.PresenterBinder; +import com.omegar.mvp.compiler.JavaFilesGenerator; +import com.omegar.mvp.compiler.Util; +import com.omegar.mvp.presenter.PresenterField; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.JavaFile; import com.squareup.javapoet.MethodSpec; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/PresenterProviderMethod.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/PresenterProviderMethod.java similarity index 88% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/PresenterProviderMethod.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/PresenterProviderMethod.java index 43814cc3..4a4c3040 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/PresenterProviderMethod.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/PresenterProviderMethod.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.compiler.presenterbinder; +package com.omegar.mvp.compiler.presenterbinder; -import com.arellomobile.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.PresenterType; import javax.lang.model.type.DeclaredType; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TagProviderMethod.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/TagProviderMethod.java similarity index 87% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TagProviderMethod.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/TagProviderMethod.java index 8e01be05..d83ee5a6 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TagProviderMethod.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/TagProviderMethod.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.compiler.presenterbinder; +package com.omegar.mvp.compiler.presenterbinder; -import com.arellomobile.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.PresenterType; import javax.lang.model.type.TypeMirror; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TargetClassInfo.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/TargetClassInfo.java similarity index 89% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TargetClassInfo.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/TargetClassInfo.java index 0c739bd2..89c09793 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TargetClassInfo.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/TargetClassInfo.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.compiler.presenterbinder; +package com.omegar.mvp.compiler.presenterbinder; import com.squareup.javapoet.ClassName; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TargetPresenterField.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/TargetPresenterField.java similarity index 93% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TargetPresenterField.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/TargetPresenterField.java index 71b419e4..fa8e9a3c 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/presenterbinder/TargetPresenterField.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/presenterbinder/TargetPresenterField.java @@ -1,7 +1,7 @@ -package com.arellomobile.mvp.compiler.presenterbinder; +package com.omegar.mvp.compiler.presenterbinder; -import com.arellomobile.mvp.MvpProcessor; -import com.arellomobile.mvp.presenter.PresenterType; +import com.omegar.mvp.MvpProcessor; +import com.omegar.mvp.presenter.PresenterType; import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/reflector/MoxyReflectorGenerator.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/reflector/MoxyReflectorGenerator.java similarity index 97% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/reflector/MoxyReflectorGenerator.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/reflector/MoxyReflectorGenerator.java index 2bf16a20..9f04e1de 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/reflector/MoxyReflectorGenerator.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/reflector/MoxyReflectorGenerator.java @@ -1,7 +1,7 @@ -package com.arellomobile.mvp.compiler.reflector; +package com.omegar.mvp.compiler.reflector; -import com.arellomobile.mvp.MvpProcessor; -import com.arellomobile.mvp.ViewStateProvider; +import com.omegar.mvp.MvpProcessor; +import com.omegar.mvp.ViewStateProvider; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.JavaFile; @@ -26,7 +26,7 @@ import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; -import static com.arellomobile.mvp.compiler.MvpCompiler.MOXY_REFLECTOR_DEFAULT_PACKAGE; +import static com.omegar.mvp.compiler.MvpCompiler.MOXY_REFLECTOR_DEFAULT_PACKAGE; /** * Date: 07.12.2016 diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceInfo.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceInfo.java similarity index 96% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceInfo.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceInfo.java index d5069fb1..0a10199d 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceInfo.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceInfo.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.compiler.viewstate; +package com.omegar.mvp.compiler.viewstate; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ParameterizedTypeName; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceProcessor.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java similarity index 95% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceProcessor.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java index 18d8a960..afe4e75e 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewInterfaceProcessor.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java @@ -1,10 +1,10 @@ -package com.arellomobile.mvp.compiler.viewstate; +package com.omegar.mvp.compiler.viewstate; -import com.arellomobile.mvp.compiler.ElementProcessor; -import com.arellomobile.mvp.compiler.MvpCompiler; -import com.arellomobile.mvp.compiler.Util; -import com.arellomobile.mvp.viewstate.strategy.AddToEndStrategy; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.compiler.ElementProcessor; +import com.omegar.mvp.compiler.MvpCompiler; +import com.omegar.mvp.compiler.Util; +import com.omegar.mvp.viewstate.strategy.AddToEndStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; import com.squareup.javapoet.ParameterSpec; import java.util.ArrayList; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewMethod.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewMethod.java similarity index 97% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewMethod.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewMethod.java index c4446751..42626119 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewMethod.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewMethod.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.compiler.viewstate; +package com.omegar.mvp.compiler.viewstate; -import com.arellomobile.mvp.compiler.MvpCompiler; +import com.omegar.mvp.compiler.MvpCompiler; import com.squareup.javapoet.ParameterSpec; import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeVariableName; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewStateClassGenerator.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java similarity index 92% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewStateClassGenerator.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java index c6463429..a70ed88c 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstate/ViewStateClassGenerator.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java @@ -1,10 +1,10 @@ -package com.arellomobile.mvp.compiler.viewstate; +package com.omegar.mvp.compiler.viewstate; -import com.arellomobile.mvp.MvpProcessor; -import com.arellomobile.mvp.compiler.JavaFilesGenerator; -import com.arellomobile.mvp.compiler.MvpCompiler; -import com.arellomobile.mvp.viewstate.MvpViewState; -import com.arellomobile.mvp.viewstate.ViewCommand; +import com.omegar.mvp.MvpProcessor; +import com.omegar.mvp.compiler.JavaFilesGenerator; +import com.omegar.mvp.compiler.MvpCompiler; +import com.omegar.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.ViewCommand; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.JavaFile; import com.squareup.javapoet.MethodSpec; @@ -20,7 +20,7 @@ import javax.lang.model.element.Modifier; import javax.lang.model.type.DeclaredType; -import static com.arellomobile.mvp.compiler.Util.decapitalizeString; +import static com.omegar.mvp.compiler.Util.decapitalizeString; /** * Date: 18.12.2015 diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstateprovider/InjectViewStateProcessor.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstateprovider/InjectViewStateProcessor.java similarity index 89% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstateprovider/InjectViewStateProcessor.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstateprovider/InjectViewStateProcessor.java index 185650f5..214e9593 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstateprovider/InjectViewStateProcessor.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstateprovider/InjectViewStateProcessor.java @@ -1,13 +1,13 @@ -package com.arellomobile.mvp.compiler.viewstateprovider; +package com.omegar.mvp.compiler.viewstateprovider; -import com.arellomobile.mvp.DefaultView; -import com.arellomobile.mvp.DefaultViewState; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.MvpProcessor; -import com.arellomobile.mvp.compiler.ElementProcessor; -import com.arellomobile.mvp.compiler.MvpCompiler; -import com.arellomobile.mvp.compiler.Util; +import com.omegar.mvp.DefaultView; +import com.omegar.mvp.DefaultViewState; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.MvpProcessor; +import com.omegar.mvp.compiler.ElementProcessor; +import com.omegar.mvp.compiler.MvpCompiler; +import com.omegar.mvp.compiler.Util; import java.util.ArrayList; import java.util.Collections; @@ -23,9 +23,8 @@ import javax.lang.model.type.MirroredTypeException; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; -import javax.tools.Diagnostic; -import static com.arellomobile.mvp.compiler.Util.fillGenerics; +import static com.omegar.mvp.compiler.Util.fillGenerics; public class InjectViewStateProcessor extends ElementProcessor { private static final String MVP_PRESENTER_CLASS = MvpPresenter.class.getCanonicalName(); diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstateprovider/PresenterInfo.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstateprovider/PresenterInfo.java similarity index 90% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstateprovider/PresenterInfo.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstateprovider/PresenterInfo.java index 19339ba8..2d68dec2 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstateprovider/PresenterInfo.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstateprovider/PresenterInfo.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.compiler.viewstateprovider; +package com.omegar.mvp.compiler.viewstateprovider; import com.squareup.javapoet.ClassName; diff --git a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstateprovider/ViewStateProviderClassGenerator.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstateprovider/ViewStateProviderClassGenerator.java similarity index 85% rename from moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstateprovider/ViewStateProviderClassGenerator.java rename to moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstateprovider/ViewStateProviderClassGenerator.java index 28477dc0..00979fa4 100644 --- a/moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/viewstateprovider/ViewStateProviderClassGenerator.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstateprovider/ViewStateProviderClassGenerator.java @@ -1,10 +1,10 @@ -package com.arellomobile.mvp.compiler.viewstateprovider; +package com.omegar.mvp.compiler.viewstateprovider; -import com.arellomobile.mvp.MvpProcessor; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.ViewStateProvider; -import com.arellomobile.mvp.compiler.JavaFilesGenerator; -import com.arellomobile.mvp.viewstate.MvpViewState; +import com.omegar.mvp.MvpProcessor; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.ViewStateProvider; +import com.omegar.mvp.compiler.JavaFilesGenerator; +import com.omegar.mvp.viewstate.MvpViewState; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.JavaFile; import com.squareup.javapoet.MethodSpec; diff --git a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/CompilerTest.java b/moxy-compiler/src/test/java/com/omegar/mvp/compiler/CompilerTest.java similarity index 99% rename from moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/CompilerTest.java rename to moxy-compiler/src/test/java/com/omegar/mvp/compiler/CompilerTest.java index 052fe9fc..10e6ec03 100644 --- a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/CompilerTest.java +++ b/moxy-compiler/src/test/java/com/omegar/mvp/compiler/CompilerTest.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.compiler; +package com.omegar.mvp.compiler; import com.google.common.base.Joiner; import com.google.testing.compile.Compilation; diff --git a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/MultiModulesTest.java b/moxy-compiler/src/test/java/com/omegar/mvp/compiler/MultiModulesTest.java similarity index 95% rename from moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/MultiModulesTest.java rename to moxy-compiler/src/test/java/com/omegar/mvp/compiler/MultiModulesTest.java index fe767ff8..11cd295c 100644 --- a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/MultiModulesTest.java +++ b/moxy-compiler/src/test/java/com/omegar/mvp/compiler/MultiModulesTest.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.compiler; +package com.omegar.mvp.compiler; import com.google.testing.compile.Compilation; @@ -36,7 +36,7 @@ public void testLibraryModule() throws Exception { public void testRegisterMoxyReflectorPackages() throws Exception { JavaFileObject someClientClass = forSourceLines("multimodules.app.App", "package multimodules.app;", - "import com.arellomobile.mvp.RegisterMoxyReflectorPackages;", + "import RegisterMoxyReflectorPackages;", "@RegisterMoxyReflectorPackages(\"multimodules.lib1\")", "public class App {}" ); diff --git a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/PresentersBinderErrorTest.java b/moxy-compiler/src/test/java/com/omegar/mvp/compiler/PresentersBinderErrorTest.java similarity index 95% rename from moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/PresentersBinderErrorTest.java rename to moxy-compiler/src/test/java/com/omegar/mvp/compiler/PresentersBinderErrorTest.java index 0ebcc7f1..a03cb4a2 100644 --- a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/PresentersBinderErrorTest.java +++ b/moxy-compiler/src/test/java/com/omegar/mvp/compiler/PresentersBinderErrorTest.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.compiler; +package com.omegar.mvp.compiler; import com.google.testing.compile.Compilation; diff --git a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/PresentersBinderTest.java b/moxy-compiler/src/test/java/com/omegar/mvp/compiler/PresentersBinderTest.java similarity index 93% rename from moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/PresentersBinderTest.java rename to moxy-compiler/src/test/java/com/omegar/mvp/compiler/PresentersBinderTest.java index 57fb48b7..042a3e08 100644 --- a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/PresentersBinderTest.java +++ b/moxy-compiler/src/test/java/com/omegar/mvp/compiler/PresentersBinderTest.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.compiler; +package com.omegar.mvp.compiler; -import com.arellomobile.mvp.MvpProcessor; +import com.omegar.mvp.MvpProcessor; import com.google.testing.compile.Compilation; import org.junit.Test; diff --git a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/ViewStateProviderTest.java b/moxy-compiler/src/test/java/com/omegar/mvp/compiler/ViewStateProviderTest.java similarity index 94% rename from moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/ViewStateProviderTest.java rename to moxy-compiler/src/test/java/com/omegar/mvp/compiler/ViewStateProviderTest.java index 6b1977e0..b98d6f01 100644 --- a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/ViewStateProviderTest.java +++ b/moxy-compiler/src/test/java/com/omegar/mvp/compiler/ViewStateProviderTest.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.compiler; +package com.omegar.mvp.compiler; -import com.arellomobile.mvp.MvpProcessor; +import com.omegar.mvp.MvpProcessor; import com.google.testing.compile.Compilation; import org.junit.Test; diff --git a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/ViewStateTest.java b/moxy-compiler/src/test/java/com/omegar/mvp/compiler/ViewStateTest.java similarity index 90% rename from moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/ViewStateTest.java rename to moxy-compiler/src/test/java/com/omegar/mvp/compiler/ViewStateTest.java index 253fce4e..4424342b 100644 --- a/moxy-compiler/src/test/java/com/arellomobile/mvp/compiler/ViewStateTest.java +++ b/moxy-compiler/src/test/java/com/omegar/mvp/compiler/ViewStateTest.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.compiler; +package com.omegar.mvp.compiler; -import com.arellomobile.mvp.MvpProcessor; +import com.omegar.mvp.MvpProcessor; import com.google.testing.compile.Compilation; import org.junit.Test; @@ -52,8 +52,8 @@ public void test() throws Exception { private JavaFileObject createDummyPresenter(String viewClass) { return forSourceLines("presenter.DummyPresenter", "package presenter;", - "import com.arellomobile.mvp.InjectViewState;", - "import com.arellomobile.mvp.MvpPresenter;", + "import InjectViewState;", + "import MvpPresenter;", "@InjectViewState", "public class DummyPresenter extends MvpPresenter<" + viewClass + "> {}" ); diff --git a/moxy-compiler/src/test/resources/multimodules/app/AppPresenter$$ViewStateProvider.java b/moxy-compiler/src/test/resources/multimodules/app/AppPresenter$$ViewStateProvider.java index 60033e91..bc54a4a6 100644 --- a/moxy-compiler/src/test/resources/multimodules/app/AppPresenter$$ViewStateProvider.java +++ b/moxy-compiler/src/test/resources/multimodules/app/AppPresenter$$ViewStateProvider.java @@ -1,8 +1,8 @@ package multimodules.app; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.ViewStateProvider; -import com.arellomobile.mvp.viewstate.MvpViewState; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.ViewStateProvider; +import com.omegar.mvp.viewstate.MvpViewState; public class AppPresenter$$ViewStateProvider extends ViewStateProvider { @Override diff --git a/moxy-compiler/src/test/resources/multimodules/app/AppPresenter.java b/moxy-compiler/src/test/resources/multimodules/app/AppPresenter.java index 199ebe48..cbedcd0a 100644 --- a/moxy-compiler/src/test/resources/multimodules/app/AppPresenter.java +++ b/moxy-compiler/src/test/resources/multimodules/app/AppPresenter.java @@ -1,7 +1,7 @@ package multimodules.app; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; @InjectViewState public class AppPresenter extends MvpPresenter { diff --git a/moxy-compiler/src/test/resources/multimodules/app/AppView$$State.java b/moxy-compiler/src/test/resources/multimodules/app/AppView$$State.java index e0777a94..e81434cf 100644 --- a/moxy-compiler/src/test/resources/multimodules/app/AppView$$State.java +++ b/moxy-compiler/src/test/resources/multimodules/app/AppView$$State.java @@ -1,6 +1,6 @@ package multimodules.app; -import com.arellomobile.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.MvpViewState; public class AppView$$State extends MvpViewState implements AppView { } \ No newline at end of file diff --git a/moxy-compiler/src/test/resources/multimodules/app/AppView.java b/moxy-compiler/src/test/resources/multimodules/app/AppView.java index 5ad2c6a5..0ce5fa05 100644 --- a/moxy-compiler/src/test/resources/multimodules/app/AppView.java +++ b/moxy-compiler/src/test/resources/multimodules/app/AppView.java @@ -1,6 +1,6 @@ package multimodules.app; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; public interface AppView extends MvpView { } \ No newline at end of file diff --git a/moxy-compiler/src/test/resources/multimodules/app/MoxyReflector.java b/moxy-compiler/src/test/resources/multimodules/app/MoxyReflector.java index 7750af41..1d56f984 100644 --- a/moxy-compiler/src/test/resources/multimodules/app/MoxyReflector.java +++ b/moxy-compiler/src/test/resources/multimodules/app/MoxyReflector.java @@ -1,5 +1,7 @@ package com.arellomobile.mvp; +import com.omegar.mvp.ViewStateProvider; + import java.lang.Class; import java.lang.Object; import java.util.HashMap; diff --git a/moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter$$ViewStateProvider.java b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter$$ViewStateProvider.java index c5f16557..1d72db8b 100644 --- a/moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter$$ViewStateProvider.java +++ b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter$$ViewStateProvider.java @@ -1,8 +1,8 @@ package multimodules.lib1; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.ViewStateProvider; -import com.arellomobile.mvp.viewstate.MvpViewState; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.ViewStateProvider; +import com.omegar.mvp.viewstate.MvpViewState; public class Lib1Presenter$$ViewStateProvider extends ViewStateProvider { @Override diff --git a/moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter.java b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter.java index ff74d536..247500ad 100644 --- a/moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter.java +++ b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1Presenter.java @@ -1,7 +1,7 @@ package multimodules.lib1; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; @InjectViewState public class Lib1Presenter extends MvpPresenter { diff --git a/moxy-compiler/src/test/resources/multimodules/lib1/Lib1View$$State.java b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1View$$State.java index d8f5495f..b5f75ecb 100644 --- a/moxy-compiler/src/test/resources/multimodules/lib1/Lib1View$$State.java +++ b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1View$$State.java @@ -1,6 +1,6 @@ package multimodules.lib1; -import com.arellomobile.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.MvpViewState; public class Lib1View$$State extends MvpViewState implements Lib1View { } \ No newline at end of file diff --git a/moxy-compiler/src/test/resources/multimodules/lib1/Lib1View.java b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1View.java index 9460cb0a..3f3ee3db 100644 --- a/moxy-compiler/src/test/resources/multimodules/lib1/Lib1View.java +++ b/moxy-compiler/src/test/resources/multimodules/lib1/Lib1View.java @@ -1,6 +1,6 @@ package multimodules.lib1; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; public interface Lib1View extends MvpView { } \ No newline at end of file diff --git a/moxy-compiler/src/test/resources/presenter/EmptyViewPresenter$$ViewStateProvider.java b/moxy-compiler/src/test/resources/presenter/EmptyViewPresenter$$ViewStateProvider.java index e18aa18b..dab909ff 100644 --- a/moxy-compiler/src/test/resources/presenter/EmptyViewPresenter$$ViewStateProvider.java +++ b/moxy-compiler/src/test/resources/presenter/EmptyViewPresenter$$ViewStateProvider.java @@ -1,8 +1,8 @@ package presenter; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.ViewStateProvider; -import com.arellomobile.mvp.viewstate.MvpViewState; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.ViewStateProvider; +import com.omegar.mvp.viewstate.MvpViewState; import view.EmptyView$$State; diff --git a/moxy-compiler/src/test/resources/presenter/EmptyViewPresenter.java b/moxy-compiler/src/test/resources/presenter/EmptyViewPresenter.java index 9ea83015..59f15fa0 100644 --- a/moxy-compiler/src/test/resources/presenter/EmptyViewPresenter.java +++ b/moxy-compiler/src/test/resources/presenter/EmptyViewPresenter.java @@ -1,7 +1,7 @@ package presenter; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; import view.EmptyView; diff --git a/moxy-compiler/src/test/resources/presenter/GenericPresenter$$ViewStateProvider.java b/moxy-compiler/src/test/resources/presenter/GenericPresenter$$ViewStateProvider.java index 21ef676a..2b0e2bb1 100644 --- a/moxy-compiler/src/test/resources/presenter/GenericPresenter$$ViewStateProvider.java +++ b/moxy-compiler/src/test/resources/presenter/GenericPresenter$$ViewStateProvider.java @@ -1,8 +1,8 @@ package presenter; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.ViewStateProvider; -import com.arellomobile.mvp.viewstate.MvpViewState; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.ViewStateProvider; +import com.omegar.mvp.viewstate.MvpViewState; import view.GenericView$$State; diff --git a/moxy-compiler/src/test/resources/presenter/GenericPresenter.java b/moxy-compiler/src/test/resources/presenter/GenericPresenter.java index 0f7fde29..697e4a05 100644 --- a/moxy-compiler/src/test/resources/presenter/GenericPresenter.java +++ b/moxy-compiler/src/test/resources/presenter/GenericPresenter.java @@ -1,7 +1,7 @@ package presenter; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; import view.GenericView; diff --git a/moxy-compiler/src/test/resources/target/GenericPresenterTarget$$PresentersBinder.java b/moxy-compiler/src/test/resources/target/GenericPresenterTarget$$PresentersBinder.java index cc754a97..c54cef18 100644 --- a/moxy-compiler/src/test/resources/target/GenericPresenterTarget$$PresentersBinder.java +++ b/moxy-compiler/src/test/resources/target/GenericPresenterTarget$$PresentersBinder.java @@ -1,9 +1,9 @@ package target; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.PresenterBinder; -import com.arellomobile.mvp.presenter.PresenterField; -import com.arellomobile.mvp.presenter.PresenterType; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.PresenterBinder; +import com.omegar.mvp.presenter.PresenterField; +import com.omegar.mvp.presenter.PresenterType; import java.util.ArrayList; import java.util.List; diff --git a/moxy-compiler/src/test/resources/target/GenericPresenterTarget.java b/moxy-compiler/src/test/resources/target/GenericPresenterTarget.java index 1d20d27c..aa093bfe 100644 --- a/moxy-compiler/src/test/resources/target/GenericPresenterTarget.java +++ b/moxy-compiler/src/test/resources/target/GenericPresenterTarget.java @@ -1,7 +1,7 @@ package target; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.ProvidePresenter; import presenter.GenericPresenter; import view.GenericView; diff --git a/moxy-compiler/src/test/resources/target/NotImplementViewInterfaceTarget.java b/moxy-compiler/src/test/resources/target/NotImplementViewInterfaceTarget.java index bb49167c..4e18788a 100644 --- a/moxy-compiler/src/test/resources/target/NotImplementViewInterfaceTarget.java +++ b/moxy-compiler/src/test/resources/target/NotImplementViewInterfaceTarget.java @@ -1,6 +1,6 @@ package target; -import com.arellomobile.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.InjectPresenter; import presenter.EmptyViewPresenter; diff --git a/moxy-compiler/src/test/resources/target/SimpleInjectPresenterTarget$$PresentersBinder.java b/moxy-compiler/src/test/resources/target/SimpleInjectPresenterTarget$$PresentersBinder.java index 72fe664c..45218877 100644 --- a/moxy-compiler/src/test/resources/target/SimpleInjectPresenterTarget$$PresentersBinder.java +++ b/moxy-compiler/src/test/resources/target/SimpleInjectPresenterTarget$$PresentersBinder.java @@ -1,9 +1,9 @@ package target; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.PresenterBinder; -import com.arellomobile.mvp.presenter.PresenterField; -import com.arellomobile.mvp.presenter.PresenterType; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.PresenterBinder; +import com.omegar.mvp.presenter.PresenterField; +import com.omegar.mvp.presenter.PresenterType; import java.util.ArrayList; import java.util.List; diff --git a/moxy-compiler/src/test/resources/target/SimpleInjectPresenterTarget.java b/moxy-compiler/src/test/resources/target/SimpleInjectPresenterTarget.java index 8b9a7e2b..8b6b8202 100644 --- a/moxy-compiler/src/test/resources/target/SimpleInjectPresenterTarget.java +++ b/moxy-compiler/src/test/resources/target/SimpleInjectPresenterTarget.java @@ -1,6 +1,6 @@ package target; -import com.arellomobile.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.InjectPresenter; import presenter.EmptyViewPresenter; import view.EmptyView; diff --git a/moxy-compiler/src/test/resources/target/SimpleProvidePresenterTarget$$PresentersBinder.java b/moxy-compiler/src/test/resources/target/SimpleProvidePresenterTarget$$PresentersBinder.java index b0670424..f3618614 100644 --- a/moxy-compiler/src/test/resources/target/SimpleProvidePresenterTarget$$PresentersBinder.java +++ b/moxy-compiler/src/test/resources/target/SimpleProvidePresenterTarget$$PresentersBinder.java @@ -1,9 +1,9 @@ package target; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.PresenterBinder; -import com.arellomobile.mvp.presenter.PresenterField; -import com.arellomobile.mvp.presenter.PresenterType; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.PresenterBinder; +import com.omegar.mvp.presenter.PresenterField; +import com.omegar.mvp.presenter.PresenterType; import java.util.ArrayList; import java.util.List; diff --git a/moxy-compiler/src/test/resources/target/SimpleProvidePresenterTarget.java b/moxy-compiler/src/test/resources/target/SimpleProvidePresenterTarget.java index bad9db70..553bf807 100644 --- a/moxy-compiler/src/test/resources/target/SimpleProvidePresenterTarget.java +++ b/moxy-compiler/src/test/resources/target/SimpleProvidePresenterTarget.java @@ -1,7 +1,7 @@ package target; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.ProvidePresenter; import presenter.EmptyViewPresenter; import view.EmptyView; diff --git a/moxy-compiler/src/test/resources/view/EmptyView$$State.java b/moxy-compiler/src/test/resources/view/EmptyView$$State.java index 235e54e0..a2819224 100644 --- a/moxy-compiler/src/test/resources/view/EmptyView$$State.java +++ b/moxy-compiler/src/test/resources/view/EmptyView$$State.java @@ -1,6 +1,6 @@ package view; -import com.arellomobile.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.MvpViewState; public class EmptyView$$State extends MvpViewState implements EmptyView { } \ No newline at end of file diff --git a/moxy-compiler/src/test/resources/view/EmptyView.java b/moxy-compiler/src/test/resources/view/EmptyView.java index 5fcef4bc..e685e7d6 100644 --- a/moxy-compiler/src/test/resources/view/EmptyView.java +++ b/moxy-compiler/src/test/resources/view/EmptyView.java @@ -1,6 +1,6 @@ package view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; public interface EmptyView extends MvpView { } \ No newline at end of file diff --git a/moxy-compiler/src/test/resources/view/ExtendsOfGenericView$$State.java b/moxy-compiler/src/test/resources/view/ExtendsOfGenericView$$State.java index 1d3b5f8f..648147b0 100644 --- a/moxy-compiler/src/test/resources/view/ExtendsOfGenericView$$State.java +++ b/moxy-compiler/src/test/resources/view/ExtendsOfGenericView$$State.java @@ -1,8 +1,8 @@ package view; -import com.arellomobile.mvp.viewstate.MvpViewState; -import com.arellomobile.mvp.viewstate.ViewCommand; -import com.arellomobile.mvp.viewstate.strategy.AddToEndStrategy; +import com.omegar.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.ViewCommand; +import com.omegar.mvp.viewstate.strategy.AddToEndStrategy; import java.io.Serializable; import java.lang.Override; diff --git a/moxy-compiler/src/test/resources/view/ExtendsOfGenericView.java b/moxy-compiler/src/test/resources/view/ExtendsOfGenericView.java index da6edab2..4bb2b558 100644 --- a/moxy-compiler/src/test/resources/view/ExtendsOfGenericView.java +++ b/moxy-compiler/src/test/resources/view/ExtendsOfGenericView.java @@ -1,7 +1,5 @@ package view; -import com.arellomobile.mvp.MvpView; - import java.io.Serializable; public interface ExtendsOfGenericView extends GenericWithExtendsView { diff --git a/moxy-compiler/src/test/resources/view/GenericMethodsView$$State.java b/moxy-compiler/src/test/resources/view/GenericMethodsView$$State.java index b8ec5580..eb9cf86b 100644 --- a/moxy-compiler/src/test/resources/view/GenericMethodsView$$State.java +++ b/moxy-compiler/src/test/resources/view/GenericMethodsView$$State.java @@ -1,8 +1,8 @@ package view; -import com.arellomobile.mvp.viewstate.MvpViewState; -import com.arellomobile.mvp.viewstate.ViewCommand; -import com.arellomobile.mvp.viewstate.strategy.AddToEndStrategy; +import com.omegar.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.ViewCommand; +import com.omegar.mvp.viewstate.strategy.AddToEndStrategy; public class GenericMethodsView$$State extends MvpViewState implements GenericMethodsView { diff --git a/moxy-compiler/src/test/resources/view/GenericMethodsView.java b/moxy-compiler/src/test/resources/view/GenericMethodsView.java index c609b694..64f1355d 100644 --- a/moxy-compiler/src/test/resources/view/GenericMethodsView.java +++ b/moxy-compiler/src/test/resources/view/GenericMethodsView.java @@ -1,6 +1,6 @@ package view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; public interface GenericMethodsView extends MvpView { void generic(T param); diff --git a/moxy-compiler/src/test/resources/view/GenericView$$State.java b/moxy-compiler/src/test/resources/view/GenericView$$State.java index 2fec06ea..2148a9f9 100644 --- a/moxy-compiler/src/test/resources/view/GenericView$$State.java +++ b/moxy-compiler/src/test/resources/view/GenericView$$State.java @@ -1,8 +1,8 @@ package view; -import com.arellomobile.mvp.viewstate.MvpViewState; -import com.arellomobile.mvp.viewstate.ViewCommand; -import com.arellomobile.mvp.viewstate.strategy.AddToEndStrategy; +import com.omegar.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.ViewCommand; +import com.omegar.mvp.viewstate.strategy.AddToEndStrategy; public class GenericView$$State extends MvpViewState> implements GenericView { diff --git a/moxy-compiler/src/test/resources/view/GenericView.java b/moxy-compiler/src/test/resources/view/GenericView.java index 37b01a35..8e226388 100644 --- a/moxy-compiler/src/test/resources/view/GenericView.java +++ b/moxy-compiler/src/test/resources/view/GenericView.java @@ -1,7 +1,6 @@ package view; -import com.arellomobile.mvp.GenerateViewState; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; public interface GenericView extends MvpView { void testEvent(T param); diff --git a/moxy-compiler/src/test/resources/view/GenericWithExtendsView$$State.java b/moxy-compiler/src/test/resources/view/GenericWithExtendsView$$State.java index 85fc14dc..d100cbf9 100644 --- a/moxy-compiler/src/test/resources/view/GenericWithExtendsView$$State.java +++ b/moxy-compiler/src/test/resources/view/GenericWithExtendsView$$State.java @@ -1,8 +1,8 @@ package view; -import com.arellomobile.mvp.viewstate.MvpViewState; -import com.arellomobile.mvp.viewstate.ViewCommand; -import com.arellomobile.mvp.viewstate.strategy.AddToEndStrategy; +import com.omegar.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.ViewCommand; +import com.omegar.mvp.viewstate.strategy.AddToEndStrategy; import java.io.Serializable; diff --git a/moxy-compiler/src/test/resources/view/GenericWithExtendsView.java b/moxy-compiler/src/test/resources/view/GenericWithExtendsView.java index 1cd12198..9f16c20d 100644 --- a/moxy-compiler/src/test/resources/view/GenericWithExtendsView.java +++ b/moxy-compiler/src/test/resources/view/GenericWithExtendsView.java @@ -1,6 +1,6 @@ package view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; import java.io.Serializable; diff --git a/moxy-compiler/src/test/resources/view/OverloadingView$$State.java b/moxy-compiler/src/test/resources/view/OverloadingView$$State.java index 9a6cd2af..48fbd9eb 100644 --- a/moxy-compiler/src/test/resources/view/OverloadingView$$State.java +++ b/moxy-compiler/src/test/resources/view/OverloadingView$$State.java @@ -1,8 +1,8 @@ package view; -import com.arellomobile.mvp.viewstate.MvpViewState; -import com.arellomobile.mvp.viewstate.ViewCommand; -import com.arellomobile.mvp.viewstate.strategy.AddToEndStrategy; +import com.omegar.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.ViewCommand; +import com.omegar.mvp.viewstate.strategy.AddToEndStrategy; public class OverloadingView$$State extends MvpViewState implements OverloadingView { diff --git a/moxy-compiler/src/test/resources/view/OverloadingView.java b/moxy-compiler/src/test/resources/view/OverloadingView.java index d784d7b7..7c2a67b7 100644 --- a/moxy-compiler/src/test/resources/view/OverloadingView.java +++ b/moxy-compiler/src/test/resources/view/OverloadingView.java @@ -1,6 +1,6 @@ package view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; public interface OverloadingView extends MvpView { void method(String string); diff --git a/moxy-compiler/src/test/resources/view/SimpleView$$State.java b/moxy-compiler/src/test/resources/view/SimpleView$$State.java index 4412c86e..2f959471 100644 --- a/moxy-compiler/src/test/resources/view/SimpleView$$State.java +++ b/moxy-compiler/src/test/resources/view/SimpleView$$State.java @@ -1,8 +1,8 @@ package view; -import com.arellomobile.mvp.viewstate.MvpViewState; -import com.arellomobile.mvp.viewstate.ViewCommand; -import com.arellomobile.mvp.viewstate.strategy.AddToEndStrategy; +import com.omegar.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.ViewCommand; +import com.omegar.mvp.viewstate.strategy.AddToEndStrategy; public class SimpleView$$State extends MvpViewState implements SimpleView { diff --git a/moxy-compiler/src/test/resources/view/SimpleView.java b/moxy-compiler/src/test/resources/view/SimpleView.java index acfa044c..3ebf4dbc 100644 --- a/moxy-compiler/src/test/resources/view/SimpleView.java +++ b/moxy-compiler/src/test/resources/view/SimpleView.java @@ -1,6 +1,6 @@ package view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; public interface SimpleView extends MvpView { void testEvent(); diff --git a/moxy-compiler/src/test/resources/view/StrategiesView$$State.java b/moxy-compiler/src/test/resources/view/StrategiesView$$State.java index 8c016bba..bf9d5247 100644 --- a/moxy-compiler/src/test/resources/view/StrategiesView$$State.java +++ b/moxy-compiler/src/test/resources/view/StrategiesView$$State.java @@ -1,10 +1,10 @@ package view; -import com.arellomobile.mvp.viewstate.MvpViewState; -import com.arellomobile.mvp.viewstate.ViewCommand; -import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; -import com.arellomobile.mvp.viewstate.strategy.OneExecutionStateStrategy; -import com.arellomobile.mvp.viewstate.strategy.SingleStateStrategy; +import com.omegar.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.ViewCommand; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.OneExecutionStateStrategy; +import com.omegar.mvp.viewstate.strategy.SingleStateStrategy; public class StrategiesView$$State extends MvpViewState implements StrategiesView { diff --git a/moxy-compiler/src/test/resources/view/StrategiesView.java b/moxy-compiler/src/test/resources/view/StrategiesView.java index 4dc19d3b..f51a4372 100644 --- a/moxy-compiler/src/test/resources/view/StrategiesView.java +++ b/moxy-compiler/src/test/resources/view/StrategiesView.java @@ -1,10 +1,10 @@ package view; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; -import com.arellomobile.mvp.viewstate.strategy.OneExecutionStateStrategy; -import com.arellomobile.mvp.viewstate.strategy.SingleStateStrategy; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.OneExecutionStateStrategy; +import com.omegar.mvp.viewstate.strategy.SingleStateStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; @StateStrategyType(AddToEndSingleStrategy.class) public interface StrategiesView extends MvpView { diff --git a/moxy-compiler/src/test/resources/view/strategies_inheritance/ChildView$$State.java b/moxy-compiler/src/test/resources/view/strategies_inheritance/ChildView$$State.java index 175e83f4..a00ebfb5 100644 --- a/moxy-compiler/src/test/resources/view/strategies_inheritance/ChildView$$State.java +++ b/moxy-compiler/src/test/resources/view/strategies_inheritance/ChildView$$State.java @@ -1,7 +1,7 @@ package view.strategies_inheritance; -import com.arellomobile.mvp.viewstate.MvpViewState; -import com.arellomobile.mvp.viewstate.ViewCommand; +import com.omegar.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.ViewCommand; import view.strategies_inheritance.strategies.ChildDefaultStrategy; import view.strategies_inheritance.strategies.Strategy1; diff --git a/moxy-compiler/src/test/resources/view/strategies_inheritance/ChildView.java b/moxy-compiler/src/test/resources/view/strategies_inheritance/ChildView.java index 2006c725..a3363a6e 100644 --- a/moxy-compiler/src/test/resources/view/strategies_inheritance/ChildView.java +++ b/moxy-compiler/src/test/resources/view/strategies_inheritance/ChildView.java @@ -1,6 +1,6 @@ package view.strategies_inheritance; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; import view.strategies_inheritance.strategies.ChildDefaultStrategy; import view.strategies_inheritance.strategies.Strategy2; diff --git a/moxy-compiler/src/test/resources/view/strategies_inheritance/ParentView$$State.java b/moxy-compiler/src/test/resources/view/strategies_inheritance/ParentView$$State.java index 5b191987..3924a61c 100644 --- a/moxy-compiler/src/test/resources/view/strategies_inheritance/ParentView$$State.java +++ b/moxy-compiler/src/test/resources/view/strategies_inheritance/ParentView$$State.java @@ -1,7 +1,7 @@ package view.strategies_inheritance; -import com.arellomobile.mvp.viewstate.MvpViewState; -import com.arellomobile.mvp.viewstate.ViewCommand; +import com.omegar.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.ViewCommand; import view.strategies_inheritance.strategies.ParentDefaultStrategy; import view.strategies_inheritance.strategies.Strategy1; diff --git a/moxy-compiler/src/test/resources/view/strategies_inheritance/ParentView.java b/moxy-compiler/src/test/resources/view/strategies_inheritance/ParentView.java index 0e2374fb..27329016 100644 --- a/moxy-compiler/src/test/resources/view/strategies_inheritance/ParentView.java +++ b/moxy-compiler/src/test/resources/view/strategies_inheritance/ParentView.java @@ -1,7 +1,7 @@ package view.strategies_inheritance; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; import view.strategies_inheritance.strategies.ParentDefaultStrategy; import view.strategies_inheritance.strategies.Strategy1; diff --git a/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/ChildDefaultStrategy.java b/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/ChildDefaultStrategy.java index c7545df4..e5c05fa4 100644 --- a/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/ChildDefaultStrategy.java +++ b/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/ChildDefaultStrategy.java @@ -1,6 +1,6 @@ package view.strategies_inheritance.strategies; -import com.arellomobile.mvp.viewstate.strategy.SkipStrategy; +import com.omegar.mvp.viewstate.strategy.SkipStrategy; public class ChildDefaultStrategy extends SkipStrategy { } diff --git a/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/ParentDefaultStrategy.java b/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/ParentDefaultStrategy.java index de7ca7ff..c1f75288 100644 --- a/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/ParentDefaultStrategy.java +++ b/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/ParentDefaultStrategy.java @@ -1,6 +1,6 @@ package view.strategies_inheritance.strategies; -import com.arellomobile.mvp.viewstate.strategy.SkipStrategy; +import com.omegar.mvp.viewstate.strategy.SkipStrategy; public class ParentDefaultStrategy extends SkipStrategy { } diff --git a/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/Strategy1.java b/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/Strategy1.java index ab42697f..a7f47de4 100644 --- a/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/Strategy1.java +++ b/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/Strategy1.java @@ -1,6 +1,6 @@ package view.strategies_inheritance.strategies; -import com.arellomobile.mvp.viewstate.strategy.SkipStrategy; +import com.omegar.mvp.viewstate.strategy.SkipStrategy; public class Strategy1 extends SkipStrategy { } diff --git a/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/Strategy2.java b/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/Strategy2.java index 0dfb3ec5..16e005ab 100644 --- a/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/Strategy2.java +++ b/moxy-compiler/src/test/resources/view/strategies_inheritance/strategies/Strategy2.java @@ -1,6 +1,6 @@ package view.strategies_inheritance.strategies; -import com.arellomobile.mvp.viewstate.strategy.SkipStrategy; +import com.omegar.mvp.viewstate.strategy.SkipStrategy; public class Strategy2 extends SkipStrategy { } diff --git a/moxy/src/main/java/com/arellomobile/mvp/DefaultView.java b/moxy/src/main/java/com/omegar/mvp/DefaultView.java similarity index 80% rename from moxy/src/main/java/com/arellomobile/mvp/DefaultView.java rename to moxy/src/main/java/com/omegar/mvp/DefaultView.java index a6dfd850..9a3840f6 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/DefaultView.java +++ b/moxy/src/main/java/com/omegar/mvp/DefaultView.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; /** * Date: 04.02.2016 diff --git a/moxy/src/main/java/com/arellomobile/mvp/DefaultViewState.java b/moxy/src/main/java/com/omegar/mvp/DefaultViewState.java similarity index 63% rename from moxy/src/main/java/com/arellomobile/mvp/DefaultViewState.java rename to moxy/src/main/java/com/omegar/mvp/DefaultViewState.java index f0c2bf88..a30a565b 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/DefaultViewState.java +++ b/moxy/src/main/java/com/omegar/mvp/DefaultViewState.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; -import com.arellomobile.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.MvpViewState; /** * Date: 19.12.2015 diff --git a/moxy/src/main/java/com/arellomobile/mvp/GenerateViewState.java b/moxy/src/main/java/com/omegar/mvp/GenerateViewState.java similarity index 92% rename from moxy/src/main/java/com/arellomobile/mvp/GenerateViewState.java rename to moxy/src/main/java/com/omegar/mvp/GenerateViewState.java index c31dc24d..df18e70d 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/GenerateViewState.java +++ b/moxy/src/main/java/com/omegar/mvp/GenerateViewState.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import java.lang.annotation.Target; diff --git a/moxy/src/main/java/com/arellomobile/mvp/InjectViewState.java b/moxy/src/main/java/com/omegar/mvp/InjectViewState.java similarity index 88% rename from moxy/src/main/java/com/arellomobile/mvp/InjectViewState.java rename to moxy/src/main/java/com/omegar/mvp/InjectViewState.java index 1e3169fc..b3cad3e0 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/InjectViewState.java +++ b/moxy/src/main/java/com/omegar/mvp/InjectViewState.java @@ -1,8 +1,8 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import java.lang.annotation.Target; -import com.arellomobile.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.MvpViewState; import static java.lang.annotation.ElementType.TYPE; diff --git a/moxy/src/main/java/com/arellomobile/mvp/MvpDelegate.java b/moxy/src/main/java/com/omegar/mvp/MvpDelegate.java similarity index 97% rename from moxy/src/main/java/com/arellomobile/mvp/MvpDelegate.java rename to moxy/src/main/java/com/omegar/mvp/MvpDelegate.java index ba8a674b..e0a20736 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/MvpDelegate.java +++ b/moxy/src/main/java/com/omegar/mvp/MvpDelegate.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import android.os.Bundle; -import com.arellomobile.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.PresenterType; /** * Date: 18-Dec-15 @@ -32,7 +32,7 @@ * @author Konstantin Tckhovrebov */ public class MvpDelegate { - private static final String KEY_TAG = "com.arellomobile.mvp.MvpDelegate.KEY_TAG"; + private static final String KEY_TAG = "MvpDelegate.KEY_TAG"; public static final String MOXY_DELEGATE_TAGS_KEY = "MoxyDelegateBundle"; private String mKeyTag = KEY_TAG; diff --git a/moxy/src/main/java/com/arellomobile/mvp/MvpFacade.java b/moxy/src/main/java/com/omegar/mvp/MvpFacade.java similarity index 97% rename from moxy/src/main/java/com/arellomobile/mvp/MvpFacade.java rename to moxy/src/main/java/com/omegar/mvp/MvpFacade.java index 46185ac1..7e33fcd3 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/MvpFacade.java +++ b/moxy/src/main/java/com/omegar/mvp/MvpFacade.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; /** * Date: 17-Dec-15 diff --git a/moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java b/moxy/src/main/java/com/omegar/mvp/MvpPresenter.java similarity index 96% rename from moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java rename to moxy/src/main/java/com/omegar/mvp/MvpPresenter.java index 7b04d604..fe411806 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/MvpPresenter.java +++ b/moxy/src/main/java/com/omegar/mvp/MvpPresenter.java @@ -1,11 +1,11 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import java.util.Collections; import java.util.Set; import java.util.WeakHashMap; -import com.arellomobile.mvp.presenter.PresenterType; -import com.arellomobile.mvp.viewstate.MvpViewState; +import com.omegar.mvp.presenter.PresenterType; +import com.omegar.mvp.viewstate.MvpViewState; /** * Date: 15.12.2015 diff --git a/moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java b/moxy/src/main/java/com/omegar/mvp/MvpProcessor.java similarity index 88% rename from moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java rename to moxy/src/main/java/com/omegar/mvp/MvpProcessor.java index 0034123b..ae2c3a99 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/MvpProcessor.java +++ b/moxy/src/main/java/com/omegar/mvp/MvpProcessor.java @@ -1,11 +1,12 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.arellomobile.mvp.presenter.PresenterField; -import com.arellomobile.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.PresenterField; +import com.omegar.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.InjectPresenter; /** * Date: 18-Dec-15 @@ -22,12 +23,12 @@ public class MvpProcessor { /** *

1) Generates tag for identification MvpPresenter

- *

2) Checks if presenter with tag is already exist in {@link com.arellomobile.mvp.PresenterStore}, and returns it

- *

3) If {@link com.arellomobile.mvp.PresenterStore} doesn't contain MvpPresenter with current tag, {@link PresenterField} will create it

+ *

2) Checks if presenter with tag is already exist in {@link PresenterStore}, and returns it

+ *

3) If {@link PresenterStore} doesn't contain MvpPresenter with current tag, {@link PresenterField} will create it

* * @param type of delegated * @param target object that want injection - * @param presenterField info about presenter from {@link com.arellomobile.mvp.presenter.InjectPresenter} + * @param presenterField info about presenter from {@link InjectPresenter} * @param delegateTag unique tag generated by {@link MvpDelegate#generateTag()} @return MvpPresenter instance */ private MvpPresenter getMvpPresenter(Delegated target, PresenterField presenterField, String delegateTag) { @@ -64,7 +65,7 @@ private MvpPresenter getMvpPresenter(Delegated ta } /** - *

Gets presenters {@link java.util.List} annotated with {@link com.arellomobile.mvp.presenter.InjectPresenter} for view.

+ *

Gets presenters {@link java.util.List} annotated with {@link InjectPresenter} for view.

*

See full info about getting presenter instance in {@link #getMvpPresenter}

* * @param delegated class contains presenter diff --git a/moxy/src/main/java/com/arellomobile/mvp/MvpView.java b/moxy/src/main/java/com/omegar/mvp/MvpView.java similarity index 76% rename from moxy/src/main/java/com/arellomobile/mvp/MvpView.java rename to moxy/src/main/java/com/omegar/mvp/MvpView.java index cac3b4f9..cd2c5682 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/MvpView.java +++ b/moxy/src/main/java/com/omegar/mvp/MvpView.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; /** * Date: 21.01.2016 diff --git a/moxy/src/main/java/com/arellomobile/mvp/Pair.java b/moxy/src/main/java/com/omegar/mvp/Pair.java similarity index 98% rename from moxy/src/main/java/com/arellomobile/mvp/Pair.java rename to moxy/src/main/java/com/omegar/mvp/Pair.java index 243aa53f..e9d94b63 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/Pair.java +++ b/moxy/src/main/java/com/omegar/mvp/Pair.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.arellomobile.mvp; +package com.omegar.mvp; /** * Container to ease passing around a tuple of two objects. This object provides a sensible diff --git a/moxy/src/main/java/com/arellomobile/mvp/PresenterBinder.java b/moxy/src/main/java/com/omegar/mvp/PresenterBinder.java similarity index 74% rename from moxy/src/main/java/com/arellomobile/mvp/PresenterBinder.java rename to moxy/src/main/java/com/omegar/mvp/PresenterBinder.java index 9edbb867..595145e5 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/PresenterBinder.java +++ b/moxy/src/main/java/com/omegar/mvp/PresenterBinder.java @@ -1,8 +1,8 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import java.util.List; -import com.arellomobile.mvp.presenter.PresenterField; +import com.omegar.mvp.presenter.PresenterField; /** * Date: 18-Dec-15 diff --git a/moxy/src/main/java/com/arellomobile/mvp/PresenterStore.java b/moxy/src/main/java/com/omegar/mvp/PresenterStore.java similarity index 97% rename from moxy/src/main/java/com/arellomobile/mvp/PresenterStore.java rename to moxy/src/main/java/com/omegar/mvp/PresenterStore.java index cf5e431d..2973a6d6 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/PresenterStore.java +++ b/moxy/src/main/java/com/omegar/mvp/PresenterStore.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import java.util.HashMap; import java.util.Map; diff --git a/moxy/src/main/java/com/arellomobile/mvp/PresentersCounter.java b/moxy/src/main/java/com/omegar/mvp/PresentersCounter.java similarity index 98% rename from moxy/src/main/java/com/arellomobile/mvp/PresentersCounter.java rename to moxy/src/main/java/com/omegar/mvp/PresentersCounter.java index a35ae6c3..4cf30474 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/PresentersCounter.java +++ b/moxy/src/main/java/com/omegar/mvp/PresentersCounter.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import java.util.HashMap; import java.util.HashSet; diff --git a/moxy/src/main/java/com/arellomobile/mvp/RegisterMoxyReflectorPackages.java b/moxy/src/main/java/com/omegar/mvp/RegisterMoxyReflectorPackages.java similarity index 89% rename from moxy/src/main/java/com/arellomobile/mvp/RegisterMoxyReflectorPackages.java rename to moxy/src/main/java/com/omegar/mvp/RegisterMoxyReflectorPackages.java index 8b09c9be..0e93b1d2 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/RegisterMoxyReflectorPackages.java +++ b/moxy/src/main/java/com/omegar/mvp/RegisterMoxyReflectorPackages.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import java.lang.annotation.Target; diff --git a/moxy/src/main/java/com/arellomobile/mvp/ViewStateProvider.java b/moxy/src/main/java/com/omegar/mvp/ViewStateProvider.java similarity index 77% rename from moxy/src/main/java/com/arellomobile/mvp/ViewStateProvider.java rename to moxy/src/main/java/com/omegar/mvp/ViewStateProvider.java index e2d0741b..ecf0ef35 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/ViewStateProvider.java +++ b/moxy/src/main/java/com/omegar/mvp/ViewStateProvider.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; -import com.arellomobile.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.MvpViewState; /** * Date: 18.12.2015 diff --git a/moxy/src/main/java/com/arellomobile/mvp/presenter/InjectPresenter.java b/moxy/src/main/java/com/omegar/mvp/presenter/InjectPresenter.java similarity index 92% rename from moxy/src/main/java/com/arellomobile/mvp/presenter/InjectPresenter.java rename to moxy/src/main/java/com/omegar/mvp/presenter/InjectPresenter.java index ab8c10e1..de7931ce 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/presenter/InjectPresenter.java +++ b/moxy/src/main/java/com/omegar/mvp/presenter/InjectPresenter.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.presenter; +package com.omegar.mvp.presenter; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterField.java b/moxy/src/main/java/com/omegar/mvp/presenter/PresenterField.java similarity index 94% rename from moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterField.java rename to moxy/src/main/java/com/omegar/mvp/presenter/PresenterField.java index cf434d10..3e6597fe 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterField.java +++ b/moxy/src/main/java/com/omegar/mvp/presenter/PresenterField.java @@ -1,6 +1,7 @@ -package com.arellomobile.mvp.presenter; +package com.omegar.mvp.presenter; import com.arellomobile.mvp.*; +import com.omegar.mvp.MvpPresenter; /** * Date: 18-Dec-15 diff --git a/moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterType.java b/moxy/src/main/java/com/omegar/mvp/presenter/PresenterType.java similarity index 70% rename from moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterType.java rename to moxy/src/main/java/com/omegar/mvp/presenter/PresenterType.java index fbc886bc..9ff49519 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/presenter/PresenterType.java +++ b/moxy/src/main/java/com/omegar/mvp/presenter/PresenterType.java @@ -1,9 +1,11 @@ -package com.arellomobile.mvp.presenter; +package com.omegar.mvp.presenter; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.PresenterStore; +import com.omegar.mvp.PresentersCounter; /** - * Available presenter types. Manually lifetime control are available over {@link com.arellomobile.mvp.PresenterStore}, {@link com.arellomobile.mvp.PresentersCounter} and {@link MvpPresenter#onDestroy()} + * Available presenter types. Manually lifetime control are available over {@link PresenterStore}, {@link PresentersCounter} and {@link MvpPresenter#onDestroy()} *

* Date: 17-Dec-15 * Time: 19:31 diff --git a/moxy/src/main/java/com/arellomobile/mvp/presenter/ProvidePresenter.java b/moxy/src/main/java/com/omegar/mvp/presenter/ProvidePresenter.java similarity index 92% rename from moxy/src/main/java/com/arellomobile/mvp/presenter/ProvidePresenter.java rename to moxy/src/main/java/com/omegar/mvp/presenter/ProvidePresenter.java index 0822140b..e37fd04b 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/presenter/ProvidePresenter.java +++ b/moxy/src/main/java/com/omegar/mvp/presenter/ProvidePresenter.java @@ -1,4 +1,6 @@ -package com.arellomobile.mvp.presenter; +package com.omegar.mvp.presenter; + +import com.omegar.mvp.PresenterStore; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -6,7 +8,7 @@ import java.lang.annotation.Target; /** - * Called when Moxy can't find right presenter instance in {@link com.arellomobile.mvp.PresenterStore}. + * Called when Moxy can't find right presenter instance in {@link PresenterStore}. *

Attention! Don't use manually method marked with this annotation! Use presenter field, which you want. If you override this method in inherited classes, make them return same type(not requirements but recommendation).

*

Requirements:

*
    diff --git a/moxy/src/main/java/com/arellomobile/mvp/presenter/ProvidePresenterTag.java b/moxy/src/main/java/com/omegar/mvp/presenter/ProvidePresenterTag.java similarity index 86% rename from moxy/src/main/java/com/arellomobile/mvp/presenter/ProvidePresenterTag.java rename to moxy/src/main/java/com/omegar/mvp/presenter/ProvidePresenterTag.java index c77bff65..e2a24d7d 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/presenter/ProvidePresenterTag.java +++ b/moxy/src/main/java/com/omegar/mvp/presenter/ProvidePresenterTag.java @@ -1,14 +1,15 @@ -package com.arellomobile.mvp.presenter; +package com.omegar.mvp.presenter; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.PresenterStore; /** - *

    Called when Moxy generate presenter tag for search Presenter in {@link com.arellomobile.mvp.PresenterStore}.

    + *

    Called when Moxy generate presenter tag for search Presenter in {@link PresenterStore}.

    *

    Requirements:

    *
      *
    • presenterClass parameter should be equals with presenter field type
      • diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/MvpViewState.java b/moxy/src/main/java/com/omegar/mvp/viewstate/MvpViewState.java similarity index 93% rename from moxy/src/main/java/com/arellomobile/mvp/viewstate/MvpViewState.java rename to moxy/src/main/java/com/omegar/mvp/viewstate/MvpViewState.java index 99bc644e..6888998e 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/MvpViewState.java +++ b/moxy/src/main/java/com/omegar/mvp/viewstate/MvpViewState.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.viewstate; +package com.omegar.mvp.viewstate; import java.util.Collections; import java.util.List; @@ -6,7 +6,8 @@ import java.util.Set; import java.util.WeakHashMap; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.strategy.StateStrategy; /** * Date: 15.12.2015 @@ -72,7 +73,7 @@ public void attachView(View view) { /** *

      Detach view from view state. After this moment view state save * commands via - * {@link com.arellomobile.mvp.viewstate.strategy.StateStrategy#beforeApply(List, ViewCommand)}.

      + * {@link StateStrategy#beforeApply(List, ViewCommand)}.

      * * @param view target mvp view to detach */ diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/ViewCommand.java b/moxy/src/main/java/com/omegar/mvp/viewstate/ViewCommand.java similarity index 79% rename from moxy/src/main/java/com/arellomobile/mvp/viewstate/ViewCommand.java rename to moxy/src/main/java/com/omegar/mvp/viewstate/ViewCommand.java index 8f4aeaf7..5c89bb65 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/ViewCommand.java +++ b/moxy/src/main/java/com/omegar/mvp/viewstate/ViewCommand.java @@ -1,7 +1,7 @@ -package com.arellomobile.mvp.viewstate; +package com.omegar.mvp.viewstate; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.strategy.StateStrategy; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.strategy.StateStrategy; /** * Date: 16-Dec-15 diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/ViewCommands.java b/moxy/src/main/java/com/omegar/mvp/viewstate/ViewCommands.java similarity index 91% rename from moxy/src/main/java/com/arellomobile/mvp/viewstate/ViewCommands.java rename to moxy/src/main/java/com/omegar/mvp/viewstate/ViewCommands.java index 044d0aad..d9a5ba8f 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/ViewCommands.java +++ b/moxy/src/main/java/com/omegar/mvp/viewstate/ViewCommands.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.viewstate; +package com.omegar.mvp.viewstate; import java.util.ArrayList; import java.util.HashMap; @@ -6,9 +6,9 @@ import java.util.Map; import java.util.Set; -import com.arellomobile.mvp.MoxyReflector; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.strategy.StateStrategy; +import com.omegar.mvp.MoxyReflector; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.strategy.StateStrategy; /** * Date: 17.12.2015 diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleStrategy.java b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/AddToEndSingleStrategy.java similarity index 86% rename from moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleStrategy.java rename to moxy/src/main/java/com/omegar/mvp/viewstate/strategy/AddToEndSingleStrategy.java index 41dc9951..ab5cde71 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndSingleStrategy.java +++ b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/AddToEndSingleStrategy.java @@ -1,10 +1,10 @@ -package com.arellomobile.mvp.viewstate.strategy; +package com.omegar.mvp.viewstate.strategy; import java.util.Iterator; import java.util.List; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.ViewCommand; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.ViewCommand; /** * Command will be added to end of commands queue. If commands queue contains same type command, then existing command will be removed. diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndStrategy.java b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/AddToEndStrategy.java similarity index 80% rename from moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndStrategy.java rename to moxy/src/main/java/com/omegar/mvp/viewstate/strategy/AddToEndStrategy.java index d6864832..3db53910 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/AddToEndStrategy.java +++ b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/AddToEndStrategy.java @@ -1,9 +1,9 @@ -package com.arellomobile.mvp.viewstate.strategy; +package com.omegar.mvp.viewstate.strategy; import java.util.List; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.ViewCommand; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.ViewCommand; /** * Command will be added to end of commands queue. diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/OneExecutionStateStrategy.java b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/OneExecutionStateStrategy.java similarity index 81% rename from moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/OneExecutionStateStrategy.java rename to moxy/src/main/java/com/omegar/mvp/viewstate/strategy/OneExecutionStateStrategy.java index 6f4235de..24c94162 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/OneExecutionStateStrategy.java +++ b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/OneExecutionStateStrategy.java @@ -1,9 +1,9 @@ -package com.arellomobile.mvp.viewstate.strategy; +package com.omegar.mvp.viewstate.strategy; import java.util.List; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.ViewCommand; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.ViewCommand; /** * Command will be saved in commands queue. And this command will be removed after first execution. diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/SingleStateStrategy.java b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/SingleStateStrategy.java similarity index 83% rename from moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/SingleStateStrategy.java rename to moxy/src/main/java/com/omegar/mvp/viewstate/strategy/SingleStateStrategy.java index f997e6cc..8f68b8eb 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/SingleStateStrategy.java +++ b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/SingleStateStrategy.java @@ -1,9 +1,9 @@ -package com.arellomobile.mvp.viewstate.strategy; +package com.omegar.mvp.viewstate.strategy; import java.util.List; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.ViewCommand; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.ViewCommand; /** * This strategy will clear current commands queue and then incoming command will be put in. diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/SkipStrategy.java b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/SkipStrategy.java similarity index 78% rename from moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/SkipStrategy.java rename to moxy/src/main/java/com/omegar/mvp/viewstate/strategy/SkipStrategy.java index a635b6c6..5b48cca9 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/SkipStrategy.java +++ b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/SkipStrategy.java @@ -1,9 +1,9 @@ -package com.arellomobile.mvp.viewstate.strategy; +package com.omegar.mvp.viewstate.strategy; import java.util.List; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.ViewCommand; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.ViewCommand; /** * Command will not be put in commands queue diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/StateStrategy.java b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/StateStrategy.java similarity index 78% rename from moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/StateStrategy.java rename to moxy/src/main/java/com/omegar/mvp/viewstate/strategy/StateStrategy.java index 1b9d6215..16fd3db7 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/StateStrategy.java +++ b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/StateStrategy.java @@ -1,7 +1,8 @@ -package com.arellomobile.mvp.viewstate.strategy; +package com.omegar.mvp.viewstate.strategy; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.ViewCommand; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.MvpViewState; +import com.omegar.mvp.viewstate.ViewCommand; import java.util.List; @@ -21,12 +22,12 @@ public interface StateStrategy { /** * Called immediately after - * {@link com.arellomobile.mvp.viewstate.MvpViewState} receive some + * {@link MvpViewState} receive some * command. Will not be called before re-apply to some other * {@link MvpView} * * @param currentState current state of - * {@link com.arellomobile.mvp.viewstate.MvpViewState}. Each {@link ViewCommand} + * {@link MvpViewState}. Each {@link ViewCommand} * contains self parameters. * @param incomingCommand command for apply to {@link MvpView} This * {@link ViewCommand} contains params of this command. @@ -39,7 +40,7 @@ public interface StateStrategy { * after re-apply to other views. * * @param currentState current state of - * {@link com.arellomobile.mvp.viewstate.MvpViewState}. Each {@link ViewCommand} + * {@link MvpViewState}. Each {@link ViewCommand} * contains self parameters. * @param incomingCommand applied command to {@link MvpView} This * {@link ViewCommand} contains params of this command. diff --git a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/StateStrategyType.java b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/StateStrategyType.java similarity index 90% rename from moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/StateStrategyType.java rename to moxy/src/main/java/com/omegar/mvp/viewstate/strategy/StateStrategyType.java index b9bab0eb..f073d8d8 100644 --- a/moxy/src/main/java/com/arellomobile/mvp/viewstate/strategy/StateStrategyType.java +++ b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/StateStrategyType.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.viewstate.strategy; +package com.omegar.mvp.viewstate.strategy; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/moxy/src/test/java/com/arellomobile/mvp/presenter/InjectViewStatePresenter2.java b/moxy/src/test/java/com/arellomobile/mvp/presenter/InjectViewStatePresenter2.java deleted file mode 100644 index 7b1d7792..00000000 --- a/moxy/src/test/java/com/arellomobile/mvp/presenter/InjectViewStatePresenter2.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.arellomobile.mvp.presenter; - -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.view.TestView2; - -/** - * Date: 15.03.2016 - * Time: 13:57 - * - * @author Savin Mikhail - */ -@InjectViewState -public class InjectViewStatePresenter2 extends MvpPresenter { -} diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenter2TestView.java b/moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenter2TestView.java deleted file mode 100644 index 52139b52..00000000 --- a/moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenter2TestView.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.arellomobile.mvp.view; - -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.InjectViewStatePresenter; -import com.arellomobile.mvp.presenter.PresenterType; - -public class DelegateLocalPresenter2TestView extends CounterTestView { - @InjectPresenter(type = PresenterType.LOCAL) - public InjectViewStatePresenter mInjectViewStatePresenter; -} \ No newline at end of file diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenterTestView.java b/moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenterTestView.java deleted file mode 100644 index f48ed4d5..00000000 --- a/moxy/src/test/java/com/arellomobile/mvp/view/DelegateLocalPresenterTestView.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.arellomobile.mvp.view; - -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.InjectViewStatePresenter; -import com.arellomobile.mvp.presenter.PresenterType; - -public class DelegateLocalPresenterTestView extends CounterTestView { - @InjectPresenter(type = PresenterType.LOCAL) - public InjectViewStatePresenter mInjectViewStatePresenter; -} \ No newline at end of file diff --git a/moxy/src/test/java/com/arellomobile/mvp/compiler/CompilerTest.java b/moxy/src/test/java/com/omegar/mvp/compiler/CompilerTest.java similarity index 99% rename from moxy/src/test/java/com/arellomobile/mvp/compiler/CompilerTest.java rename to moxy/src/test/java/com/omegar/mvp/compiler/CompilerTest.java index da70b1b4..5d74f934 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/compiler/CompilerTest.java +++ b/moxy/src/test/java/com/omegar/mvp/compiler/CompilerTest.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.compiler; +package com.omegar.mvp.compiler; import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; diff --git a/moxy/src/test/java/com/arellomobile/mvp/compiler/ErrorProcessor.java b/moxy/src/test/java/com/omegar/mvp/compiler/ErrorProcessor.java similarity index 97% rename from moxy/src/test/java/com/arellomobile/mvp/compiler/ErrorProcessor.java rename to moxy/src/test/java/com/omegar/mvp/compiler/ErrorProcessor.java index e194074d..08c1de84 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/compiler/ErrorProcessor.java +++ b/moxy/src/test/java/com/omegar/mvp/compiler/ErrorProcessor.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.compiler; +package com.omegar.mvp.compiler; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/moxy/src/test/java/com/arellomobile/mvp/compiler/ViewStateClassTest.java b/moxy/src/test/java/com/omegar/mvp/compiler/ViewStateClassTest.java similarity index 96% rename from moxy/src/test/java/com/arellomobile/mvp/compiler/ViewStateClassTest.java rename to moxy/src/test/java/com/omegar/mvp/compiler/ViewStateClassTest.java index 5436858c..152bae57 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/compiler/ViewStateClassTest.java +++ b/moxy/src/test/java/com/omegar/mvp/compiler/ViewStateClassTest.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.compiler; +package com.omegar.mvp.compiler; import java.io.IOException; import java.util.regex.Pattern; diff --git a/moxy/src/test/java/com/arellomobile/mvp/compiler/ViewStateProviderClassTest.java b/moxy/src/test/java/com/omegar/mvp/compiler/ViewStateProviderClassTest.java similarity index 94% rename from moxy/src/test/java/com/arellomobile/mvp/compiler/ViewStateProviderClassTest.java rename to moxy/src/test/java/com/omegar/mvp/compiler/ViewStateProviderClassTest.java index 48898b6d..9fb74235 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/compiler/ViewStateProviderClassTest.java +++ b/moxy/src/test/java/com/omegar/mvp/compiler/ViewStateProviderClassTest.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.compiler; +package com.omegar.mvp.compiler; import java.io.IOException; import java.util.regex.Pattern; diff --git a/moxy/src/test/java/com/arellomobile/mvp/inheritance_test/InheritanceTest.java b/moxy/src/test/java/com/omegar/mvp/inheritance_test/InheritanceTest.java similarity index 76% rename from moxy/src/test/java/com/arellomobile/mvp/inheritance_test/InheritanceTest.java rename to moxy/src/test/java/com/omegar/mvp/inheritance_test/InheritanceTest.java index 2d94bef7..664da7bd 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/inheritance_test/InheritanceTest.java +++ b/moxy/src/test/java/com/omegar/mvp/inheritance_test/InheritanceTest.java @@ -1,11 +1,11 @@ -package com.arellomobile.mvp.inheritance_test; +package com.omegar.mvp.inheritance_test; import android.os.Bundle; -import com.arellomobile.mvp.MvpDelegate; -import com.arellomobile.mvp.inheritance_test.resources.ChildViewWithoutInject; -import com.arellomobile.mvp.inheritance_test.resources.SuperViewWithInject; -import com.arellomobile.mvp.inheritance_test.resources.ViewWithoutInject; +import com.omegar.mvp.MvpDelegate; +import com.omegar.mvp.inheritance_test.resources.ChildViewWithoutInject; +import com.omegar.mvp.inheritance_test.resources.SuperViewWithInject; +import com.omegar.mvp.inheritance_test.resources.ViewWithoutInject; import org.junit.Assert; import org.junit.Test; diff --git a/moxy/src/test/java/com/arellomobile/mvp/inheritance_test/resources/ChildViewWithoutInject.java b/moxy/src/test/java/com/omegar/mvp/inheritance_test/resources/ChildViewWithoutInject.java similarity index 73% rename from moxy/src/test/java/com/arellomobile/mvp/inheritance_test/resources/ChildViewWithoutInject.java rename to moxy/src/test/java/com/omegar/mvp/inheritance_test/resources/ChildViewWithoutInject.java index c6d2a583..753f3422 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/inheritance_test/resources/ChildViewWithoutInject.java +++ b/moxy/src/test/java/com/omegar/mvp/inheritance_test/resources/ChildViewWithoutInject.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.inheritance_test.resources; +package com.omegar.mvp.inheritance_test.resources; /** * Date: 30.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/inheritance_test/resources/SuperViewWithInject.java b/moxy/src/test/java/com/omegar/mvp/inheritance_test/resources/SuperViewWithInject.java similarity index 64% rename from moxy/src/test/java/com/arellomobile/mvp/inheritance_test/resources/SuperViewWithInject.java rename to moxy/src/test/java/com/omegar/mvp/inheritance_test/resources/SuperViewWithInject.java index bdf04d57..9b91223e 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/inheritance_test/resources/SuperViewWithInject.java +++ b/moxy/src/test/java/com/omegar/mvp/inheritance_test/resources/SuperViewWithInject.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.inheritance_test.resources; +package com.omegar.mvp.inheritance_test.resources; -import com.arellomobile.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.InjectPresenter; /** * Date: 30.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/inheritance_test/resources/TestPresenter.java b/moxy/src/test/java/com/omegar/mvp/inheritance_test/resources/TestPresenter.java similarity index 62% rename from moxy/src/test/java/com/arellomobile/mvp/inheritance_test/resources/TestPresenter.java rename to moxy/src/test/java/com/omegar/mvp/inheritance_test/resources/TestPresenter.java index 806d6462..c68d4475 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/inheritance_test/resources/TestPresenter.java +++ b/moxy/src/test/java/com/omegar/mvp/inheritance_test/resources/TestPresenter.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.inheritance_test.resources; +package com.omegar.mvp.inheritance_test.resources; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.MvpPresenter; /** * Date: 29.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/memory_leak_test/resources/TestView.java b/moxy/src/test/java/com/omegar/mvp/inheritance_test/resources/TestView.java similarity index 55% rename from moxy/src/test/java/com/arellomobile/mvp/memory_leak_test/resources/TestView.java rename to moxy/src/test/java/com/omegar/mvp/inheritance_test/resources/TestView.java index 050b49e8..1513de2d 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/memory_leak_test/resources/TestView.java +++ b/moxy/src/test/java/com/omegar/mvp/inheritance_test/resources/TestView.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.memory_leak_test.resources; +package com.omegar.mvp.inheritance_test.resources; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; /** * Date: 29.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/inheritance_test/resources/ViewWithoutInject.java b/moxy/src/test/java/com/omegar/mvp/inheritance_test/resources/ViewWithoutInject.java similarity index 62% rename from moxy/src/test/java/com/arellomobile/mvp/inheritance_test/resources/ViewWithoutInject.java rename to moxy/src/test/java/com/omegar/mvp/inheritance_test/resources/ViewWithoutInject.java index f72090dd..791a8acd 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/inheritance_test/resources/ViewWithoutInject.java +++ b/moxy/src/test/java/com/omegar/mvp/inheritance_test/resources/ViewWithoutInject.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.inheritance_test.resources; +package com.omegar.mvp.inheritance_test.resources; -import com.arellomobile.mvp.MvpDelegate; +import com.omegar.mvp.MvpDelegate; /** * Date: 30.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/memory_leak_test/MemoryLeakTest.java b/moxy/src/test/java/com/omegar/mvp/memory_leak_test/MemoryLeakTest.java similarity index 89% rename from moxy/src/test/java/com/arellomobile/mvp/memory_leak_test/MemoryLeakTest.java rename to moxy/src/test/java/com/omegar/mvp/memory_leak_test/MemoryLeakTest.java index 0494b6b4..1b9e7d84 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/memory_leak_test/MemoryLeakTest.java +++ b/moxy/src/test/java/com/omegar/mvp/memory_leak_test/MemoryLeakTest.java @@ -1,12 +1,12 @@ -package com.arellomobile.mvp.memory_leak_test; +package com.omegar.mvp.memory_leak_test; import java.lang.ref.WeakReference; import java.util.concurrent.TimeUnit; import android.os.Bundle; -import com.arellomobile.mvp.MvpDelegate; -import com.arellomobile.mvp.memory_leak_test.resources.TestViewImplementation; +import com.omegar.mvp.MvpDelegate; +import com.omegar.mvp.memory_leak_test.resources.TestViewImplementation; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/moxy/src/test/java/com/arellomobile/mvp/memory_leak_test/resources/TestPresenter.java b/moxy/src/test/java/com/omegar/mvp/memory_leak_test/resources/TestPresenter.java similarity index 57% rename from moxy/src/test/java/com/arellomobile/mvp/memory_leak_test/resources/TestPresenter.java rename to moxy/src/test/java/com/omegar/mvp/memory_leak_test/resources/TestPresenter.java index 6e46dbb1..64310248 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/memory_leak_test/resources/TestPresenter.java +++ b/moxy/src/test/java/com/omegar/mvp/memory_leak_test/resources/TestPresenter.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.memory_leak_test.resources; +package com.omegar.mvp.memory_leak_test.resources; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.MvpPresenter; /** * Date: 29.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/inheritance_test/resources/TestView.java b/moxy/src/test/java/com/omegar/mvp/memory_leak_test/resources/TestView.java similarity index 55% rename from moxy/src/test/java/com/arellomobile/mvp/inheritance_test/resources/TestView.java rename to moxy/src/test/java/com/omegar/mvp/memory_leak_test/resources/TestView.java index 1a933847..09e7f4cc 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/inheritance_test/resources/TestView.java +++ b/moxy/src/test/java/com/omegar/mvp/memory_leak_test/resources/TestView.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.inheritance_test.resources; +package com.omegar.mvp.memory_leak_test.resources; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; /** * Date: 29.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/memory_leak_test/resources/TestViewImplementation.java b/moxy/src/test/java/com/omegar/mvp/memory_leak_test/resources/TestViewImplementation.java similarity index 60% rename from moxy/src/test/java/com/arellomobile/mvp/memory_leak_test/resources/TestViewImplementation.java rename to moxy/src/test/java/com/omegar/mvp/memory_leak_test/resources/TestViewImplementation.java index 82b6c7a7..41d9e515 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/memory_leak_test/resources/TestViewImplementation.java +++ b/moxy/src/test/java/com/omegar/mvp/memory_leak_test/resources/TestViewImplementation.java @@ -1,7 +1,7 @@ -package com.arellomobile.mvp.memory_leak_test.resources; +package com.omegar.mvp.memory_leak_test.resources; -import com.arellomobile.mvp.MvpDelegate; -import com.arellomobile.mvp.presenter.InjectPresenter; +import com.omegar.mvp.MvpDelegate; +import com.omegar.mvp.presenter.InjectPresenter; /** * Date: 29.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/presenter/InjectViewStatePositivePresenter.java b/moxy/src/test/java/com/omegar/mvp/presenter/InjectViewStatePositivePresenter.java similarity index 50% rename from moxy/src/test/java/com/arellomobile/mvp/presenter/InjectViewStatePositivePresenter.java rename to moxy/src/test/java/com/omegar/mvp/presenter/InjectViewStatePositivePresenter.java index a4f16464..75a1aa5b 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/presenter/InjectViewStatePositivePresenter.java +++ b/moxy/src/test/java/com/omegar/mvp/presenter/InjectViewStatePositivePresenter.java @@ -1,8 +1,8 @@ -package com.arellomobile.mvp.presenter; +package com.omegar.mvp.presenter; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.view.PositiveViewStateView; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.view.PositiveViewStateView; /** * Date: 15.03.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/presenter/InjectViewStatePresenter.java b/moxy/src/test/java/com/omegar/mvp/presenter/InjectViewStatePresenter.java similarity index 65% rename from moxy/src/test/java/com/arellomobile/mvp/presenter/InjectViewStatePresenter.java rename to moxy/src/test/java/com/omegar/mvp/presenter/InjectViewStatePresenter.java index a27193d6..69795ba5 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/presenter/InjectViewStatePresenter.java +++ b/moxy/src/test/java/com/omegar/mvp/presenter/InjectViewStatePresenter.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.presenter; +package com.omegar.mvp.presenter; -import com.arellomobile.mvp.InjectViewState; +import com.omegar.mvp.InjectViewState; /** * Date: 08.02.2016 diff --git a/moxy/src/test/java/com/omegar/mvp/presenter/InjectViewStatePresenter2.java b/moxy/src/test/java/com/omegar/mvp/presenter/InjectViewStatePresenter2.java new file mode 100644 index 00000000..2fbbd1d4 --- /dev/null +++ b/moxy/src/test/java/com/omegar/mvp/presenter/InjectViewStatePresenter2.java @@ -0,0 +1,15 @@ +package com.omegar.mvp.presenter; + +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.view.TestView2; + +/** + * Date: 15.03.2016 + * Time: 13:57 + * + * @author Savin Mikhail + */ +@InjectViewState +public class InjectViewStatePresenter2 extends MvpPresenter { +} diff --git a/moxy/src/test/java/com/arellomobile/mvp/presenter/NoViewStatePresenter.java b/moxy/src/test/java/com/omegar/mvp/presenter/NoViewStatePresenter.java similarity index 77% rename from moxy/src/test/java/com/arellomobile/mvp/presenter/NoViewStatePresenter.java rename to moxy/src/test/java/com/omegar/mvp/presenter/NoViewStatePresenter.java index 68323023..205e6e8a 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/presenter/NoViewStatePresenter.java +++ b/moxy/src/test/java/com/omegar/mvp/presenter/NoViewStatePresenter.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.presenter; +package com.omegar.mvp.presenter; /** * Date: 08.02.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/presenter/PositiveViewStateProviderPresenter.java b/moxy/src/test/java/com/omegar/mvp/presenter/PositiveViewStateProviderPresenter.java similarity index 50% rename from moxy/src/test/java/com/arellomobile/mvp/presenter/PositiveViewStateProviderPresenter.java rename to moxy/src/test/java/com/omegar/mvp/presenter/PositiveViewStateProviderPresenter.java index 26b4f58c..cc01f70d 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/presenter/PositiveViewStateProviderPresenter.java +++ b/moxy/src/test/java/com/omegar/mvp/presenter/PositiveViewStateProviderPresenter.java @@ -1,8 +1,8 @@ -package com.arellomobile.mvp.presenter; +package com.omegar.mvp.presenter; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.view.PositiveViewStateView; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.view.PositiveViewStateView; /** diff --git a/moxy/src/test/java/com/arellomobile/mvp/presenter/TestViewPresenter.java b/moxy/src/test/java/com/omegar/mvp/presenter/TestViewPresenter.java similarity index 61% rename from moxy/src/test/java/com/arellomobile/mvp/presenter/TestViewPresenter.java rename to moxy/src/test/java/com/omegar/mvp/presenter/TestViewPresenter.java index e592d9e2..87672779 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/presenter/TestViewPresenter.java +++ b/moxy/src/test/java/com/omegar/mvp/presenter/TestViewPresenter.java @@ -1,7 +1,7 @@ -package com.arellomobile.mvp.presenter; +package com.omegar.mvp.presenter; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.view.TestView; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.view.TestView; /** * Date: 10.02.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/ProvideMethodsTest.java b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/ProvideMethodsTest.java similarity index 80% rename from moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/ProvideMethodsTest.java rename to moxy/src/test/java/com/omegar/mvp/provide_methods_test/ProvideMethodsTest.java index 84f388af..7e91ca6c 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/ProvideMethodsTest.java +++ b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/ProvideMethodsTest.java @@ -1,12 +1,12 @@ -package com.arellomobile.mvp.provide_methods_test; +package com.omegar.mvp.provide_methods_test; import android.os.Bundle; -import com.arellomobile.mvp.MvpDelegate; -import com.arellomobile.mvp.provide_methods_test.resources.LocalProvidedView; -import com.arellomobile.mvp.provide_methods_test.resources.TwoLocalProvidedView; -import com.arellomobile.mvp.provide_methods_test.resources.TwoWeakWithSamePresenterIdView; -import com.arellomobile.mvp.provide_methods_test.resources.WeakProvidedView; +import com.omegar.mvp.MvpDelegate; +import com.omegar.mvp.provide_methods_test.resources.LocalProvidedView; +import com.omegar.mvp.provide_methods_test.resources.TwoLocalProvidedView; +import com.omegar.mvp.provide_methods_test.resources.TwoWeakWithSamePresenterIdView; +import com.omegar.mvp.provide_methods_test.resources.WeakProvidedView; import org.junit.Assert; import org.junit.Test; diff --git a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/LocalProvidedView.java b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/LocalProvidedView.java similarity index 67% rename from moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/LocalProvidedView.java rename to moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/LocalProvidedView.java index d1c441b1..f4edabbf 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/LocalProvidedView.java +++ b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/LocalProvidedView.java @@ -1,8 +1,8 @@ -package com.arellomobile.mvp.provide_methods_test.resources; +package com.omegar.mvp.provide_methods_test.resources; -import com.arellomobile.mvp.MvpDelegate; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.MvpDelegate; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.ProvidePresenter; /** * Date: 30.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/SuperView.java b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/SuperView.java similarity index 76% rename from moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/SuperView.java rename to moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/SuperView.java index d25d54d6..d86f5267 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/SuperView.java +++ b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/SuperView.java @@ -1,8 +1,8 @@ -package com.arellomobile.mvp.provide_methods_test.resources; +package com.omegar.mvp.provide_methods_test.resources; -import com.arellomobile.mvp.MvpDelegate; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.MvpDelegate; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.ProvidePresenter; /** * Date: 30.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TestPresenter.java b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/TestPresenter.java similarity index 56% rename from moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TestPresenter.java rename to moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/TestPresenter.java index 3ff2f8a9..596106e1 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TestPresenter.java +++ b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/TestPresenter.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.provide_methods_test.resources; +package com.omegar.mvp.provide_methods_test.resources; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.MvpPresenter; /** * Date: 30.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TestView.java b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/TestView.java similarity index 54% rename from moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TestView.java rename to moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/TestView.java index cea7a155..556a5f3e 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TestView.java +++ b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/TestView.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.provide_methods_test.resources; +package com.omegar.mvp.provide_methods_test.resources; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; /** * Date: 30.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoLocalProvidedView.java b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/TwoLocalProvidedView.java similarity index 65% rename from moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoLocalProvidedView.java rename to moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/TwoLocalProvidedView.java index 8550ff08..8faef35b 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoLocalProvidedView.java +++ b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/TwoLocalProvidedView.java @@ -1,8 +1,8 @@ -package com.arellomobile.mvp.provide_methods_test.resources; +package com.omegar.mvp.provide_methods_test.resources; -import com.arellomobile.mvp.MvpDelegate; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.MvpDelegate; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.ProvidePresenter; /** * Date: 30.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoWeakWithDiffPresenterIdView.java b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/TwoWeakWithDiffPresenterIdView.java similarity index 78% rename from moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoWeakWithDiffPresenterIdView.java rename to moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/TwoWeakWithDiffPresenterIdView.java index 354a59eb..4499f130 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoWeakWithDiffPresenterIdView.java +++ b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/TwoWeakWithDiffPresenterIdView.java @@ -1,10 +1,10 @@ -package com.arellomobile.mvp.provide_methods_test.resources; +package com.omegar.mvp.provide_methods_test.resources; -import com.arellomobile.mvp.MvpDelegate; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.PresenterType; -import com.arellomobile.mvp.presenter.ProvidePresenter; -import com.arellomobile.mvp.presenter.ProvidePresenterTag; +import com.omegar.mvp.MvpDelegate; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.presenter.ProvidePresenterTag; /** * Date: 30.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoWeakWithSamePresenterIdView.java b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/TwoWeakWithSamePresenterIdView.java similarity index 70% rename from moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoWeakWithSamePresenterIdView.java rename to moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/TwoWeakWithSamePresenterIdView.java index db1d8682..7c13d833 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/TwoWeakWithSamePresenterIdView.java +++ b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/TwoWeakWithSamePresenterIdView.java @@ -1,10 +1,10 @@ -package com.arellomobile.mvp.provide_methods_test.resources; +package com.omegar.mvp.provide_methods_test.resources; -import com.arellomobile.mvp.MvpDelegate; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.PresenterType; -import com.arellomobile.mvp.presenter.ProvidePresenter; -import com.arellomobile.mvp.presenter.ProvidePresenterTag; +import com.omegar.mvp.MvpDelegate; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.presenter.ProvidePresenterTag; /** * Date: 30.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/WeakProvidedView.java b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/WeakProvidedView.java similarity index 66% rename from moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/WeakProvidedView.java rename to moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/WeakProvidedView.java index d4877256..a76ab3f4 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/provide_methods_test/resources/WeakProvidedView.java +++ b/moxy/src/test/java/com/omegar/mvp/provide_methods_test/resources/WeakProvidedView.java @@ -1,9 +1,9 @@ -package com.arellomobile.mvp.provide_methods_test.resources; +package com.omegar.mvp.provide_methods_test.resources; -import com.arellomobile.mvp.MvpDelegate; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.PresenterType; -import com.arellomobile.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.MvpDelegate; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.ProvidePresenter; /** * Date: 30.12.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/tests/LocalPresenterTest.java b/moxy/src/test/java/com/omegar/mvp/tests/LocalPresenterTest.java similarity index 91% rename from moxy/src/test/java/com/arellomobile/mvp/tests/LocalPresenterTest.java rename to moxy/src/test/java/com/omegar/mvp/tests/LocalPresenterTest.java index 70d14a96..31f0d7c6 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/tests/LocalPresenterTest.java +++ b/moxy/src/test/java/com/omegar/mvp/tests/LocalPresenterTest.java @@ -1,15 +1,15 @@ -package com.arellomobile.mvp.tests; +package com.omegar.mvp.tests; import java.lang.reflect.Field; import android.os.Bundle; -import com.arellomobile.mvp.MvpDelegate; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.presenter.InjectViewStatePresenter; -import com.arellomobile.mvp.presenter.NoViewStatePresenter; -import com.arellomobile.mvp.view.DelegateLocalPresenterTestView; -import com.arellomobile.mvp.view.TestView; +import com.omegar.mvp.MvpDelegate; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.presenter.InjectViewStatePresenter; +import com.omegar.mvp.presenter.NoViewStatePresenter; +import com.omegar.mvp.view.DelegateLocalPresenterTestView; +import com.omegar.mvp.view.TestView; import org.junit.After; import org.junit.Before; diff --git a/moxy/src/test/java/com/arellomobile/mvp/tests/MvpDelegateTest.java b/moxy/src/test/java/com/omegar/mvp/tests/MvpDelegateTest.java similarity index 82% rename from moxy/src/test/java/com/arellomobile/mvp/tests/MvpDelegateTest.java rename to moxy/src/test/java/com/omegar/mvp/tests/MvpDelegateTest.java index 1744e852..3c8c52b4 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/tests/MvpDelegateTest.java +++ b/moxy/src/test/java/com/omegar/mvp/tests/MvpDelegateTest.java @@ -1,10 +1,10 @@ -package com.arellomobile.mvp.tests; +package com.omegar.mvp.tests; import android.os.Bundle; -import com.arellomobile.mvp.MvpDelegate; -import com.arellomobile.mvp.view.DelegateLocalPresenterTestView; -import com.arellomobile.mvp.view.TestView; +import com.omegar.mvp.MvpDelegate; +import com.omegar.mvp.view.DelegateLocalPresenterTestView; +import com.omegar.mvp.view.TestView; import org.junit.After; import org.junit.Before; diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/ChildView.java b/moxy/src/test/java/com/omegar/mvp/view/ChildView.java similarity index 55% rename from moxy/src/test/java/com/arellomobile/mvp/view/ChildView.java rename to moxy/src/test/java/com/omegar/mvp/view/ChildView.java index 64d1b570..acc84988 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/view/ChildView.java +++ b/moxy/src/test/java/com/omegar/mvp/view/ChildView.java @@ -1,8 +1,8 @@ -package com.arellomobile.mvp.view; +package com.omegar.mvp.view; -import com.arellomobile.mvp.GenerateViewState; -import com.arellomobile.mvp.viewstate.strategy.SkipStrategy; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.GenerateViewState; +import com.omegar.mvp.viewstate.strategy.SkipStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; /** * Date: 29.02.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/CounterTestView.java b/moxy/src/test/java/com/omegar/mvp/view/CounterTestView.java similarity index 93% rename from moxy/src/test/java/com/arellomobile/mvp/view/CounterTestView.java rename to moxy/src/test/java/com/omegar/mvp/view/CounterTestView.java index 049b4933..4b6e68f4 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/view/CounterTestView.java +++ b/moxy/src/test/java/com/omegar/mvp/view/CounterTestView.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.view; +package com.omegar.mvp.view; import java.util.HashMap; import java.util.Map; diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/DelegateGlobalTestView.java b/moxy/src/test/java/com/omegar/mvp/view/DelegateGlobalTestView.java similarity index 57% rename from moxy/src/test/java/com/arellomobile/mvp/view/DelegateGlobalTestView.java rename to moxy/src/test/java/com/omegar/mvp/view/DelegateGlobalTestView.java index 1c4d3d69..62f10473 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/view/DelegateGlobalTestView.java +++ b/moxy/src/test/java/com/omegar/mvp/view/DelegateGlobalTestView.java @@ -1,8 +1,8 @@ -package com.arellomobile.mvp.view; +package com.omegar.mvp.view; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.InjectViewStatePresenter; -import com.arellomobile.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.InjectViewStatePresenter; +import com.omegar.mvp.presenter.PresenterType; public class DelegateGlobalTestView extends CounterTestView { public static final String TEST_GLOBAL_PRESENTER = "TestGlobalPresenter"; diff --git a/moxy/src/test/java/com/omegar/mvp/view/DelegateLocalPresenter2TestView.java b/moxy/src/test/java/com/omegar/mvp/view/DelegateLocalPresenter2TestView.java new file mode 100644 index 00000000..55e0c8ea --- /dev/null +++ b/moxy/src/test/java/com/omegar/mvp/view/DelegateLocalPresenter2TestView.java @@ -0,0 +1,10 @@ +package com.omegar.mvp.view; + +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.InjectViewStatePresenter; +import com.omegar.mvp.presenter.PresenterType; + +public class DelegateLocalPresenter2TestView extends CounterTestView { + @InjectPresenter(type = PresenterType.LOCAL) + public InjectViewStatePresenter mInjectViewStatePresenter; +} \ No newline at end of file diff --git a/moxy/src/test/java/com/omegar/mvp/view/DelegateLocalPresenterTestView.java b/moxy/src/test/java/com/omegar/mvp/view/DelegateLocalPresenterTestView.java new file mode 100644 index 00000000..76d80afe --- /dev/null +++ b/moxy/src/test/java/com/omegar/mvp/view/DelegateLocalPresenterTestView.java @@ -0,0 +1,10 @@ +package com.omegar.mvp.view; + +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.InjectViewStatePresenter; +import com.omegar.mvp.presenter.PresenterType; + +public class DelegateLocalPresenterTestView extends CounterTestView { + @InjectPresenter(type = PresenterType.LOCAL) + public InjectViewStatePresenter mInjectViewStatePresenter; +} \ No newline at end of file diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/ParentView.java b/moxy/src/test/java/com/omegar/mvp/view/ParentView.java similarity index 57% rename from moxy/src/test/java/com/arellomobile/mvp/view/ParentView.java rename to moxy/src/test/java/com/omegar/mvp/view/ParentView.java index da71d5f7..a70ac0ab 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/view/ParentView.java +++ b/moxy/src/test/java/com/omegar/mvp/view/ParentView.java @@ -1,9 +1,9 @@ -package com.arellomobile.mvp.view; +package com.omegar.mvp.view; -import com.arellomobile.mvp.GenerateViewState; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.GenerateViewState; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; /** * Date: 29.02.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/PositiveViewStateView.java b/moxy/src/test/java/com/omegar/mvp/view/PositiveViewStateView.java similarity index 67% rename from moxy/src/test/java/com/arellomobile/mvp/view/PositiveViewStateView.java rename to moxy/src/test/java/com/omegar/mvp/view/PositiveViewStateView.java index 977bd670..7a4640a0 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/view/PositiveViewStateView.java +++ b/moxy/src/test/java/com/omegar/mvp/view/PositiveViewStateView.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.view; +package com.omegar.mvp.view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; /** * Date: 26.02.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/SimpleInterface.java b/moxy/src/test/java/com/omegar/mvp/view/SimpleInterface.java similarity index 79% rename from moxy/src/test/java/com/arellomobile/mvp/view/SimpleInterface.java rename to moxy/src/test/java/com/omegar/mvp/view/SimpleInterface.java index 7897aec2..d0d7ef3b 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/view/SimpleInterface.java +++ b/moxy/src/test/java/com/omegar/mvp/view/SimpleInterface.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.view; +package com.omegar.mvp.view; /** * Date: 29.02.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/TestView.java b/moxy/src/test/java/com/omegar/mvp/view/TestView.java similarity index 65% rename from moxy/src/test/java/com/arellomobile/mvp/view/TestView.java rename to moxy/src/test/java/com/omegar/mvp/view/TestView.java index bdd65b11..b34be71a 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/view/TestView.java +++ b/moxy/src/test/java/com/omegar/mvp/view/TestView.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.view; +package com.omegar.mvp.view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; /** * Date: 08.02.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/TestView2.java b/moxy/src/test/java/com/omegar/mvp/view/TestView2.java similarity index 67% rename from moxy/src/test/java/com/arellomobile/mvp/view/TestView2.java rename to moxy/src/test/java/com/omegar/mvp/view/TestView2.java index d0d62467..b9a8b727 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/view/TestView2.java +++ b/moxy/src/test/java/com/omegar/mvp/view/TestView2.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.view; +package com.omegar.mvp.view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; /** * Date: 15.03.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/TestViewChild.java b/moxy/src/test/java/com/omegar/mvp/view/TestViewChild.java similarity index 67% rename from moxy/src/test/java/com/arellomobile/mvp/view/TestViewChild.java rename to moxy/src/test/java/com/omegar/mvp/view/TestViewChild.java index 9e48576c..ea6759e6 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/view/TestViewChild.java +++ b/moxy/src/test/java/com/omegar/mvp/view/TestViewChild.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.view; +package com.omegar.mvp.view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; /** * Date: 04.03.2016 diff --git a/moxy/src/test/java/com/arellomobile/mvp/view/TestViewChild2.java b/moxy/src/test/java/com/omegar/mvp/view/TestViewChild2.java similarity index 68% rename from moxy/src/test/java/com/arellomobile/mvp/view/TestViewChild2.java rename to moxy/src/test/java/com/omegar/mvp/view/TestViewChild2.java index 162a7767..2cd38475 100644 --- a/moxy/src/test/java/com/arellomobile/mvp/view/TestViewChild2.java +++ b/moxy/src/test/java/com/omegar/mvp/view/TestViewChild2.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.view; +package com.omegar.mvp.view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; /** * Date: 04.03.2016 diff --git a/moxy/src/test/resources/presenter/InjectViewStateForClassPresenter.java b/moxy/src/test/resources/presenter/InjectViewStateForClassPresenter.java index 5ebaafa8..733d976d 100644 --- a/moxy/src/test/resources/presenter/InjectViewStateForClassPresenter.java +++ b/moxy/src/test/resources/presenter/InjectViewStateForClassPresenter.java @@ -1,8 +1,8 @@ package presenter; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.view.CounterTestView; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.view.CounterTestView; /** * Date: 15.03.2016 diff --git a/moxy/src/test/resources/presenter/InjectViewStateForGenericPresenter.java b/moxy/src/test/resources/presenter/InjectViewStateForGenericPresenter.java index 9237e665..54cd9298 100644 --- a/moxy/src/test/resources/presenter/InjectViewStateForGenericPresenter.java +++ b/moxy/src/test/resources/presenter/InjectViewStateForGenericPresenter.java @@ -1,8 +1,8 @@ package presenter; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.view.CounterTestView; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.view.CounterTestView; /** * Date: 15.03.2016 diff --git a/moxy/src/test/resources/presenter/InjectViewStateForGenericViewPresenter.java b/moxy/src/test/resources/presenter/InjectViewStateForGenericViewPresenter.java index 6a088565..cc105c42 100644 --- a/moxy/src/test/resources/presenter/InjectViewStateForGenericViewPresenter.java +++ b/moxy/src/test/resources/presenter/InjectViewStateForGenericViewPresenter.java @@ -1,9 +1,7 @@ package view; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; - -import view.ViewStateForGenericView; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; /** * Date: 15.03.2016 diff --git a/moxy/src/test/resources/presenter/PositiveParamsViewPresenter.java b/moxy/src/test/resources/presenter/PositiveParamsViewPresenter.java index b08e946a..af928248 100644 --- a/moxy/src/test/resources/presenter/PositiveParamsViewPresenter.java +++ b/moxy/src/test/resources/presenter/PositiveParamsViewPresenter.java @@ -1,7 +1,7 @@ package presenter; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.MvpView; /** * Date: 10.02.2016 diff --git a/moxy/src/test/resources/presenter/PositiveViewStateProviderForNotPresenter.java b/moxy/src/test/resources/presenter/PositiveViewStateProviderForNotPresenter.java index e35298ca..d0ceddf5 100644 --- a/moxy/src/test/resources/presenter/PositiveViewStateProviderForNotPresenter.java +++ b/moxy/src/test/resources/presenter/PositiveViewStateProviderForNotPresenter.java @@ -1,9 +1,6 @@ package presenter; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; - -import view.PositiveViewStateView; +import com.omegar.mvp.InjectViewState; /** * Date: 26.02.2016 diff --git a/moxy/src/test/resources/presenter/PositiveViewStateProviderPresenter.java b/moxy/src/test/resources/presenter/PositiveViewStateProviderPresenter.java index f82b191f..149c81d6 100644 --- a/moxy/src/test/resources/presenter/PositiveViewStateProviderPresenter.java +++ b/moxy/src/test/resources/presenter/PositiveViewStateProviderPresenter.java @@ -1,7 +1,7 @@ package presenter; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; import view.PositiveViewStateView; diff --git a/moxy/src/test/resources/presenter/PresenterWithoutEmptyConstructor.java b/moxy/src/test/resources/presenter/PresenterWithoutEmptyConstructor.java index 6f2cd48e..e56f3c6d 100644 --- a/moxy/src/test/resources/presenter/PresenterWithoutEmptyConstructor.java +++ b/moxy/src/test/resources/presenter/PresenterWithoutEmptyConstructor.java @@ -1,7 +1,7 @@ package presenter; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.MvpView; /** * Date: 25.02.2016 diff --git a/moxy/src/test/resources/presenter/ViewStateChildWithIncorrectStrategyClassPresenter.java b/moxy/src/test/resources/presenter/ViewStateChildWithIncorrectStrategyClassPresenter.java index 70c85e82..fd236270 100644 --- a/moxy/src/test/resources/presenter/ViewStateChildWithIncorrectStrategyClassPresenter.java +++ b/moxy/src/test/resources/presenter/ViewStateChildWithIncorrectStrategyClassPresenter.java @@ -1,7 +1,7 @@ package presenter; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; import view.ViewStateChildWithIncorrectStrategyClassView; diff --git a/moxy/src/test/resources/presenter/ViewStateProviderForViewWithoutGenerateViewAnnotationPresenter.java b/moxy/src/test/resources/presenter/ViewStateProviderForViewWithoutGenerateViewAnnotationPresenter.java index 62a777a4..1f7bff82 100644 --- a/moxy/src/test/resources/presenter/ViewStateProviderForViewWithoutGenerateViewAnnotationPresenter.java +++ b/moxy/src/test/resources/presenter/ViewStateProviderForViewWithoutGenerateViewAnnotationPresenter.java @@ -1,7 +1,7 @@ package presenter; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; import view.WithoutGenerateViewAnnotationView; diff --git a/moxy/src/test/resources/presenter/WithViewGenericPresenter.java b/moxy/src/test/resources/presenter/WithViewGenericPresenter.java index 4e6f62bb..fb61f102 100644 --- a/moxy/src/test/resources/presenter/WithViewGenericPresenter.java +++ b/moxy/src/test/resources/presenter/WithViewGenericPresenter.java @@ -1,12 +1,6 @@ package presenter; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.view.CounterTestView; -import com.arellomobile.mvp.view.TestView; -import com.arellomobile.mvp.view.TestViewChild; - -import view.PositiveParamsView; +import com.omegar.mvp.view.CounterTestView; /** * Date: 04.03.2016 diff --git a/moxy/src/test/resources/presenter/WithViewGenericPresenter2.java b/moxy/src/test/resources/presenter/WithViewGenericPresenter2.java index 67f04e2c..2fe8903a 100644 --- a/moxy/src/test/resources/presenter/WithViewGenericPresenter2.java +++ b/moxy/src/test/resources/presenter/WithViewGenericPresenter2.java @@ -1,12 +1,8 @@ package presenter; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.view.CounterTestView; -import com.arellomobile.mvp.view.TestView; -import com.arellomobile.mvp.view.TestViewChild; - -import view.PositiveParamsView; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.view.CounterTestView; +import com.omegar.mvp.view.TestView; /** * Date: 04.03.2016 diff --git a/moxy/src/test/resources/view/EmptyParamsView.java b/moxy/src/test/resources/view/EmptyParamsView.java index 24d69826..084ad4b5 100644 --- a/moxy/src/test/resources/view/EmptyParamsView.java +++ b/moxy/src/test/resources/view/EmptyParamsView.java @@ -1,11 +1,10 @@ package com.arellomobile.mvp.compiler.view; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.MvpView; import com.arellomobile.mvp.factory.MockPresenterFactory; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.InjectViewStatePresenter; -import com.arellomobile.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.PresenterType; import params.EmptyParams; diff --git a/moxy/src/test/resources/view/IncorrectCountOfParametersParamsView.java b/moxy/src/test/resources/view/IncorrectCountOfParametersParamsView.java index 2da8e0d9..8e663f00 100644 --- a/moxy/src/test/resources/view/IncorrectCountOfParametersParamsView.java +++ b/moxy/src/test/resources/view/IncorrectCountOfParametersParamsView.java @@ -1,13 +1,12 @@ package view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; import com.arellomobile.mvp.factory.MockPresenterFactory; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.InjectViewStatePresenter; -import com.arellomobile.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.InjectViewStatePresenter; +import com.omegar.mvp.presenter.PresenterType; import params.IncorrectCountOfParametersParams; -import params.IncorrectParametersParams; /** * Date: 24.02.2016 diff --git a/moxy/src/test/resources/view/IncorrectParametersParamsView.java b/moxy/src/test/resources/view/IncorrectParametersParamsView.java index e741c8ef..50f4ca9b 100644 --- a/moxy/src/test/resources/view/IncorrectParametersParamsView.java +++ b/moxy/src/test/resources/view/IncorrectParametersParamsView.java @@ -1,10 +1,10 @@ package view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; import com.arellomobile.mvp.factory.MockPresenterFactory; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.InjectViewStatePresenter; -import com.arellomobile.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.InjectViewStatePresenter; +import com.omegar.mvp.presenter.PresenterType; import params.IncorrectParametersParams; diff --git a/moxy/src/test/resources/view/InjectPresenterAnnotationInsideNotMvpViewClass.java b/moxy/src/test/resources/view/InjectPresenterAnnotationInsideNotMvpViewClass.java index 206e71d7..a0830946 100644 --- a/moxy/src/test/resources/view/InjectPresenterAnnotationInsideNotMvpViewClass.java +++ b/moxy/src/test/resources/view/InjectPresenterAnnotationInsideNotMvpViewClass.java @@ -1,8 +1,8 @@ package view; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.presenter.InjectPresenter; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.presenter.InjectPresenter; /** * Date: 25.02.2016 diff --git a/moxy/src/test/resources/view/InjectPresenterTypeBehaviorView.java b/moxy/src/test/resources/view/InjectPresenterTypeBehaviorView.java index d477c88a..810e5778 100644 --- a/moxy/src/test/resources/view/InjectPresenterTypeBehaviorView.java +++ b/moxy/src/test/resources/view/InjectPresenterTypeBehaviorView.java @@ -1,9 +1,9 @@ package view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; import com.arellomobile.mvp.factory.MockPresenterFactory; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.PresenterType; import presenter.PositiveParamsViewPresenter; diff --git a/moxy/src/test/resources/view/InjectPresenterWithGenericView.java b/moxy/src/test/resources/view/InjectPresenterWithGenericView.java index 291f0cbf..8ba73f01 100644 --- a/moxy/src/test/resources/view/InjectPresenterWithGenericView.java +++ b/moxy/src/test/resources/view/InjectPresenterWithGenericView.java @@ -1,10 +1,7 @@ package view; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.view.CounterTestView; -import com.arellomobile.mvp.view.TestView; -import com.arellomobile.mvp.view.TestViewChild2; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.view.CounterTestView; import presenter.WithViewGenericPresenter; diff --git a/moxy/src/test/resources/view/InjectPresenterWithGenericViewIncorrect.java b/moxy/src/test/resources/view/InjectPresenterWithGenericViewIncorrect.java index 3d4dbc70..33872e12 100644 --- a/moxy/src/test/resources/view/InjectPresenterWithGenericViewIncorrect.java +++ b/moxy/src/test/resources/view/InjectPresenterWithGenericViewIncorrect.java @@ -1,9 +1,9 @@ package view; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.view.CounterTestView; -import com.arellomobile.mvp.view.TestViewChild2; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.view.CounterTestView; +import com.omegar.mvp.view.TestViewChild2; import presenter.WithViewGenericPresenter; diff --git a/moxy/src/test/resources/view/InjectPresenterWithIncorrectParamsView.java b/moxy/src/test/resources/view/InjectPresenterWithIncorrectParamsView.java index 00599aec..b59f9e12 100644 --- a/moxy/src/test/resources/view/InjectPresenterWithIncorrectParamsView.java +++ b/moxy/src/test/resources/view/InjectPresenterWithIncorrectParamsView.java @@ -1,10 +1,10 @@ package view; import com.arellomobile.mvp.factory.MockPresenterFactory2; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.PresenterType; -import com.arellomobile.mvp.presenter.TestViewPresenter; -import com.arellomobile.mvp.view.TestView; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.TestViewPresenter; +import com.omegar.mvp.view.TestView; import params.Params1; diff --git a/moxy/src/test/resources/view/InjectPresenterWithIncorrectViewView.java b/moxy/src/test/resources/view/InjectPresenterWithIncorrectViewView.java index 37215f94..524e0293 100644 --- a/moxy/src/test/resources/view/InjectPresenterWithIncorrectViewView.java +++ b/moxy/src/test/resources/view/InjectPresenterWithIncorrectViewView.java @@ -1,8 +1,8 @@ package view; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.TestViewPresenter; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.TestViewPresenter; /** * Date: 25.02.2016 diff --git a/moxy/src/test/resources/view/InjectPresenterWithoutEmptyConstructorView.java b/moxy/src/test/resources/view/InjectPresenterWithoutEmptyConstructorView.java index ede70cde..20e23e1d 100644 --- a/moxy/src/test/resources/view/InjectPresenterWithoutEmptyConstructorView.java +++ b/moxy/src/test/resources/view/InjectPresenterWithoutEmptyConstructorView.java @@ -1,7 +1,7 @@ package view; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.presenter.InjectPresenter; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.presenter.InjectPresenter; import presenter.PresenterWithoutEmptyConstructor; diff --git a/moxy/src/test/resources/view/ObjectInjectPresenterView.java b/moxy/src/test/resources/view/ObjectInjectPresenterView.java index 3bb7158c..3a93b5e8 100644 --- a/moxy/src/test/resources/view/ObjectInjectPresenterView.java +++ b/moxy/src/test/resources/view/ObjectInjectPresenterView.java @@ -1,7 +1,7 @@ package view; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.presenter.InjectPresenter; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.presenter.InjectPresenter; /** * Date: 25.02.2016 diff --git a/moxy/src/test/resources/view/PositiveParamsView.java b/moxy/src/test/resources/view/PositiveParamsView.java index 3e5b2128..6385f79b 100644 --- a/moxy/src/test/resources/view/PositiveParamsView.java +++ b/moxy/src/test/resources/view/PositiveParamsView.java @@ -1,10 +1,9 @@ package view; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; import com.arellomobile.mvp.factory.MockPresenterFactory; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.PresenterType; import params.Params1; import presenter.PositiveParamsViewPresenter; diff --git a/moxy/src/test/resources/view/PositiveViewStateView.java b/moxy/src/test/resources/view/PositiveViewStateView.java index 0d626b30..4dc4a73b 100644 --- a/moxy/src/test/resources/view/PositiveViewStateView.java +++ b/moxy/src/test/resources/view/PositiveViewStateView.java @@ -1,6 +1,6 @@ package view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; /** * Date: 26.02.2016 diff --git a/moxy/src/test/resources/view/SeveralMethodParamsView.java b/moxy/src/test/resources/view/SeveralMethodParamsView.java index 17e1be2f..25c3d5c2 100644 --- a/moxy/src/test/resources/view/SeveralMethodParamsView.java +++ b/moxy/src/test/resources/view/SeveralMethodParamsView.java @@ -1,10 +1,10 @@ package view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; import com.arellomobile.mvp.factory.MockPresenterFactory; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.InjectViewStatePresenter; -import com.arellomobile.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.InjectViewStatePresenter; +import com.omegar.mvp.presenter.PresenterType; public class SeveralMethodParamsView implements MvpView, params.SeveralMethodParams { @InjectPresenter(factory = MockPresenterFactory.class, presenterId = "Test", type = PresenterType.LOCAL) diff --git a/moxy/src/test/resources/view/SeveralParamsView.java b/moxy/src/test/resources/view/SeveralParamsView.java index 817d5e12..38cef879 100644 --- a/moxy/src/test/resources/view/SeveralParamsView.java +++ b/moxy/src/test/resources/view/SeveralParamsView.java @@ -1,6 +1,6 @@ package view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; import com.arellomobile.mvp.params.MockParams; import com.arellomobile.mvp.params.MockParams2; diff --git a/moxy/src/test/resources/view/ViewStateChildWithIncorrectStrategyClassView.java b/moxy/src/test/resources/view/ViewStateChildWithIncorrectStrategyClassView.java index bbc05d57..d1c15731 100644 --- a/moxy/src/test/resources/view/ViewStateChildWithIncorrectStrategyClassView.java +++ b/moxy/src/test/resources/view/ViewStateChildWithIncorrectStrategyClassView.java @@ -1,9 +1,5 @@ package view; -import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; -import com.arellomobile.mvp.viewstate.strategy.SingleStateStrategy; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; - /** * Date: 26.02.2016 * Time: 12:09 diff --git a/moxy/src/test/resources/view/ViewStateChildWithIncorrectStrategyTagView.java b/moxy/src/test/resources/view/ViewStateChildWithIncorrectStrategyTagView.java index 80dcc407..b72fdd7c 100644 --- a/moxy/src/test/resources/view/ViewStateChildWithIncorrectStrategyTagView.java +++ b/moxy/src/test/resources/view/ViewStateChildWithIncorrectStrategyTagView.java @@ -1,9 +1,6 @@ package view; -import com.arellomobile.mvp.GenerateViewState; -import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; -import com.arellomobile.mvp.viewstate.strategy.SingleStateStrategy; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.GenerateViewState; /** * Date: 26.02.2016 diff --git a/moxy/src/test/resources/view/ViewStateForClassView.java b/moxy/src/test/resources/view/ViewStateForClassView.java index 906275d2..d260098a 100644 --- a/moxy/src/test/resources/view/ViewStateForClassView.java +++ b/moxy/src/test/resources/view/ViewStateForClassView.java @@ -1,7 +1,7 @@ package view; -import com.arellomobile.mvp.GenerateViewState; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.GenerateViewState; +import com.omegar.mvp.MvpView; /** * Date: 26.02.2016 diff --git a/moxy/src/test/resources/view/ViewStateForGenericView.java b/moxy/src/test/resources/view/ViewStateForGenericView.java index 2c27ebaa..c807851a 100644 --- a/moxy/src/test/resources/view/ViewStateForGenericView.java +++ b/moxy/src/test/resources/view/ViewStateForGenericView.java @@ -1,7 +1,6 @@ package view; -import com.arellomobile.mvp.GenerateViewState; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; /** * Date: 26.02.2016 diff --git a/moxy/src/test/resources/view/ViewStateForNotView.java b/moxy/src/test/resources/view/ViewStateForNotView.java index c57b572d..0fbdf729 100644 --- a/moxy/src/test/resources/view/ViewStateForNotView.java +++ b/moxy/src/test/resources/view/ViewStateForNotView.java @@ -1,6 +1,6 @@ package view; -import com.arellomobile.mvp.GenerateViewState; +import com.omegar.mvp.GenerateViewState; /** * Date: 26.02.2016 diff --git a/moxy/src/test/resources/view/ViewStateParent2View.java b/moxy/src/test/resources/view/ViewStateParent2View.java index 40b79b04..d7d9e8cf 100644 --- a/moxy/src/test/resources/view/ViewStateParent2View.java +++ b/moxy/src/test/resources/view/ViewStateParent2View.java @@ -1,8 +1,8 @@ package view; -import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; -import com.arellomobile.mvp.viewstate.strategy.SingleStateStrategy; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.SingleStateStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; /** * Date: 26.02.2016 diff --git a/moxy/src/test/resources/view/ViewStateParentStrategyClassView.java b/moxy/src/test/resources/view/ViewStateParentStrategyClassView.java index 888444ba..0b438e0f 100644 --- a/moxy/src/test/resources/view/ViewStateParentStrategyClassView.java +++ b/moxy/src/test/resources/view/ViewStateParentStrategyClassView.java @@ -1,8 +1,8 @@ package view; -import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; -import com.arellomobile.mvp.viewstate.strategy.SingleStateStrategy; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.SingleStateStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; /** * Date: 26.02.2016 diff --git a/moxy/src/test/resources/view/ViewStateParentStrategyTagView.java b/moxy/src/test/resources/view/ViewStateParentStrategyTagView.java index 41cca19d..76fe3c5f 100644 --- a/moxy/src/test/resources/view/ViewStateParentStrategyTagView.java +++ b/moxy/src/test/resources/view/ViewStateParentStrategyTagView.java @@ -1,8 +1,7 @@ package view; -import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; -import com.arellomobile.mvp.viewstate.strategy.SingleStateStrategy; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; /** * Date: 26.02.2016 diff --git a/moxy/src/test/resources/view/ViewStateParentView.java b/moxy/src/test/resources/view/ViewStateParentView.java index 46371fb7..1efb4a57 100644 --- a/moxy/src/test/resources/view/ViewStateParentView.java +++ b/moxy/src/test/resources/view/ViewStateParentView.java @@ -1,8 +1,8 @@ package view; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; /** * Date: 26.02.2016 diff --git a/moxy/src/test/resources/view/WithoutGenerateViewAnnotationView.java b/moxy/src/test/resources/view/WithoutGenerateViewAnnotationView.java index dd101a8f..95add633 100644 --- a/moxy/src/test/resources/view/WithoutGenerateViewAnnotationView.java +++ b/moxy/src/test/resources/view/WithoutGenerateViewAnnotationView.java @@ -1,6 +1,6 @@ package view; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; /** * Date: 26.02.2016 diff --git a/moxy/stub-reflector/src/main/java/com/arellomobile/mvp/MoxyReflector.java b/moxy/stub-reflector/src/main/java/com/omegar/mvp/MoxyReflector.java similarity index 96% rename from moxy/stub-reflector/src/main/java/com/arellomobile/mvp/MoxyReflector.java rename to moxy/stub-reflector/src/main/java/com/omegar/mvp/MoxyReflector.java index 835f1dc5..3e4c109e 100644 --- a/moxy/stub-reflector/src/main/java/com/arellomobile/mvp/MoxyReflector.java +++ b/moxy/stub-reflector/src/main/java/com/omegar/mvp/MoxyReflector.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import java.util.HashMap; import java.util.List; diff --git a/sample-github/src/main/AndroidManifest.xml b/sample-github/src/main/AndroidManifest.xml index 50ae06a6..63e5d79d 100644 --- a/sample-github/src/main/AndroidManifest.xml +++ b/sample-github/src/main/AndroidManifest.xml @@ -5,14 +5,14 @@ @@ -20,8 +20,8 @@ - - + + \ No newline at end of file diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/app/GithubApi.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubApi.java similarity index 68% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/app/GithubApi.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubApi.java index ec137b92..acc1ce01 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/app/GithubApi.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubApi.java @@ -1,13 +1,11 @@ -package com.arellomobile.mvp.sample.github.app; +package com.omegar.mvp.sample.github.app; import java.util.List; -import com.arellomobile.mvp.sample.github.mvp.models.Repository; -import com.arellomobile.mvp.sample.github.mvp.models.User; -import com.arellomobile.mvp.sample.github.mvp.models.gson.SearchResult; +import com.omegar.mvp.sample.github.mvp.models.Repository; +import com.omegar.mvp.sample.github.mvp.models.User; +import com.omegar.mvp.sample.github.mvp.models.gson.SearchResult; -import retrofit2.Call; -import retrofit2.Response; import retrofit2.http.GET; import retrofit2.http.Header; import retrofit2.http.Path; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/app/GithubApp.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubApp.java similarity index 80% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/app/GithubApp.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubApp.java index 51c92693..6b31ceef 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/app/GithubApp.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubApp.java @@ -1,12 +1,12 @@ -package com.arellomobile.mvp.sample.github.app; +package com.omegar.mvp.sample.github.app; import android.app.Application; import android.support.annotation.NonNull; import android.support.annotation.VisibleForTesting; -import com.arellomobile.mvp.sample.github.di.AppComponent; +import com.omegar.mvp.sample.github.di.AppComponent; import com.arellomobile.mvp.sample.github.di.DaggerAppComponent; -import com.arellomobile.mvp.sample.github.di.modules.ContextModule; +import com.omegar.mvp.sample.github.di.modules.ContextModule; /** * Date: 18.01.2016 diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/app/GithubError.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubError.java similarity index 92% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/app/GithubError.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubError.java index 73f1fa0e..58818f8b 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/app/GithubError.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubError.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.app; +package com.omegar.mvp.sample.github.app; import java.io.IOException; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/common/Utils.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/common/Utils.java similarity index 88% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/common/Utils.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/common/Utils.java index 2147f4f6..d15c58b1 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/common/Utils.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/common/Utils.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.common; +package com.omegar.mvp.sample.github.common; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/AppComponent.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/di/AppComponent.java similarity index 51% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/AppComponent.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/di/AppComponent.java index 6f79548a..a8eae82b 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/AppComponent.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/di/AppComponent.java @@ -1,14 +1,14 @@ -package com.arellomobile.mvp.sample.github.di; +package com.omegar.mvp.sample.github.di; import android.content.Context; -import com.arellomobile.mvp.sample.github.di.modules.BusModule; -import com.arellomobile.mvp.sample.github.di.modules.ContextModule; -import com.arellomobile.mvp.sample.github.di.modules.GithubModule; -import com.arellomobile.mvp.sample.github.mvp.GithubService; -import com.arellomobile.mvp.sample.github.mvp.presenters.RepositoriesPresenter; -import com.arellomobile.mvp.sample.github.mvp.presenters.RepositoryLikesPresenter; -import com.arellomobile.mvp.sample.github.mvp.presenters.SignInPresenter; +import com.omegar.mvp.sample.github.di.modules.BusModule; +import com.omegar.mvp.sample.github.di.modules.ContextModule; +import com.omegar.mvp.sample.github.di.modules.GithubModule; +import com.omegar.mvp.sample.github.mvp.GithubService; +import com.omegar.mvp.sample.github.mvp.presenters.RepositoriesPresenter; +import com.omegar.mvp.sample.github.mvp.presenters.RepositoryLikesPresenter; +import com.omegar.mvp.sample.github.mvp.presenters.SignInPresenter; import com.squareup.otto.Bus; import javax.inject.Singleton; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/modules/ApiModule.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/di/modules/ApiModule.java similarity index 76% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/modules/ApiModule.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/di/modules/ApiModule.java index 53d7a4ec..2ad07e09 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/modules/ApiModule.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/di/modules/ApiModule.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.sample.github.di.modules; +package com.omegar.mvp.sample.github.di.modules; -import com.arellomobile.mvp.sample.github.app.GithubApi; +import com.omegar.mvp.sample.github.app.GithubApi; import javax.inject.Singleton; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/modules/BusModule.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/di/modules/BusModule.java similarity index 73% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/modules/BusModule.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/di/modules/BusModule.java index 82b8c5aa..e6e14d46 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/modules/BusModule.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/di/modules/BusModule.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.sample.github.di.modules; +package com.omegar.mvp.sample.github.di.modules; -import com.arellomobile.mvp.sample.github.app.GithubApi; +import com.omegar.mvp.sample.github.app.GithubApi; import com.squareup.otto.Bus; import javax.inject.Singleton; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/modules/ContextModule.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/di/modules/ContextModule.java similarity index 87% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/modules/ContextModule.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/di/modules/ContextModule.java index 640d09f7..420aa8da 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/modules/ContextModule.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/di/modules/ContextModule.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.di.modules; +package com.omegar.mvp.sample.github.di.modules; import android.content.Context; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/modules/GithubModule.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/di/modules/GithubModule.java similarity index 66% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/modules/GithubModule.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/di/modules/GithubModule.java index c9e3b158..997a6684 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/modules/GithubModule.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/di/modules/GithubModule.java @@ -1,8 +1,8 @@ -package com.arellomobile.mvp.sample.github.di.modules; +package com.omegar.mvp.sample.github.di.modules; -import com.arellomobile.mvp.sample.github.app.GithubApi; -import com.arellomobile.mvp.sample.github.mvp.GithubService; +import com.omegar.mvp.sample.github.app.GithubApi; +import com.omegar.mvp.sample.github.mvp.GithubService; import javax.inject.Singleton; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/modules/RetrofitModule.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/di/modules/RetrofitModule.java similarity index 96% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/modules/RetrofitModule.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/di/modules/RetrofitModule.java index fcc71161..b3ce9b45 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/di/modules/RetrofitModule.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/di/modules/RetrofitModule.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.di.modules; +package com.omegar.mvp.sample.github.di.modules; import java.lang.reflect.Field; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/GithubService.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/GithubService.java similarity index 68% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/GithubService.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/GithubService.java index bd59cdf0..4a0b38ea 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/GithubService.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/GithubService.java @@ -1,10 +1,10 @@ -package com.arellomobile.mvp.sample.github.mvp; +package com.omegar.mvp.sample.github.mvp; import java.util.List; -import com.arellomobile.mvp.sample.github.app.GithubApi; -import com.arellomobile.mvp.sample.github.mvp.models.Repository; -import com.arellomobile.mvp.sample.github.mvp.models.User; +import com.omegar.mvp.sample.github.app.GithubApi; +import com.omegar.mvp.sample.github.mvp.models.Repository; +import com.omegar.mvp.sample.github.mvp.models.User; import rx.Observable; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/common/AuthUtils.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/common/AuthUtils.java similarity index 86% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/common/AuthUtils.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/common/AuthUtils.java index abaf72e1..669a259d 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/common/AuthUtils.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/common/AuthUtils.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.mvp.common; +package com.omegar.mvp.sample.github.mvp.common; /** * Date: 18.01.2016 diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/common/PrefUtils.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/common/PrefUtils.java similarity index 80% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/common/PrefUtils.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/common/PrefUtils.java index f788e479..3e6f7eca 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/common/PrefUtils.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/common/PrefUtils.java @@ -1,9 +1,9 @@ -package com.arellomobile.mvp.sample.github.mvp.common; +package com.omegar.mvp.sample.github.mvp.common; import android.content.Context; import android.content.SharedPreferences; -import com.arellomobile.mvp.sample.github.app.GithubApp; +import com.omegar.mvp.sample.github.app.GithubApp; /** * Date: 18.01.2016 diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/models/Repository.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/models/Repository.java similarity index 99% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/models/Repository.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/models/Repository.java index e75cdbd5..ee52c408 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/models/Repository.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/models/Repository.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.mvp.models; +package com.omegar.mvp.sample.github.mvp.models; import java.io.Serializable; import java.util.Date; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/models/User.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/models/User.java similarity index 97% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/models/User.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/models/User.java index 2bdca19c..f95bcc6d 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/models/User.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/models/User.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.mvp.models; +package com.omegar.mvp.sample.github.mvp.models; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/models/gson/SearchResult.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/models/gson/SearchResult.java similarity index 69% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/models/gson/SearchResult.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/models/gson/SearchResult.java index 50c013b7..61cd6e1e 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/models/gson/SearchResult.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/models/gson/SearchResult.java @@ -1,8 +1,8 @@ -package com.arellomobile.mvp.sample.github.mvp.models.gson; +package com.omegar.mvp.sample.github.mvp.models.gson; import java.util.List; -import com.arellomobile.mvp.sample.github.mvp.models.Repository; +import com.omegar.mvp.sample.github.mvp.models.Repository; /** * Date: 18.01.2016 diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/BasePresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/BasePresenter.java similarity index 91% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/BasePresenter.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/BasePresenter.java index 9ded50a6..ee184948 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/BasePresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/BasePresenter.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.mvp.presenters; +package com.omegar.mvp.sample.github.mvp.presenters; import android.support.annotation.NonNull; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/HomePresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/HomePresenter.java similarity index 70% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/HomePresenter.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/HomePresenter.java index a31df3a9..82115d33 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/HomePresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/HomePresenter.java @@ -1,7 +1,7 @@ -package com.arellomobile.mvp.sample.github.mvp.presenters; +package com.omegar.mvp.sample.github.mvp.presenters; -import com.arellomobile.mvp.sample.github.mvp.models.Repository; -import com.arellomobile.mvp.sample.github.mvp.views.HomeView; +import com.omegar.mvp.sample.github.mvp.models.Repository; +import com.omegar.mvp.sample.github.mvp.views.HomeView; import com.arellomobile.mvp.InjectViewState; import com.arellomobile.mvp.MvpPresenter; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/RepositoriesPresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoriesPresenter.java similarity index 86% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/RepositoriesPresenter.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoriesPresenter.java index d45fc2ce..4aec00a1 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/RepositoriesPresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoriesPresenter.java @@ -1,14 +1,14 @@ -package com.arellomobile.mvp.sample.github.mvp.presenters; +package com.omegar.mvp.sample.github.mvp.presenters; import java.util.List; import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.sample.github.app.GithubApi; -import com.arellomobile.mvp.sample.github.app.GithubApp; -import com.arellomobile.mvp.sample.github.common.Utils; -import com.arellomobile.mvp.sample.github.mvp.GithubService; -import com.arellomobile.mvp.sample.github.mvp.models.Repository; -import com.arellomobile.mvp.sample.github.mvp.views.RepositoriesView; +import com.omegar.mvp.sample.github.app.GithubApi; +import com.omegar.mvp.sample.github.app.GithubApp; +import com.omegar.mvp.sample.github.common.Utils; +import com.omegar.mvp.sample.github.mvp.GithubService; +import com.omegar.mvp.sample.github.mvp.models.Repository; +import com.omegar.mvp.sample.github.mvp.views.RepositoriesView; import javax.inject.Inject; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/RepositoryLikesPresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryLikesPresenter.java similarity index 93% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/RepositoryLikesPresenter.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryLikesPresenter.java index acd3dc49..2b75cda0 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/RepositoryLikesPresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryLikesPresenter.java @@ -1,11 +1,11 @@ -package com.arellomobile.mvp.sample.github.mvp.presenters; +package com.omegar.mvp.sample.github.mvp.presenters; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.sample.github.mvp.views.RepositoryLikesView; +import com.omegar.mvp.sample.github.mvp.views.RepositoryLikesView; import rx.Observable; import rx.Subscription; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/RepositoryPresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryPresenter.java similarity index 84% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/RepositoryPresenter.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryPresenter.java index e3a38891..cdc5c159 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/RepositoryPresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryPresenter.java @@ -1,11 +1,11 @@ -package com.arellomobile.mvp.sample.github.mvp.presenters; +package com.omegar.mvp.sample.github.mvp.presenters; import java.util.List; import com.arellomobile.mvp.InjectViewState; import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.sample.github.mvp.models.Repository; -import com.arellomobile.mvp.sample.github.mvp.views.RepositoryView; +import com.omegar.mvp.sample.github.mvp.models.Repository; +import com.omegar.mvp.sample.github.mvp.views.RepositoryView; /** * Date: 27.01.2016 diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/SignInPresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SignInPresenter.java similarity index 81% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/SignInPresenter.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SignInPresenter.java index bd0b5ca4..93faa70b 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/SignInPresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SignInPresenter.java @@ -1,15 +1,15 @@ -package com.arellomobile.mvp.sample.github.mvp.presenters; +package com.omegar.mvp.sample.github.mvp.presenters; import android.text.TextUtils; import android.util.Base64; import com.arellomobile.mvp.InjectViewState; import com.arellomobile.mvp.sample.github.R; -import com.arellomobile.mvp.sample.github.app.GithubApp; -import com.arellomobile.mvp.sample.github.common.Utils; -import com.arellomobile.mvp.sample.github.mvp.GithubService; -import com.arellomobile.mvp.sample.github.mvp.common.AuthUtils; -import com.arellomobile.mvp.sample.github.mvp.views.SignInView; +import com.omegar.mvp.sample.github.app.GithubApp; +import com.omegar.mvp.sample.github.common.Utils; +import com.omegar.mvp.sample.github.mvp.GithubService; +import com.omegar.mvp.sample.github.mvp.common.AuthUtils; +import com.omegar.mvp.sample.github.mvp.views.SignInView; import javax.inject.Inject; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/SignOutPresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SignOutPresenter.java similarity index 63% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/SignOutPresenter.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SignOutPresenter.java index ae843c1c..f9d23242 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/SignOutPresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SignOutPresenter.java @@ -1,7 +1,7 @@ -package com.arellomobile.mvp.sample.github.mvp.presenters; +package com.omegar.mvp.sample.github.mvp.presenters; -import com.arellomobile.mvp.sample.github.mvp.common.AuthUtils; -import com.arellomobile.mvp.sample.github.mvp.views.SignOutView; +import com.omegar.mvp.sample.github.mvp.common.AuthUtils; +import com.omegar.mvp.sample.github.mvp.views.SignOutView; import com.arellomobile.mvp.InjectViewState; import com.arellomobile.mvp.MvpPresenter; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/SplashPresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SplashPresenter.java similarity index 68% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/SplashPresenter.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SplashPresenter.java index 7183263d..a2982280 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/SplashPresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SplashPresenter.java @@ -1,10 +1,10 @@ -package com.arellomobile.mvp.sample.github.mvp.presenters; +package com.omegar.mvp.sample.github.mvp.presenters; import android.text.TextUtils; import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.sample.github.mvp.common.AuthUtils; -import com.arellomobile.mvp.sample.github.mvp.views.SplashView; +import com.omegar.mvp.sample.github.mvp.common.AuthUtils; +import com.omegar.mvp.sample.github.mvp.views.SplashView; /** * This presenter's View doesn't want ViewState. diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/HomeView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/HomeView.java similarity index 83% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/HomeView.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/HomeView.java index 9482e2e8..db134ef3 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/HomeView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/HomeView.java @@ -1,7 +1,7 @@ -package com.arellomobile.mvp.sample.github.mvp.views; +package com.omegar.mvp.sample.github.mvp.views; import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.sample.github.mvp.models.Repository; +import com.omegar.mvp.sample.github.mvp.models.Repository; import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; import com.arellomobile.mvp.viewstate.strategy.OneExecutionStateStrategy; import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/RepositoriesView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoriesView.java similarity index 87% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/RepositoriesView.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoriesView.java index 34f2c3e0..7ca9510c 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/RepositoriesView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoriesView.java @@ -1,8 +1,8 @@ -package com.arellomobile.mvp.sample.github.mvp.views; +package com.omegar.mvp.sample.github.mvp.views; import java.util.List; -import com.arellomobile.mvp.sample.github.mvp.models.Repository; +import com.omegar.mvp.sample.github.mvp.models.Repository; import com.arellomobile.mvp.MvpView; import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; import com.arellomobile.mvp.viewstate.strategy.AddToEndStrategy; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/RepositoryLikeView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryLikeView.java similarity index 87% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/RepositoryLikeView.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryLikeView.java index 53ad1e27..da2a2942 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/RepositoryLikeView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryLikeView.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.mvp.views; +package com.omegar.mvp.sample.github.mvp.views; import com.arellomobile.mvp.MvpView; import com.arellomobile.mvp.viewstate.strategy.SingleStateStrategy; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/RepositoryLikesView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryLikesView.java similarity index 89% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/RepositoryLikesView.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryLikesView.java index f3f00d4e..395fef71 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/RepositoryLikesView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryLikesView.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.mvp.views; +package com.omegar.mvp.sample.github.mvp.views; import java.util.List; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/RepositoryView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryView.java similarity index 68% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/RepositoryView.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryView.java index 03831e80..a2c4d08b 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/RepositoryView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryView.java @@ -1,6 +1,6 @@ -package com.arellomobile.mvp.sample.github.mvp.views; +package com.omegar.mvp.sample.github.mvp.views; -import com.arellomobile.mvp.sample.github.mvp.models.Repository; +import com.omegar.mvp.sample.github.mvp.models.Repository; import com.arellomobile.mvp.MvpView; /** diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/SignInView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SignInView.java similarity index 92% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/SignInView.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SignInView.java index 36c6f622..5b9de0a9 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/SignInView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SignInView.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.mvp.views; +package com.omegar.mvp.sample.github.mvp.views; import com.arellomobile.mvp.MvpView; import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/SignOutView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SignOutView.java similarity index 76% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/SignOutView.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SignOutView.java index 9cf86b3c..5a6b60a6 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/SignOutView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SignOutView.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.mvp.views; +package com.omegar.mvp.sample.github.mvp.views; import com.arellomobile.mvp.MvpView; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/SplashView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SplashView.java similarity index 78% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/SplashView.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SplashView.java index 320cf976..9e550751 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/views/SplashView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SplashView.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.mvp.views; +package com.omegar.mvp.sample.github.mvp.views; import com.arellomobile.mvp.MvpView; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/activities/HomeActivity.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/HomeActivity.java similarity index 85% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/activities/HomeActivity.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/HomeActivity.java index e27f442c..ed70a62e 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/activities/HomeActivity.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/HomeActivity.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.ui.activities; +package com.omegar.mvp.sample.github.ui.activities; import java.util.List; @@ -18,27 +18,27 @@ import com.arellomobile.mvp.MvpAppCompatActivity; import com.arellomobile.mvp.presenter.InjectPresenter; import com.arellomobile.mvp.sample.github.R; -import com.arellomobile.mvp.sample.github.mvp.models.Repository; -import com.arellomobile.mvp.sample.github.mvp.presenters.HomePresenter; -import com.arellomobile.mvp.sample.github.mvp.presenters.RepositoriesPresenter; -import com.arellomobile.mvp.sample.github.mvp.presenters.SignOutPresenter; -import com.arellomobile.mvp.sample.github.mvp.views.HomeView; -import com.arellomobile.mvp.sample.github.mvp.views.RepositoriesView; -import com.arellomobile.mvp.sample.github.mvp.views.SignOutView; -import com.arellomobile.mvp.sample.github.ui.adapters.RepositoriesAdapter; -import com.arellomobile.mvp.sample.github.ui.fragments.DetailsFragment; -import com.arellomobile.mvp.sample.github.ui.views.FrameSwipeRefreshLayout; +import com.omegar.mvp.sample.github.mvp.models.Repository; +import com.omegar.mvp.sample.github.mvp.presenters.HomePresenter; +import com.omegar.mvp.sample.github.mvp.presenters.RepositoriesPresenter; +import com.omegar.mvp.sample.github.mvp.presenters.SignOutPresenter; +import com.omegar.mvp.sample.github.mvp.views.HomeView; +import com.omegar.mvp.sample.github.mvp.views.RepositoriesView; +import com.omegar.mvp.sample.github.mvp.views.SignOutView; +import com.omegar.mvp.sample.github.ui.adapters.RepositoriesAdapter; +import com.omegar.mvp.sample.github.ui.fragments.DetailsFragment; +import com.omegar.mvp.sample.github.ui.views.FrameSwipeRefreshLayout; import butterknife.BindView; import butterknife.ButterKnife; public class HomeActivity extends MvpAppCompatActivity implements SignOutView, RepositoriesView, HomeView, RepositoriesAdapter.OnScrollToBottomListener { @InjectPresenter - SignOutPresenter mSignOutPresenter; + SignOutPresenter mSignOutPresenter; @InjectPresenter - RepositoriesPresenter mRepositoriesPresenter; + RepositoriesPresenter mRepositoriesPresenter; @InjectPresenter - HomePresenter mHomePresenter; + HomePresenter mHomePresenter; @BindView(R.id.activity_home_toolbar) Toolbar mToolbar; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/activities/SignInActivity.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/SignInActivity.java similarity index 92% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/activities/SignInActivity.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/SignInActivity.java index 47266ccb..eaaedbb0 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/activities/SignInActivity.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/SignInActivity.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.ui.activities; +package com.omegar.mvp.sample.github.ui.activities; import android.app.AlertDialog; import android.content.Intent; @@ -11,8 +11,8 @@ import com.arellomobile.mvp.MvpAppCompatActivity; import com.arellomobile.mvp.presenter.InjectPresenter; import com.arellomobile.mvp.sample.github.R; -import com.arellomobile.mvp.sample.github.mvp.presenters.SignInPresenter; -import com.arellomobile.mvp.sample.github.mvp.views.SignInView; +import com.omegar.mvp.sample.github.mvp.presenters.SignInPresenter; +import com.omegar.mvp.sample.github.mvp.views.SignInView; import butterknife.BindView; import butterknife.ButterKnife; @@ -22,7 +22,7 @@ */ public class SignInActivity extends MvpAppCompatActivity implements SignInView { @InjectPresenter - SignInPresenter mSignInPresenter; + SignInPresenter mSignInPresenter; @BindView(R.id.email) EditText mEmailView; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/activities/SplashActivity.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/SplashActivity.java similarity index 75% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/activities/SplashActivity.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/SplashActivity.java index 6a6f0950..670be1ca 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/activities/SplashActivity.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/SplashActivity.java @@ -1,17 +1,17 @@ -package com.arellomobile.mvp.sample.github.ui.activities; +package com.omegar.mvp.sample.github.ui.activities; import android.content.Intent; import android.os.Bundle; import com.arellomobile.mvp.MvpAppCompatActivity; import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.sample.github.mvp.presenters.SplashPresenter; -import com.arellomobile.mvp.sample.github.mvp.views.SplashView; +import com.omegar.mvp.sample.github.mvp.presenters.SplashPresenter; +import com.omegar.mvp.sample.github.mvp.views.SplashView; public class SplashActivity extends MvpAppCompatActivity implements SplashView { @InjectPresenter - SplashPresenter mSplashPresenter; + SplashPresenter mSplashPresenter; @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/adapters/MvpBaseAdapter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/adapters/MvpBaseAdapter.java similarity index 92% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/adapters/MvpBaseAdapter.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/ui/adapters/MvpBaseAdapter.java index 736202cf..a718b944 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/adapters/MvpBaseAdapter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/adapters/MvpBaseAdapter.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.ui.adapters; +package com.omegar.mvp.sample.github.ui.adapters; import android.widget.BaseAdapter; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/adapters/RepositoriesAdapter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/adapters/RepositoriesAdapter.java similarity index 91% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/adapters/RepositoriesAdapter.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/ui/adapters/RepositoriesAdapter.java index 2e7fc092..3d02eceb 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/adapters/RepositoriesAdapter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/adapters/RepositoriesAdapter.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.ui.adapters; +package com.omegar.mvp.sample.github.ui.adapters; import java.util.ArrayList; import java.util.List; @@ -15,11 +15,11 @@ import com.arellomobile.mvp.presenter.PresenterType; import com.arellomobile.mvp.presenter.ProvidePresenter; import com.arellomobile.mvp.sample.github.R; -import com.arellomobile.mvp.sample.github.mvp.models.Repository; -import com.arellomobile.mvp.sample.github.mvp.presenters.RepositoryLikesPresenter; -import com.arellomobile.mvp.sample.github.mvp.presenters.RepositoryPresenter; -import com.arellomobile.mvp.sample.github.mvp.views.RepositoryLikesView; -import com.arellomobile.mvp.sample.github.mvp.views.RepositoryView; +import com.omegar.mvp.sample.github.mvp.models.Repository; +import com.omegar.mvp.sample.github.mvp.presenters.RepositoryLikesPresenter; +import com.omegar.mvp.sample.github.mvp.presenters.RepositoryPresenter; +import com.omegar.mvp.sample.github.mvp.views.RepositoryLikesView; +import com.omegar.mvp.sample.github.mvp.views.RepositoryView; import butterknife.BindView; import butterknife.ButterKnife; @@ -140,7 +140,7 @@ public View getView(int position, View convertView, ViewGroup parent) { public class RepositoryHolder implements RepositoryView { @InjectPresenter - RepositoryPresenter mRepositoryPresenter; + RepositoryPresenter mRepositoryPresenter; private Repository mRepository; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/fragments/DetailsFragment.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/fragments/DetailsFragment.java similarity index 81% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/fragments/DetailsFragment.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/ui/fragments/DetailsFragment.java index cace34a1..b7bd40bc 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/fragments/DetailsFragment.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/fragments/DetailsFragment.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.ui.fragments; +package com.omegar.mvp.sample.github.ui.fragments; import java.util.List; @@ -14,12 +14,12 @@ import com.arellomobile.mvp.presenter.PresenterType; import com.arellomobile.mvp.presenter.ProvidePresenter; import com.arellomobile.mvp.sample.github.R; -import com.arellomobile.mvp.sample.github.mvp.models.Repository; -import com.arellomobile.mvp.sample.github.mvp.presenters.RepositoryLikesPresenter; -import com.arellomobile.mvp.sample.github.mvp.presenters.RepositoryPresenter; -import com.arellomobile.mvp.sample.github.mvp.views.RepositoryLikesView; -import com.arellomobile.mvp.sample.github.mvp.views.RepositoryView; -import com.arellomobile.mvp.sample.github.ui.views.RepositoryWidget; +import com.omegar.mvp.sample.github.mvp.models.Repository; +import com.omegar.mvp.sample.github.mvp.presenters.RepositoryLikesPresenter; +import com.omegar.mvp.sample.github.mvp.presenters.RepositoryPresenter; +import com.omegar.mvp.sample.github.mvp.views.RepositoryLikesView; +import com.omegar.mvp.sample.github.mvp.views.RepositoryView; +import com.omegar.mvp.sample.github.ui.views.RepositoryWidget; import butterknife.BindView; import butterknife.ButterKnife; @@ -34,14 +34,14 @@ public class DetailsFragment extends MvpAppCompatFragment implements RepositoryV public static final String ARGS_REPOSITORY = "argsRepository"; @InjectPresenter - RepositoryPresenter mRepositoryPresenter; + RepositoryPresenter mRepositoryPresenter; @InjectPresenter(type = PresenterType.WEAK, tag = RepositoryLikesPresenter.TAG) RepositoryLikesPresenter mRepositoryLikesPresenter; private Repository mRepository; @BindView(R.id.fragment_repository_details_text_view_title) - RepositoryWidget mTitleTextView; + RepositoryWidget mTitleTextView; @BindView(R.id.fragment_repository_details_image_button_like) ImageButton mLikeImageButton; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/views/FrameSwipeRefreshLayout.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/views/FrameSwipeRefreshLayout.java similarity index 93% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/views/FrameSwipeRefreshLayout.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/ui/views/FrameSwipeRefreshLayout.java index 11b8f032..92dc4386 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/views/FrameSwipeRefreshLayout.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/views/FrameSwipeRefreshLayout.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.ui.views; +package com.omegar.mvp.sample.github.ui.views; import android.content.Context; import android.support.v4.widget.SwipeRefreshLayout; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/views/LikeButton.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/views/LikeButton.java similarity index 95% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/views/LikeButton.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/ui/views/LikeButton.java index 32aa538e..2c944e33 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/views/LikeButton.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/views/LikeButton.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.ui.views; +package com.omegar.mvp.sample.github.ui.views; import android.annotation.TargetApi; import android.content.Context; diff --git a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/views/RepositoryWidget.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/views/RepositoryWidget.java similarity index 85% rename from sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/views/RepositoryWidget.java rename to sample-github/src/main/java/com/omegar/mvp/sample/github/ui/views/RepositoryWidget.java index 9840ccc1..b085ba40 100644 --- a/sample-github/src/main/java/com/arellomobile/mvp/sample/github/ui/views/RepositoryWidget.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/views/RepositoryWidget.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.github.ui.views; +package com.omegar.mvp.sample.github.ui.views; import android.content.Context; import android.os.Build; @@ -9,9 +9,9 @@ import com.arellomobile.mvp.MvpDelegate; import com.arellomobile.mvp.presenter.InjectPresenter; import com.arellomobile.mvp.presenter.ProvidePresenter; -import com.arellomobile.mvp.sample.github.mvp.models.Repository; -import com.arellomobile.mvp.sample.github.mvp.presenters.RepositoryPresenter; -import com.arellomobile.mvp.sample.github.mvp.views.RepositoryView; +import com.omegar.mvp.sample.github.mvp.models.Repository; +import com.omegar.mvp.sample.github.mvp.presenters.RepositoryPresenter; +import com.omegar.mvp.sample.github.mvp.views.RepositoryView; /** * Created by senneco on 23.10.2016 @@ -28,7 +28,7 @@ public class RepositoryWidget extends TextView implements RepositoryView { private Repository mRepository; @InjectPresenter - RepositoryPresenter mRepositoryPresenter; + RepositoryPresenter mRepositoryPresenter; public RepositoryWidget(Context context) { super(context); diff --git a/sample-github/src/main/res/layout/activity_home.xml b/sample-github/src/main/res/layout/activity_home.xml index 82f4fa04..83756ca1 100644 --- a/sample-github/src/main/res/layout/activity_home.xml +++ b/sample-github/src/main/res/layout/activity_home.xml @@ -13,7 +13,7 @@ android:background="@color/colorPrimary" app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" /> - - + + tools:context="com.omegar.mvp.sample.github.ui.activities.SignInActivity"> - - + diff --git a/sample-kotlin/src/main/kotlin/com/arellomobile/mvp/sample/kotlin/DialogPresenter.kt b/sample-kotlin/src/main/kotlin/com/omegar/mvp/sample/kotlin/DialogPresenter.kt similarity index 89% rename from sample-kotlin/src/main/kotlin/com/arellomobile/mvp/sample/kotlin/DialogPresenter.kt rename to sample-kotlin/src/main/kotlin/com/omegar/mvp/sample/kotlin/DialogPresenter.kt index 7c074f89..ae7cc269 100644 --- a/sample-kotlin/src/main/kotlin/com/arellomobile/mvp/sample/kotlin/DialogPresenter.kt +++ b/sample-kotlin/src/main/kotlin/com/omegar/mvp/sample/kotlin/DialogPresenter.kt @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.kotlin +package com.omegar.mvp.sample.kotlin import com.arellomobile.mvp.InjectViewState import com.arellomobile.mvp.MvpPresenter diff --git a/sample-kotlin/src/main/kotlin/com/arellomobile/mvp/sample/kotlin/DialogView.kt b/sample-kotlin/src/main/kotlin/com/omegar/mvp/sample/kotlin/DialogView.kt similarity index 89% rename from sample-kotlin/src/main/kotlin/com/arellomobile/mvp/sample/kotlin/DialogView.kt rename to sample-kotlin/src/main/kotlin/com/omegar/mvp/sample/kotlin/DialogView.kt index 504f18b9..35f63fec 100644 --- a/sample-kotlin/src/main/kotlin/com/arellomobile/mvp/sample/kotlin/DialogView.kt +++ b/sample-kotlin/src/main/kotlin/com/omegar/mvp/sample/kotlin/DialogView.kt @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.kotlin +package com.omegar.mvp.sample.kotlin import com.arellomobile.mvp.MvpView import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy diff --git a/sample-kotlin/src/main/kotlin/com/arellomobile/mvp/sample/kotlin/MainActivity.kt b/sample-kotlin/src/main/kotlin/com/omegar/mvp/sample/kotlin/MainActivity.kt similarity index 94% rename from sample-kotlin/src/main/kotlin/com/arellomobile/mvp/sample/kotlin/MainActivity.kt rename to sample-kotlin/src/main/kotlin/com/omegar/mvp/sample/kotlin/MainActivity.kt index 9268ba6a..72e02c85 100644 --- a/sample-kotlin/src/main/kotlin/com/arellomobile/mvp/sample/kotlin/MainActivity.kt +++ b/sample-kotlin/src/main/kotlin/com/omegar/mvp/sample/kotlin/MainActivity.kt @@ -1,4 +1,4 @@ -package com.arellomobile.mvp.sample.kotlin +package com.omegar.mvp.sample.kotlin import android.os.Bundle import android.support.v7.app.AlertDialog @@ -7,6 +7,7 @@ import com.arellomobile.mvp.presenter.InjectPresenter import com.arellomobile.mvp.presenter.PresenterType import com.arellomobile.mvp.presenter.ProvidePresenter import com.arellomobile.mvp.presenter.ProvidePresenterTag +import com.arellomobile.mvp.sample.kotlin.R import kotlinx.android.synthetic.main.activity_main.* class MainActivity : MvpAppCompatActivity(), DialogView { diff --git a/sample-kotlin/src/main/res/layout/activity_main.xml b/sample-kotlin/src/main/res/layout/activity_main.xml index ad172ccc..3ecf48dc 100644 --- a/sample-kotlin/src/main/res/layout/activity_main.xml +++ b/sample-kotlin/src/main/res/layout/activity_main.xml @@ -8,7 +8,7 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" - tools:context="com.arellomobile.mvp.sample.kotlin.MainActivity" + tools:context="com.arellomobile.mvp.sample.kotlin.com.omegar.mvp.sample.kotlin.MainActivity" > Date: Fri, 22 Mar 2019 08:30:55 +0300 Subject: [PATCH 04/36] Libraries versions updated --- build.gradle | 5 ++++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- moxy-androidx-sapmle/build.gradle | 1 - moxy-androidx/build.gradle | 4 ++-- .../com/omegar/mvp/presenter/PresenterField.java | 1 - sample-custom-strategy/build.gradle | 1 - sample-github/build.gradle | 12 ++++++------ .../com/omegar/mvp/sample/github/app/GithubApp.java | 3 ++- sample-kotlin/build.gradle | 2 +- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index c9151251..34ec28ad 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,8 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } @@ -16,12 +17,14 @@ allprojects { jcenter() mavenCentral() google() + maven { url 'https://jitpack.io' } } } ext { targetVersionCode = 46 targetVersionName = "1.5.6" + kotlin_version = '1.3.21' deps = [ android : 'com.google.android:android:1.6_r2', diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 87f8b4ca..ee04ff52 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Nov 24 23:06:24 NOVT 2018 +#Thu Mar 21 17:43:47 MSK 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/moxy-androidx-sapmle/build.gradle b/moxy-androidx-sapmle/build.gradle index 658eb036..5ae60feb 100644 --- a/moxy-androidx-sapmle/build.gradle +++ b/moxy-androidx-sapmle/build.gradle @@ -1,5 +1,4 @@ buildscript { - ext.kotlin_version = '1.3.10' repositories { google() jcenter() diff --git a/moxy-androidx/build.gradle b/moxy-androidx/build.gradle index 16dc3884..8a85933a 100755 --- a/moxy-androidx/build.gradle +++ b/moxy-androidx/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'java' -apply plugin: 'maven-publish' -apply plugin: 'maven' +apply plugin: 'com.github.dcendents.android-maven' +group = 'com.github.Omega-R' ext { publishDir = 'artifacts' diff --git a/moxy/src/main/java/com/omegar/mvp/presenter/PresenterField.java b/moxy/src/main/java/com/omegar/mvp/presenter/PresenterField.java index 3e6597fe..337e0a53 100644 --- a/moxy/src/main/java/com/omegar/mvp/presenter/PresenterField.java +++ b/moxy/src/main/java/com/omegar/mvp/presenter/PresenterField.java @@ -1,6 +1,5 @@ package com.omegar.mvp.presenter; -import com.arellomobile.mvp.*; import com.omegar.mvp.MvpPresenter; /** diff --git a/sample-custom-strategy/build.gradle b/sample-custom-strategy/build.gradle index 4ae7711c..0c6ade9e 100644 --- a/sample-custom-strategy/build.gradle +++ b/sample-custom-strategy/build.gradle @@ -1,5 +1,4 @@ buildscript { - ext.kotlin_version = '1.3.10' repositories { jcenter() mavenCentral() diff --git a/sample-github/build.gradle b/sample-github/build.gradle index 6f820c72..56e87037 100644 --- a/sample-github/build.gradle +++ b/sample-github/build.gradle @@ -31,27 +31,27 @@ android { def support = '28.0.0' def retrofit = '2.1.0' def dagger = '2.16' -def butterKnife = "8.5.1" +def butterKnife = "8.8.1" dependencies { testImplementation "junit:junit:4.12" implementation "com.android.support:appcompat-v7:$support" implementation "com.android.support:design:$support" - implementation "com.j256.ormlite:ormlite-core:4.48" - implementation "com.j256.ormlite:ormlite-android:4.48" + implementation "com.j256.ormlite:ormlite-core:5.0" + implementation "com.j256.ormlite:ormlite-android:5.0" - implementation "com.google.code.gson:gson:2.5" + implementation "com.google.code.gson:gson:2.8.2" implementation "com.jakewharton:butterknife:$butterKnife" implementation "com.squareup.retrofit2:retrofit:$retrofit" implementation "com.squareup.retrofit2:converter-gson:$retrofit" implementation "com.squareup.retrofit2:adapter-rxjava:$retrofit" - implementation "com.squareup.picasso:picasso:2.5.2" + implementation "com.squareup.picasso:picasso:2.71828" implementation "com.squareup:otto:1.3.8" - implementation "io.reactivex:rxjava:1.1.0" + implementation "io.reactivex:rxjava:1.1.5" implementation "io.reactivex:rxandroid:1.1.0" implementation "com.google.dagger:dagger:$dagger" diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubApp.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubApp.java index 6b31ceef..754a135e 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubApp.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubApp.java @@ -5,7 +5,8 @@ import android.support.annotation.VisibleForTesting; import com.omegar.mvp.sample.github.di.AppComponent; -import com.arellomobile.mvp.sample.github.di.DaggerAppComponent; + +import com.omegar.mvp.sample.github.di.DaggerAppComponent; import com.omegar.mvp.sample.github.di.modules.ContextModule; /** diff --git a/sample-kotlin/build.gradle b/sample-kotlin/build.gradle index c42f0808..558130bc 100644 --- a/sample-kotlin/build.gradle +++ b/sample-kotlin/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.3.10' + repositories { jcenter() mavenCentral() From 5cfafbe12ddd343d4f677caae82a4a4a77d2a3ff Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Fri, 22 Mar 2019 09:19:44 +0300 Subject: [PATCH 05/36] MvpAppCompatDialogFragment has been added --- moxy-androidx/build.gradle | 4 +- .../mvp/MvpAppCompatDialogFragment.java | 95 +++++++++++++++++++ .../app/AppCompatDialogFragment.java | 13 +++ .../androidx/fragment/app/DialogFragment.java | 11 +++ 4 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java create mode 100644 moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java create mode 100644 moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java diff --git a/moxy-androidx/build.gradle b/moxy-androidx/build.gradle index 8a85933a..16dc3884 100755 --- a/moxy-androidx/build.gradle +++ b/moxy-androidx/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'java' -apply plugin: 'com.github.dcendents.android-maven' -group = 'com.github.Omega-R' +apply plugin: 'maven-publish' +apply plugin: 'maven' ext { publishDir = 'artifacts' diff --git a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java new file mode 100644 index 00000000..c3376e63 --- /dev/null +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java @@ -0,0 +1,95 @@ +package com.omegar.mvp; + +import android.os.Build; +import android.os.Bundle; + +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; + +public class MvpAppCompatDialogFragment extends DialogFragment { + + private boolean mIsStateSaved; + private MvpDelegate mMvpDelegate; + + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + getMvpDelegate().onCreate(savedInstanceState); + } + + public void onResume() { + super.onResume(); + + mIsStateSaved = false; + + getMvpDelegate().onAttach(); + } + + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + + mIsStateSaved = true; + + getMvpDelegate().onSaveInstanceState(outState); + getMvpDelegate().onDetach(); + } + + @Override + public void onStop() { + super.onStop(); + + getMvpDelegate().onDetach(); + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + + getMvpDelegate().onDetach(); + getMvpDelegate().onDestroyView(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + + //We leave the screen and respectively all fragments will be destroyed + if (getActivity().isFinishing()) { + getMvpDelegate().onDestroy(); + return; + } + + // When we rotate device isRemoving() return true for fragment placed in backstack + // http://stackoverflow.com/questions/34649126/fragment-back-stack-and-isremoving + if (mIsStateSaved) { + mIsStateSaved = false; + return; + } + + // See https://github.com/Arello-Mobile/Moxy/issues/24 + boolean anyParentIsRemoving = false; + + if (Build.VERSION.SDK_INT >= 17) { + Fragment parent = getParentFragment(); + while (!anyParentIsRemoving && parent != null) { + anyParentIsRemoving = parent.isRemoving(); + parent = parent.getParentFragment(); + } + } + + if (isRemoving() || anyParentIsRemoving) { + getMvpDelegate().onDestroy(); + } + } + + /** + * @return The {@link MvpDelegate} being used by this Fragment. + */ + public MvpDelegate getMvpDelegate() { + if (mMvpDelegate == null) { + mMvpDelegate = new MvpDelegate<>(this); + } + + return mMvpDelegate; + } +} diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java new file mode 100644 index 00000000..4676e552 --- /dev/null +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java @@ -0,0 +1,13 @@ +package androidx.appcompat.app; + +import androidx.fragment.app.Fragment; + +/** + * Date: 22-March-19 + * Time: 09:18 + * + * @author R12rus + */ +public class AppCompatDialogFragment extends Fragment { + +} \ No newline at end of file diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java new file mode 100644 index 00000000..125a4921 --- /dev/null +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java @@ -0,0 +1,11 @@ +package androidx.fragment.app; + +/** + * Date: 22-March-19 + * Time: 08:58 + * + * @author R12rus + */ +public class DialogFragment extends Fragment { + +} \ No newline at end of file From 86c88baf53ab08cd9c787d3a50c62d759ca6526f Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Fri, 22 Mar 2019 09:29:38 +0300 Subject: [PATCH 06/36] dependencies have been changes --- .../main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java | 4 ++-- .../main/java/androidx/appcompat/app/AppCompatActivity.java | 4 +++- .../java/androidx/appcompat/app/AppCompatDialogFragment.java | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java index c3376e63..9d1fd2b4 100644 --- a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java @@ -3,10 +3,10 @@ import android.os.Build; import android.os.Bundle; -import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AppCompatDialogFragment; import androidx.fragment.app.Fragment; -public class MvpAppCompatDialogFragment extends DialogFragment { +public class MvpAppCompatDialogFragment extends AppCompatDialogFragment { private boolean mIsStateSaved; private MvpDelegate mMvpDelegate; diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java index abc8929a..6dc4e354 100755 --- a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java @@ -2,6 +2,8 @@ import android.os.Bundle; +import androidx.fragment.app.FragmentActivity; + /** * Date: 25-July-18 * Time: 2:51 @@ -9,7 +11,7 @@ * @author Vova Stelmashchuk */ -public class AppCompatActivity { +public class AppCompatActivity extends FragmentActivity { protected void onCreate(Bundle savedInstanceState) { throw new RuntimeException("Stub!"); diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java index 4676e552..3cd337eb 100644 --- a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java @@ -1,6 +1,6 @@ package androidx.appcompat.app; -import androidx.fragment.app.Fragment; +import androidx.fragment.app.DialogFragment; /** * Date: 22-March-19 @@ -8,6 +8,6 @@ * * @author R12rus */ -public class AppCompatDialogFragment extends Fragment { +public class AppCompatDialogFragment extends DialogFragment { } \ No newline at end of file From 3f61e549643019a221457750eb88f55591a4fb15 Mon Sep 17 00:00:00 2001 From: Roman Tcaregorodtcev Date: Fri, 22 Mar 2019 09:55:19 +0300 Subject: [PATCH 07/36] Update README.md --- README.md | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ed240398..d1e393d6 100644 --- a/README.md +++ b/README.md @@ -76,23 +76,31 @@ Base modules integration: ```groovy dependencies { ... - compile 'com.arello-mobile:moxy:1.5.6' - annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.6' + implementation 'com.github.Omega-R.OmegaMoxy:moxy:1.5.6' + annotationProcessor 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.5.6' } ``` For additional base view classes `MvpActivity` and `MvpFragment` add this: ```groovy dependencies { ... - compile 'com.arello-mobile:moxy-android:1.5.6' + implementation 'com.github.Omega-R.OmegaMoxy:moxy-android:1.5.6' +} +``` + +If you are planning to use AndroidX, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this: +```groovy +dependencies { + ... + implementation 'com.github.Omega-R.OmegaMoxy:moxy-androidx:1.5.6' } ``` If you are planning to use AppCompat, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this: ```groovy dependencies { ... - compile 'com.arello-mobile:moxy-app-compat:1.5.6' - compile 'com.android.support:appcompat-v7:$support_version' + implementation 'com.arello-mobile:moxy-app-compat:1.5.6' + implementation 'com.android.support:appcompat-v7:$support_version' } ``` ### Kotlin @@ -102,7 +110,7 @@ apply plugin: 'kotlin-kapt' dependencies { ... - kapt 'com.arello-mobile:moxy-compiler:1.5.6' + kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.5.6' } ``` From aa02e1fbe343694aec705a45a7ed7f21aea3df51 Mon Sep 17 00:00:00 2001 From: Anton Knyazev Date: Fri, 22 Mar 2019 10:52:17 +0300 Subject: [PATCH 08/36] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d1e393d6..5f80e371 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # Moxy -[![Maven Central](https://img.shields.io/maven-central/v/com.arello-mobile/moxy.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.arello-mobile%22%20AND%20(a%3A%22moxy%22%20OR%20a%3A%22moxy-compiler%22%20OR%20a%3A%22moxy-android%22%20OR%20a%3A%22moxy-app-compat%22)) [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://opensource.org/licenses/MIT) +[![](https://jitpack.io/v/Omega-R/OmegaMoxy.svg)](https://jitpack.io/#Omega-R/OmegaMoxy) +[![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://opensource.org/licenses/MIT) Moxy is a library that helps to use MVP pattern when you do the Android Application. _Without problems of lifecycle and boilerplate code!_ From e2bd0b191392dc1c20046a432d3bd5db41c2b4db Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Fri, 22 Mar 2019 11:09:01 +0300 Subject: [PATCH 09/36] arello-mobile replaced with omegar --- README.md | 12 ++++++------ moxy-androidx-sapmle/build.gradle | 2 +- .../java/com/omegar/mvp/compiler/MvpCompiler.java | 2 +- .../resources/multimodules/app/MoxyReflector.java | 2 +- moxy-templates/Java/MoxyActivity/globals.xml.ftl | 4 ++-- .../presentation/presenter/BlankPresenter.java.ftl | 4 ++-- .../app_package/presentation/view/BlankView.java.ftl | 2 +- .../app_package/ui/activity/BlankActivity.java.ftl | 4 ++-- moxy-templates/Java/MoxyFragment/globals.xml.ftl | 4 ++-- .../presentation/presenter/BlankPresenter.java.ftl | 4 ++-- .../app_package/presentation/view/BlankView.java.ftl | 2 +- .../app_package/ui/fragment/BlankFragment.java.ftl | 4 ++-- moxy-templates/Kotlin/MoxyActivity/globals.xml.ftl | 4 ++-- .../presentation/presenter/BlankPresenter.kt.ftl | 4 ++-- .../app_package/presentation/view/BlankView.kt.ftl | 2 +- .../src/app_package/ui/activity/BlankActivity.kt.ftl | 4 ++-- .../presentation/presenter/BlankPresenter.kt.ftl | 4 ++-- .../app_package/presentation/view/BlankView.kt.ftl | 2 +- .../src/app_package/ui/fragment/BlankFragment.kt.ftl | 4 ++-- moxy-templates/common/MoxyActivity/globals.xml.ftl | 4 ++-- .../presentation/presenter/BlankPresenter.java.ftl | 4 ++-- .../presentation/presenter/BlankPresenter.kt.ftl | 4 ++-- .../app_package/presentation/view/BlankView.java.ftl | 2 +- .../app_package/presentation/view/BlankView.kt.ftl | 2 +- .../app_package/ui/activity/BlankActivity.java.ftl | 4 ++-- .../src/app_package/ui/activity/BlankActivity.kt.ftl | 4 ++-- moxy-templates/common/MoxyFragment/globals.xml.ftl | 4 ++-- .../presentation/presenter/BlankPresenter.java.ftl | 4 ++-- .../presentation/presenter/BlankPresenter.kt.ftl | 4 ++-- .../app_package/presentation/view/BlankView.java.ftl | 2 +- .../app_package/presentation/view/BlankView.kt.ftl | 2 +- .../app_package/ui/fragment/BlankFragment.java.ftl | 4 ++-- .../src/app_package/ui/fragment/BlankFragment.kt.ftl | 4 ++-- moxy/src/main/java/com/omegar/mvp/MvpDelegate.java | 2 +- moxy/src/test/resources/params/EmptyParams.java | 4 ++-- .../params/IncorrectCountOfParametersParams.java | 4 ++-- .../resources/params/IncorrectParametersParams.java | 4 ++-- moxy/src/test/resources/params/Params1.java | 4 ++-- moxy/src/test/resources/params/Params2.java | 4 ++-- .../test/resources/params/SeveralMethodParams.java | 4 ++-- moxy/src/test/resources/view/EmptyParamsView.java | 4 ++-- .../view/IncorrectCountOfParametersParamsView.java | 2 +- .../view/IncorrectParametersParamsView.java | 2 +- .../view/InjectPresenterTypeBehaviorView.java | 2 +- .../view/InjectPresenterWithIncorrectParamsView.java | 2 +- moxy/src/test/resources/view/PositiveParamsView.java | 2 +- .../test/resources/view/SeveralMethodParamsView.java | 2 +- moxy/src/test/resources/view/SeveralParamsView.java | 4 ++-- .../presentation/launch/AddToEndSingleTagStrategy.kt | 6 +++--- .../app/presentation/launch/LaunchFragment.kt | 6 +++--- .../app/presentation/launch/LaunchPresenter.kt | 4 ++-- .../app/presentation/launch/LaunchView.kt | 8 ++++---- .../app/presentation/launch/SomePresenter.kt | 4 ++-- .../redmadrobot/app/presentation/launch/SomeView.kt | 2 +- sample-github/build.gradle | 8 ++++---- sample-github/src/main/AndroidManifest.xml | 2 +- .../sample/github/mvp/presenters/BasePresenter.java | 4 ++-- .../sample/github/mvp/presenters/HomePresenter.java | 4 ++-- .../github/mvp/presenters/RepositoriesPresenter.java | 2 +- .../mvp/presenters/RepositoryLikesPresenter.java | 2 +- .../github/mvp/presenters/RepositoryPresenter.java | 4 ++-- .../github/mvp/presenters/SignInPresenter.java | 4 ++-- .../github/mvp/presenters/SignOutPresenter.java | 4 ++-- .../github/mvp/presenters/SplashPresenter.java | 2 +- .../omegar/mvp/sample/github/mvp/views/HomeView.java | 8 ++++---- .../sample/github/mvp/views/RepositoriesView.java | 8 ++++---- .../sample/github/mvp/views/RepositoryLikeView.java | 6 +++--- .../sample/github/mvp/views/RepositoryLikesView.java | 6 +++--- .../mvp/sample/github/mvp/views/RepositoryView.java | 2 +- .../mvp/sample/github/mvp/views/SignInView.java | 8 ++++---- .../mvp/sample/github/mvp/views/SignOutView.java | 2 +- .../mvp/sample/github/mvp/views/SplashView.java | 2 +- .../sample/github/ui/activities/HomeActivity.java | 6 +++--- .../sample/github/ui/activities/SignInActivity.java | 6 +++--- .../sample/github/ui/activities/SplashActivity.java | 4 ++-- .../sample/github/ui/adapters/MvpBaseAdapter.java | 2 +- .../github/ui/adapters/RepositoriesAdapter.java | 10 +++++----- .../sample/github/ui/fragments/DetailsFragment.java | 10 +++++----- .../mvp/sample/github/ui/views/RepositoryWidget.java | 6 +++--- .../github/mvp/presenters/HomePresenterTest.java | 2 +- .../mvp/presenters/RepositoriesPresenterTest.java | 2 +- .../mvp/presenters/RepositoryPresenterTest.java | 2 +- .../github/mvp/presenters/SignInPresenterTest.java | 4 ++-- .../github/mvp/presenters/SignOutPresenterTest.java | 2 +- sample-kotlin/build.gradle | 8 ++++---- sample-kotlin/src/main/AndroidManifest.xml | 2 +- .../com/omegar/mvp/sample/kotlin/DialogPresenter.kt | 4 ++-- .../com/omegar/mvp/sample/kotlin/DialogView.kt | 6 +++--- .../com/omegar/mvp/sample/kotlin/MainActivity.kt | 12 ++++++------ sample-kotlin/src/main/res/layout/activity_main.xml | 2 +- 90 files changed, 181 insertions(+), 181 deletions(-) diff --git a/README.md b/README.md index 5f80e371..e0fbf933 100644 --- a/README.md +++ b/README.md @@ -77,15 +77,15 @@ Base modules integration: ```groovy dependencies { ... - implementation 'com.github.Omega-R.OmegaMoxy:moxy:1.5.6' - annotationProcessor 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.5.6' + implementation 'com.github.Omega-R.OmegaMoxy:moxy:1.5.7' + annotationProcessor 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.5.7' } ``` For additional base view classes `MvpActivity` and `MvpFragment` add this: ```groovy dependencies { ... - implementation 'com.github.Omega-R.OmegaMoxy:moxy-android:1.5.6' + implementation 'com.github.Omega-R.OmegaMoxy:moxy-android:1.5.7' } ``` @@ -93,14 +93,14 @@ If you are planning to use AndroidX, then you can use `MvpAppCompatActivity` and ```groovy dependencies { ... - implementation 'com.github.Omega-R.OmegaMoxy:moxy-androidx:1.5.6' + implementation 'com.github.Omega-R.OmegaMoxy:moxy-androidx:1.5.7' } ``` If you are planning to use AppCompat, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this: ```groovy dependencies { ... - implementation 'com.arello-mobile:moxy-app-compat:1.5.6' + implementation 'com.github.Omega-R.OmegaMoxy:moxy-app-compat:1.5.7' implementation 'com.android.support:appcompat-v7:$support_version' } ``` @@ -111,7 +111,7 @@ apply plugin: 'kotlin-kapt' dependencies { ... - kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.5.6' + kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.5.7' } ``` diff --git a/moxy-androidx-sapmle/build.gradle b/moxy-androidx-sapmle/build.gradle index 5ae60feb..50b4f4a0 100644 --- a/moxy-androidx-sapmle/build.gradle +++ b/moxy-androidx-sapmle/build.gradle @@ -18,7 +18,7 @@ android { compileSdkVersion 28 defaultConfig { - applicationId "com.arellomobile.mvp.sample.androidx" + applicationId "com.omegar.mvp.sample.androidx" minSdkVersion 16 targetSdkVersion 28 versionCode 1 diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java index ec79ea01..515e6302 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java @@ -49,7 +49,7 @@ @SuppressWarnings("unused") @AutoService(Processor.class) public class MvpCompiler extends AbstractProcessor { - public static final String MOXY_REFLECTOR_DEFAULT_PACKAGE = "com.arellomobile.mvp"; + public static final String MOXY_REFLECTOR_DEFAULT_PACKAGE = "com.omegar.mvp"; private static final String OPTION_MOXY_REFLECTOR_PACKAGE = "moxyReflectorPackage"; diff --git a/moxy-compiler/src/test/resources/multimodules/app/MoxyReflector.java b/moxy-compiler/src/test/resources/multimodules/app/MoxyReflector.java index 1d56f984..e3c692ad 100644 --- a/moxy-compiler/src/test/resources/multimodules/app/MoxyReflector.java +++ b/moxy-compiler/src/test/resources/multimodules/app/MoxyReflector.java @@ -1,4 +1,4 @@ -package com.arellomobile.mvp; +package com.omegar.mvp; import com.omegar.mvp.ViewStateProvider; diff --git a/moxy-templates/Java/MoxyActivity/globals.xml.ftl b/moxy-templates/Java/MoxyActivity/globals.xml.ftl index 72c6e6fa..8907ccf2 100644 --- a/moxy-templates/Java/MoxyActivity/globals.xml.ftl +++ b/moxy-templates/Java/MoxyActivity/globals.xml.ftl @@ -9,8 +9,8 @@ diff --git a/moxy-templates/Java/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl b/moxy-templates/Java/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl index 838befe8..95967fbd 100644 --- a/moxy-templates/Java/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl +++ b/moxy-templates/Java/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl @@ -2,8 +2,8 @@ package ${packageName}.presentation.presenter${dotSubpackage}; <#if applicationPackage??>import ${applicationPackage}.R; import ${packageName}.presentation.view${dotSubpackage}.${viewName}; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; @InjectViewState public class ${presenterName} extends MvpPresenter<${viewName}> { diff --git a/moxy-templates/Java/MoxyActivity/root/src/app_package/presentation/view/BlankView.java.ftl b/moxy-templates/Java/MoxyActivity/root/src/app_package/presentation/view/BlankView.java.ftl index ec5bbb0c..a771398d 100644 --- a/moxy-templates/Java/MoxyActivity/root/src/app_package/presentation/view/BlankView.java.ftl +++ b/moxy-templates/Java/MoxyActivity/root/src/app_package/presentation/view/BlankView.java.ftl @@ -1,6 +1,6 @@ package ${packageName}.presentation.view${dotSubpackage}; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; public interface ${viewName} extends MvpView { diff --git a/moxy-templates/Java/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.java.ftl b/moxy-templates/Java/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.java.ftl index 37798be2..fa7c8e7a 100644 --- a/moxy-templates/Java/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.java.ftl +++ b/moxy-templates/Java/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.java.ftl @@ -13,9 +13,9 @@ import ${superClassFqcn}; import ${packageName}.R; -import com.arellomobile.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.InjectPresenter; <#if createProvidesMethod> -import com.arellomobile.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.presenter.ProvidePresenter; public class ${className} extends ${superClassName} implements ${viewName} { diff --git a/moxy-templates/Java/MoxyFragment/globals.xml.ftl b/moxy-templates/Java/MoxyFragment/globals.xml.ftl index f8379e95..4b1908ed 100644 --- a/moxy-templates/Java/MoxyFragment/globals.xml.ftl +++ b/moxy-templates/Java/MoxyFragment/globals.xml.ftl @@ -9,8 +9,8 @@ diff --git a/moxy-templates/Java/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl b/moxy-templates/Java/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl index 838befe8..95967fbd 100644 --- a/moxy-templates/Java/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl +++ b/moxy-templates/Java/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl @@ -2,8 +2,8 @@ package ${packageName}.presentation.presenter${dotSubpackage}; <#if applicationPackage??>import ${applicationPackage}.R; import ${packageName}.presentation.view${dotSubpackage}.${viewName}; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; @InjectViewState public class ${presenterName} extends MvpPresenter<${viewName}> { diff --git a/moxy-templates/Java/MoxyFragment/root/src/app_package/presentation/view/BlankView.java.ftl b/moxy-templates/Java/MoxyFragment/root/src/app_package/presentation/view/BlankView.java.ftl index ec5bbb0c..a771398d 100644 --- a/moxy-templates/Java/MoxyFragment/root/src/app_package/presentation/view/BlankView.java.ftl +++ b/moxy-templates/Java/MoxyFragment/root/src/app_package/presentation/view/BlankView.java.ftl @@ -1,6 +1,6 @@ package ${packageName}.presentation.view${dotSubpackage}; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; public interface ${viewName} extends MvpView { diff --git a/moxy-templates/Java/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.java.ftl b/moxy-templates/Java/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.java.ftl index 340481d1..718ee029 100644 --- a/moxy-templates/Java/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.java.ftl +++ b/moxy-templates/Java/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.java.ftl @@ -14,9 +14,9 @@ import ${superClassFqcn}; import ${packageName}.R; -import com.arellomobile.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.InjectPresenter; <#if createProvidesMethod> -import com.arellomobile.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.presenter.ProvidePresenter; public class ${className} extends ${superClassName} implements ${viewName} { diff --git a/moxy-templates/Kotlin/MoxyActivity/globals.xml.ftl b/moxy-templates/Kotlin/MoxyActivity/globals.xml.ftl index d46f8ff3..c8c511a0 100644 --- a/moxy-templates/Kotlin/MoxyActivity/globals.xml.ftl +++ b/moxy-templates/Kotlin/MoxyActivity/globals.xml.ftl @@ -9,8 +9,8 @@ diff --git a/moxy-templates/Kotlin/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl b/moxy-templates/Kotlin/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl index ddc221b8..5329e832 100644 --- a/moxy-templates/Kotlin/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl +++ b/moxy-templates/Kotlin/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl @@ -1,7 +1,7 @@ package ${packageName}.presentation.presenter${dotSubpackage} -import com.arellomobile.mvp.InjectViewState -import com.arellomobile.mvp.MvpPresenter +import com.omegar.mvp.InjectViewState +import com.omegar.mvp.MvpPresenter import ${packageName}.presentation.view${dotSubpackage}.${viewName} @InjectViewState diff --git a/moxy-templates/Kotlin/MoxyActivity/root/src/app_package/presentation/view/BlankView.kt.ftl b/moxy-templates/Kotlin/MoxyActivity/root/src/app_package/presentation/view/BlankView.kt.ftl index bd24a774..9455187c 100644 --- a/moxy-templates/Kotlin/MoxyActivity/root/src/app_package/presentation/view/BlankView.kt.ftl +++ b/moxy-templates/Kotlin/MoxyActivity/root/src/app_package/presentation/view/BlankView.kt.ftl @@ -1,6 +1,6 @@ package ${packageName}.presentation.view${dotSubpackage} -import com.arellomobile.mvp.MvpView +import com.omegar.mvp.MvpView interface ${viewName} : MvpView { diff --git a/moxy-templates/Kotlin/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.kt.ftl b/moxy-templates/Kotlin/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.kt.ftl index a924373a..8fd6d671 100644 --- a/moxy-templates/Kotlin/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.kt.ftl +++ b/moxy-templates/Kotlin/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.kt.ftl @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle -import com.arellomobile.mvp.presenter.InjectPresenter +import com.omegar.mvp.presenter.InjectPresenter import ${packageName}.R import ${packageName}.presentation.view${dotSubpackage}.${viewName} import ${packageName}.presentation.presenter${dotSubpackage}.${presenterName} @@ -12,7 +12,7 @@ import ${packageName}.presentation.presenter${dotSubpackage}.${presenterName} import ${superClassFqcn}; <#if createProvidesMethod> -import com.arellomobile.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.presenter.ProvidePresenter; diff --git a/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl b/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl index ddc221b8..5329e832 100644 --- a/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl +++ b/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl @@ -1,7 +1,7 @@ package ${packageName}.presentation.presenter${dotSubpackage} -import com.arellomobile.mvp.InjectViewState -import com.arellomobile.mvp.MvpPresenter +import com.omegar.mvp.InjectViewState +import com.omegar.mvp.MvpPresenter import ${packageName}.presentation.view${dotSubpackage}.${viewName} @InjectViewState diff --git a/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/presentation/view/BlankView.kt.ftl b/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/presentation/view/BlankView.kt.ftl index bd24a774..9455187c 100644 --- a/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/presentation/view/BlankView.kt.ftl +++ b/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/presentation/view/BlankView.kt.ftl @@ -1,6 +1,6 @@ package ${packageName}.presentation.view${dotSubpackage} -import com.arellomobile.mvp.MvpView +import com.omegar.mvp.MvpView interface ${viewName} : MvpView { diff --git a/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl b/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl index 8eeb662e..ca3a32bb 100644 --- a/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl +++ b/moxy-templates/Kotlin/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl @@ -8,8 +8,8 @@ import ${packageName}.R import ${packageName}.presentation.view${dotSubpackage}.${viewName} import ${packageName}.presentation.presenter${dotSubpackage}.${presenterName} -import com.arellomobile.mvp.MvpFragment -import com.arellomobile.mvp.presenter.InjectPresenter +import com.omegar.mvp.MvpFragment +import com.omegar.mvp.presenter.InjectPresenter class ${className} : MvpFragment(), ${viewName} { companion object { diff --git a/moxy-templates/common/MoxyActivity/globals.xml.ftl b/moxy-templates/common/MoxyActivity/globals.xml.ftl index 1ba7a47d..3760bb59 100644 --- a/moxy-templates/common/MoxyActivity/globals.xml.ftl +++ b/moxy-templates/common/MoxyActivity/globals.xml.ftl @@ -9,8 +9,8 @@ diff --git a/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl index 838befe8..95967fbd 100644 --- a/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl +++ b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl @@ -2,8 +2,8 @@ package ${packageName}.presentation.presenter${dotSubpackage}; <#if applicationPackage??>import ${applicationPackage}.R; import ${packageName}.presentation.view${dotSubpackage}.${viewName}; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; @InjectViewState public class ${presenterName} extends MvpPresenter<${viewName}> { diff --git a/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl index ddc221b8..5329e832 100644 --- a/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl +++ b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl @@ -1,7 +1,7 @@ package ${packageName}.presentation.presenter${dotSubpackage} -import com.arellomobile.mvp.InjectViewState -import com.arellomobile.mvp.MvpPresenter +import com.omegar.mvp.InjectViewState +import com.omegar.mvp.MvpPresenter import ${packageName}.presentation.view${dotSubpackage}.${viewName} @InjectViewState diff --git a/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.java.ftl b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.java.ftl index ec5bbb0c..a771398d 100644 --- a/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.java.ftl +++ b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.java.ftl @@ -1,6 +1,6 @@ package ${packageName}.presentation.view${dotSubpackage}; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; public interface ${viewName} extends MvpView { diff --git a/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.kt.ftl b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.kt.ftl index bd24a774..9455187c 100644 --- a/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.kt.ftl +++ b/moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.kt.ftl @@ -1,6 +1,6 @@ package ${packageName}.presentation.view${dotSubpackage} -import com.arellomobile.mvp.MvpView +import com.omegar.mvp.MvpView interface ${viewName} : MvpView { diff --git a/moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.java.ftl b/moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.java.ftl index 37798be2..fa7c8e7a 100644 --- a/moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.java.ftl +++ b/moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.java.ftl @@ -13,9 +13,9 @@ import ${superClassFqcn}; import ${packageName}.R; -import com.arellomobile.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.InjectPresenter; <#if createProvidesMethod> -import com.arellomobile.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.presenter.ProvidePresenter; public class ${className} extends ${superClassName} implements ${viewName} { diff --git a/moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.kt.ftl b/moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.kt.ftl index a924373a..8fd6d671 100644 --- a/moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.kt.ftl +++ b/moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.kt.ftl @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle -import com.arellomobile.mvp.presenter.InjectPresenter +import com.omegar.mvp.presenter.InjectPresenter import ${packageName}.R import ${packageName}.presentation.view${dotSubpackage}.${viewName} import ${packageName}.presentation.presenter${dotSubpackage}.${presenterName} @@ -12,7 +12,7 @@ import ${packageName}.presentation.presenter${dotSubpackage}.${presenterName} import ${superClassFqcn}; <#if createProvidesMethod> -import com.arellomobile.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.presenter.ProvidePresenter; diff --git a/moxy-templates/common/MoxyFragment/globals.xml.ftl b/moxy-templates/common/MoxyFragment/globals.xml.ftl index e4a1a0b1..a868da32 100644 --- a/moxy-templates/common/MoxyFragment/globals.xml.ftl +++ b/moxy-templates/common/MoxyFragment/globals.xml.ftl @@ -9,8 +9,8 @@ diff --git a/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl index 838befe8..95967fbd 100644 --- a/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl +++ b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl @@ -2,8 +2,8 @@ package ${packageName}.presentation.presenter${dotSubpackage}; <#if applicationPackage??>import ${applicationPackage}.R; import ${packageName}.presentation.view${dotSubpackage}.${viewName}; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; @InjectViewState public class ${presenterName} extends MvpPresenter<${viewName}> { diff --git a/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl index ddc221b8..5329e832 100644 --- a/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl +++ b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl @@ -1,7 +1,7 @@ package ${packageName}.presentation.presenter${dotSubpackage} -import com.arellomobile.mvp.InjectViewState -import com.arellomobile.mvp.MvpPresenter +import com.omegar.mvp.InjectViewState +import com.omegar.mvp.MvpPresenter import ${packageName}.presentation.view${dotSubpackage}.${viewName} @InjectViewState diff --git a/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.java.ftl b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.java.ftl index ec5bbb0c..a771398d 100644 --- a/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.java.ftl +++ b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.java.ftl @@ -1,6 +1,6 @@ package ${packageName}.presentation.view${dotSubpackage}; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; public interface ${viewName} extends MvpView { diff --git a/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.kt.ftl b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.kt.ftl index bd24a774..9455187c 100644 --- a/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.kt.ftl +++ b/moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.kt.ftl @@ -1,6 +1,6 @@ package ${packageName}.presentation.view${dotSubpackage} -import com.arellomobile.mvp.MvpView +import com.omegar.mvp.MvpView interface ${viewName} : MvpView { diff --git a/moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.java.ftl b/moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.java.ftl index 340481d1..718ee029 100644 --- a/moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.java.ftl +++ b/moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.java.ftl @@ -14,9 +14,9 @@ import ${superClassFqcn}; import ${packageName}.R; -import com.arellomobile.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.InjectPresenter; <#if createProvidesMethod> -import com.arellomobile.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.presenter.ProvidePresenter; public class ${className} extends ${superClassName} implements ${viewName} { diff --git a/moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl b/moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl index 29a7c218..fe476595 100644 --- a/moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl +++ b/moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl @@ -8,8 +8,8 @@ import ${packageName}.R import ${packageName}.presentation.view${dotSubpackage}.${viewName} import ${packageName}.presentation.presenter${dotSubpackage}.${presenterName} -import com.arellomobile.mvp.MvpFragment -import com.arellomobile.mvp.presenter.InjectPresenter +import com.omegar.mvp.MvpFragment +import com.omegar.mvp.presenter.InjectPresenter class ${className} : MvpFragment(), ${viewName} { companion object { diff --git a/moxy/src/main/java/com/omegar/mvp/MvpDelegate.java b/moxy/src/main/java/com/omegar/mvp/MvpDelegate.java index e0a20736..5586812f 100644 --- a/moxy/src/main/java/com/omegar/mvp/MvpDelegate.java +++ b/moxy/src/main/java/com/omegar/mvp/MvpDelegate.java @@ -259,7 +259,7 @@ public Bundle getChildrenSaveState() { /** * @return generated tag in format: <parent_delegate_tag> <delegated_class_full_name>$MvpDelegate@<hashCode> *

      - * example: com.arellomobile.mvp.sample.SampleFragment$MvpDelegate@32649b0 + * example: com.omegar.mvp.sample.SampleFragment$MvpDelegate@32649b0 */ private String generateTag() { String tag = mParentDelegate != null ? mParentDelegate.mDelegateTag + " " : ""; diff --git a/moxy/src/test/resources/params/EmptyParams.java b/moxy/src/test/resources/params/EmptyParams.java index de125b96..8e12fed1 100644 --- a/moxy/src/test/resources/params/EmptyParams.java +++ b/moxy/src/test/resources/params/EmptyParams.java @@ -1,7 +1,7 @@ package params; -import com.arellomobile.mvp.ParamsProvider; -import com.arellomobile.mvp.factory.MockPresenterFactory; +import com.omegar.mvp.ParamsProvider; +import com.omegar.mvp.factory.MockPresenterFactory; /** * Date: 24.02.2016 diff --git a/moxy/src/test/resources/params/IncorrectCountOfParametersParams.java b/moxy/src/test/resources/params/IncorrectCountOfParametersParams.java index eb4d50f1..4b43e354 100644 --- a/moxy/src/test/resources/params/IncorrectCountOfParametersParams.java +++ b/moxy/src/test/resources/params/IncorrectCountOfParametersParams.java @@ -1,7 +1,7 @@ package params; -import com.arellomobile.mvp.ParamsProvider; -import com.arellomobile.mvp.factory.MockPresenterFactory; +import com.omegar.mvp.ParamsProvider; +import com.omegar.mvp.factory.MockPresenterFactory; /** * Date: 24.02.2016 diff --git a/moxy/src/test/resources/params/IncorrectParametersParams.java b/moxy/src/test/resources/params/IncorrectParametersParams.java index 293828a7..bb673c12 100644 --- a/moxy/src/test/resources/params/IncorrectParametersParams.java +++ b/moxy/src/test/resources/params/IncorrectParametersParams.java @@ -1,7 +1,7 @@ package params; -import com.arellomobile.mvp.ParamsProvider; -import com.arellomobile.mvp.factory.MockPresenterFactory; +import com.omegar.mvp.ParamsProvider; +import com.omegar.mvp.factory.MockPresenterFactory; /** * Date: 24.02.2016 diff --git a/moxy/src/test/resources/params/Params1.java b/moxy/src/test/resources/params/Params1.java index e5d29701..42c606b3 100644 --- a/moxy/src/test/resources/params/Params1.java +++ b/moxy/src/test/resources/params/Params1.java @@ -1,7 +1,7 @@ package params; -import com.arellomobile.mvp.ParamsProvider; -import com.arellomobile.mvp.factory.MockPresenterFactory; +import com.omegar.mvp.ParamsProvider; +import com.omegar.mvp.factory.MockPresenterFactory; /** * Date: 25.02.2016 diff --git a/moxy/src/test/resources/params/Params2.java b/moxy/src/test/resources/params/Params2.java index cc45fab0..18922ac2 100644 --- a/moxy/src/test/resources/params/Params2.java +++ b/moxy/src/test/resources/params/Params2.java @@ -1,7 +1,7 @@ package params; -import com.arellomobile.mvp.ParamsProvider; -import com.arellomobile.mvp.factory.MockPresenterFactory; +import com.omegar.mvp.ParamsProvider; +import com.omegar.mvp.factory.MockPresenterFactory; /** * Date: 25.02.2016 diff --git a/moxy/src/test/resources/params/SeveralMethodParams.java b/moxy/src/test/resources/params/SeveralMethodParams.java index 751920e9..030ca62c 100644 --- a/moxy/src/test/resources/params/SeveralMethodParams.java +++ b/moxy/src/test/resources/params/SeveralMethodParams.java @@ -1,7 +1,7 @@ package params; -import com.arellomobile.mvp.ParamsProvider; -import com.arellomobile.mvp.factory.MockPresenterFactory; +import com.omegar.mvp.ParamsProvider; +import com.omegar.mvp.factory.MockPresenterFactory; /** * Date: 24.02.2016 diff --git a/moxy/src/test/resources/view/EmptyParamsView.java b/moxy/src/test/resources/view/EmptyParamsView.java index 084ad4b5..2137de8b 100644 --- a/moxy/src/test/resources/view/EmptyParamsView.java +++ b/moxy/src/test/resources/view/EmptyParamsView.java @@ -1,8 +1,8 @@ -package com.arellomobile.mvp.compiler.view; +package com.omegar.mvp.compiler.view; import com.omegar.mvp.MvpPresenter; import com.omegar.mvp.MvpView; -import com.arellomobile.mvp.factory.MockPresenterFactory; +import com.omegar.mvp.factory.MockPresenterFactory; import com.omegar.mvp.presenter.InjectPresenter; import com.omegar.mvp.presenter.PresenterType; diff --git a/moxy/src/test/resources/view/IncorrectCountOfParametersParamsView.java b/moxy/src/test/resources/view/IncorrectCountOfParametersParamsView.java index 8e663f00..0591eb69 100644 --- a/moxy/src/test/resources/view/IncorrectCountOfParametersParamsView.java +++ b/moxy/src/test/resources/view/IncorrectCountOfParametersParamsView.java @@ -1,7 +1,7 @@ package view; import com.omegar.mvp.MvpView; -import com.arellomobile.mvp.factory.MockPresenterFactory; +import com.omegar.mvp.factory.MockPresenterFactory; import com.omegar.mvp.presenter.InjectPresenter; import com.omegar.mvp.presenter.InjectViewStatePresenter; import com.omegar.mvp.presenter.PresenterType; diff --git a/moxy/src/test/resources/view/IncorrectParametersParamsView.java b/moxy/src/test/resources/view/IncorrectParametersParamsView.java index 50f4ca9b..ec9522f4 100644 --- a/moxy/src/test/resources/view/IncorrectParametersParamsView.java +++ b/moxy/src/test/resources/view/IncorrectParametersParamsView.java @@ -1,7 +1,7 @@ package view; import com.omegar.mvp.MvpView; -import com.arellomobile.mvp.factory.MockPresenterFactory; +import com.omegar.mvp.factory.MockPresenterFactory; import com.omegar.mvp.presenter.InjectPresenter; import com.omegar.mvp.presenter.InjectViewStatePresenter; import com.omegar.mvp.presenter.PresenterType; diff --git a/moxy/src/test/resources/view/InjectPresenterTypeBehaviorView.java b/moxy/src/test/resources/view/InjectPresenterTypeBehaviorView.java index 810e5778..21947e00 100644 --- a/moxy/src/test/resources/view/InjectPresenterTypeBehaviorView.java +++ b/moxy/src/test/resources/view/InjectPresenterTypeBehaviorView.java @@ -1,7 +1,7 @@ package view; import com.omegar.mvp.MvpView; -import com.arellomobile.mvp.factory.MockPresenterFactory; +import com.omegar.mvp.factory.MockPresenterFactory; import com.omegar.mvp.presenter.InjectPresenter; import com.omegar.mvp.presenter.PresenterType; diff --git a/moxy/src/test/resources/view/InjectPresenterWithIncorrectParamsView.java b/moxy/src/test/resources/view/InjectPresenterWithIncorrectParamsView.java index b59f9e12..95b663f1 100644 --- a/moxy/src/test/resources/view/InjectPresenterWithIncorrectParamsView.java +++ b/moxy/src/test/resources/view/InjectPresenterWithIncorrectParamsView.java @@ -1,6 +1,6 @@ package view; -import com.arellomobile.mvp.factory.MockPresenterFactory2; +import com.omegar.mvp.factory.MockPresenterFactory2; import com.omegar.mvp.presenter.InjectPresenter; import com.omegar.mvp.presenter.PresenterType; import com.omegar.mvp.presenter.TestViewPresenter; diff --git a/moxy/src/test/resources/view/PositiveParamsView.java b/moxy/src/test/resources/view/PositiveParamsView.java index 6385f79b..cf34ae7a 100644 --- a/moxy/src/test/resources/view/PositiveParamsView.java +++ b/moxy/src/test/resources/view/PositiveParamsView.java @@ -1,7 +1,7 @@ package view; import com.omegar.mvp.MvpView; -import com.arellomobile.mvp.factory.MockPresenterFactory; +import com.omegar.mvp.factory.MockPresenterFactory; import com.omegar.mvp.presenter.InjectPresenter; import com.omegar.mvp.presenter.PresenterType; diff --git a/moxy/src/test/resources/view/SeveralMethodParamsView.java b/moxy/src/test/resources/view/SeveralMethodParamsView.java index 25c3d5c2..c4a304c9 100644 --- a/moxy/src/test/resources/view/SeveralMethodParamsView.java +++ b/moxy/src/test/resources/view/SeveralMethodParamsView.java @@ -1,7 +1,7 @@ package view; import com.omegar.mvp.MvpView; -import com.arellomobile.mvp.factory.MockPresenterFactory; +import com.omegar.mvp.factory.MockPresenterFactory; import com.omegar.mvp.presenter.InjectPresenter; import com.omegar.mvp.presenter.InjectViewStatePresenter; import com.omegar.mvp.presenter.PresenterType; diff --git a/moxy/src/test/resources/view/SeveralParamsView.java b/moxy/src/test/resources/view/SeveralParamsView.java index 38cef879..bcca0f67 100644 --- a/moxy/src/test/resources/view/SeveralParamsView.java +++ b/moxy/src/test/resources/view/SeveralParamsView.java @@ -1,8 +1,8 @@ package view; import com.omegar.mvp.MvpView; -import com.arellomobile.mvp.params.MockParams; -import com.arellomobile.mvp.params.MockParams2; +import com.omegar.mvp.params.MockParams; +import com.omegar.mvp.params.MockParams2; import params.Params1; import params.Params2; diff --git a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/AddToEndSingleTagStrategy.kt b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/AddToEndSingleTagStrategy.kt index 913ce048..8ac7092f 100644 --- a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/AddToEndSingleTagStrategy.kt +++ b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/AddToEndSingleTagStrategy.kt @@ -1,8 +1,8 @@ package com.redmadrobot.app.presentation.launch -import com.arellomobile.mvp.MvpView -import com.arellomobile.mvp.viewstate.ViewCommand -import com.arellomobile.mvp.viewstate.strategy.StateStrategy +import com.omegar.mvp.MvpView +import com.omegar.mvp.viewstate.ViewCommand +import com.omegar.mvp.viewstate.strategy.StateStrategy class AddToEndSingleTagStrategy : StateStrategy { diff --git a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt index 229ff189..e8143226 100644 --- a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt +++ b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt @@ -11,9 +11,9 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.arellomobile.mvp.MvpAppCompatFragment -import com.arellomobile.mvp.presenter.InjectPresenter -import com.arellomobile.mvp.presenter.ProvidePresenter +import com.omegar.mvp.MvpAppCompatFragment +import com.omegar.mvp.presenter.InjectPresenter +import com.omegar.mvp.presenter.ProvidePresenter import com.redmadrobot.sample_custom_strategy.R import kotlinx.android.synthetic.main.fragment_launch.* diff --git a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchPresenter.kt b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchPresenter.kt index edfbd241..2dbfde2d 100644 --- a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchPresenter.kt +++ b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchPresenter.kt @@ -1,8 +1,8 @@ package com.redmadrobot.app.presentation.launch -import com.arellomobile.mvp.InjectViewState -import com.arellomobile.mvp.MvpPresenter +import com.omegar.mvp.InjectViewState +import com.omegar.mvp.MvpPresenter @InjectViewState class LaunchPresenter : MvpPresenter() { diff --git a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchView.kt b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchView.kt index 6bf008cb..4b41f683 100644 --- a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchView.kt +++ b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchView.kt @@ -1,9 +1,9 @@ package com.redmadrobot.app.presentation.launch -import com.arellomobile.mvp.MvpView -import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy -import com.arellomobile.mvp.viewstate.strategy.OneExecutionStateStrategy -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType +import com.omegar.mvp.MvpView +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy +import com.omegar.mvp.viewstate.strategy.OneExecutionStateStrategy +import com.omegar.mvp.viewstate.strategy.StateStrategyType interface LaunchView : MvpView { @StateStrategyType(AddToEndSingleStrategy::class, tag = BURGER_TAG) diff --git a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/SomePresenter.kt b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/SomePresenter.kt index d0be65ae..08f7c076 100644 --- a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/SomePresenter.kt +++ b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/SomePresenter.kt @@ -1,7 +1,7 @@ package com.redmadrobot.app.presentation.launch -import com.arellomobile.mvp.InjectViewState -import com.arellomobile.mvp.MvpPresenter +import com.omegar.mvp.InjectViewState +import com.omegar.mvp.MvpPresenter @InjectViewState class SomePresenter : MvpPresenter() { diff --git a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/SomeView.kt b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/SomeView.kt index 9908075a..2df341eb 100644 --- a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/SomeView.kt +++ b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/SomeView.kt @@ -1,6 +1,6 @@ package com.redmadrobot.app.presentation.launch -import com.arellomobile.mvp.MvpView +import com.omegar.mvp.MvpView interface SomeView : MvpView { fun toggleCheese(enable: Boolean) diff --git a/sample-github/build.gradle b/sample-github/build.gradle index 56e87037..79ee8b01 100644 --- a/sample-github/build.gradle +++ b/sample-github/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 28 defaultConfig { - applicationId "com.arellomobile.mvp.sample.github" + applicationId "com.omegar.mvp.sample.github" minSdkVersion 14 targetSdkVersion 28 versionCode 1 @@ -65,7 +65,7 @@ dependencies { testImplementation "org.hamcrest:hamcrest-all:1.3" testImplementation "org.robolectric:robolectric:3.1-rc1" - implementation 'com.arello-mobile:moxy:1.5.6' - implementation 'com.arello-mobile:moxy-app-compat:1.5.6' - annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.6' + implementation 'com.github.Omega-R.OmegaMoxy:moxy:1.5.7' + implementation 'com.github.Omega-R.OmegaMoxy:moxy-app-compat:1.5.7' + annotationProcessor 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.5.7' } \ No newline at end of file diff --git a/sample-github/src/main/AndroidManifest.xml b/sample-github/src/main/AndroidManifest.xml index 63e5d79d..14c2f17b 100644 --- a/sample-github/src/main/AndroidManifest.xml +++ b/sample-github/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.omegar.mvp.sample.github"> diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/BasePresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/BasePresenter.java index ee184948..0ea47723 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/BasePresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/BasePresenter.java @@ -2,8 +2,8 @@ import android.support.annotation.NonNull; -import com.arellomobile.mvp.MvpPresenter; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.MvpView; import rx.Subscription; import rx.subscriptions.CompositeSubscription; diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/HomePresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/HomePresenter.java index 82115d33..f2860913 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/HomePresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/HomePresenter.java @@ -2,8 +2,8 @@ import com.omegar.mvp.sample.github.mvp.models.Repository; import com.omegar.mvp.sample.github.mvp.views.HomeView; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; /** * Date: 27.01.2016 diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoriesPresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoriesPresenter.java index 4aec00a1..2740fade 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoriesPresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoriesPresenter.java @@ -2,7 +2,7 @@ import java.util.List; -import com.arellomobile.mvp.InjectViewState; +import com.omegar.mvp.InjectViewState; import com.omegar.mvp.sample.github.app.GithubApi; import com.omegar.mvp.sample.github.app.GithubApp; import com.omegar.mvp.sample.github.common.Utils; diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryLikesPresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryLikesPresenter.java index 2b75cda0..02fa7ef3 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryLikesPresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryLikesPresenter.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import com.arellomobile.mvp.InjectViewState; +import com.omegar.mvp.InjectViewState; import com.omegar.mvp.sample.github.mvp.views.RepositoryLikesView; import rx.Observable; diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryPresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryPresenter.java index cdc5c159..27bed5e2 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryPresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryPresenter.java @@ -2,8 +2,8 @@ import java.util.List; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; import com.omegar.mvp.sample.github.mvp.models.Repository; import com.omegar.mvp.sample.github.mvp.views.RepositoryView; diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SignInPresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SignInPresenter.java index 93faa70b..40519a05 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SignInPresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SignInPresenter.java @@ -3,8 +3,8 @@ import android.text.TextUtils; import android.util.Base64; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.sample.github.R; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.sample.github.R; import com.omegar.mvp.sample.github.app.GithubApp; import com.omegar.mvp.sample.github.common.Utils; import com.omegar.mvp.sample.github.mvp.GithubService; diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SignOutPresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SignOutPresenter.java index f9d23242..855fa64b 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SignOutPresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SignOutPresenter.java @@ -2,8 +2,8 @@ import com.omegar.mvp.sample.github.mvp.common.AuthUtils; import com.omegar.mvp.sample.github.mvp.views.SignOutView; -import com.arellomobile.mvp.InjectViewState; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; /** * Date: 18.01.2016 diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SplashPresenter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SplashPresenter.java index a2982280..85a89352 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SplashPresenter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/presenters/SplashPresenter.java @@ -2,7 +2,7 @@ import android.text.TextUtils; -import com.arellomobile.mvp.MvpPresenter; +import com.omegar.mvp.MvpPresenter; import com.omegar.mvp.sample.github.mvp.common.AuthUtils; import com.omegar.mvp.sample.github.mvp.views.SplashView; diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/HomeView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/HomeView.java index db134ef3..39bb5a52 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/HomeView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/HomeView.java @@ -1,10 +1,10 @@ package com.omegar.mvp.sample.github.mvp.views; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; import com.omegar.mvp.sample.github.mvp.models.Repository; -import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; -import com.arellomobile.mvp.viewstate.strategy.OneExecutionStateStrategy; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.OneExecutionStateStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; /** * Date: 27.01.2016 diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoriesView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoriesView.java index 7ca9510c..ee63d52c 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoriesView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoriesView.java @@ -3,10 +3,10 @@ import java.util.List; import com.omegar.mvp.sample.github.mvp.models.Repository; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; -import com.arellomobile.mvp.viewstate.strategy.AddToEndStrategy; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.AddToEndStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; /** * Date: 22.01.2016 diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryLikeView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryLikeView.java index da2a2942..72d0159c 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryLikeView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryLikeView.java @@ -1,8 +1,8 @@ package com.omegar.mvp.sample.github.mvp.views; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.strategy.SingleStateStrategy; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.strategy.SingleStateStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; /** * Created by senneco on 23.10.2016 diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryLikesView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryLikesView.java index 395fef71..ba389948 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryLikesView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryLikesView.java @@ -2,9 +2,9 @@ import java.util.List; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; /** * Date: 26.01.2016 diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryView.java index a2c4d08b..799f0f8b 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/RepositoryView.java @@ -1,7 +1,7 @@ package com.omegar.mvp.sample.github.mvp.views; import com.omegar.mvp.sample.github.mvp.models.Repository; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; /** * Date: 27.01.2016 diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SignInView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SignInView.java index 5b9de0a9..41549b66 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SignInView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SignInView.java @@ -1,9 +1,9 @@ package com.omegar.mvp.sample.github.mvp.views; -import com.arellomobile.mvp.MvpView; -import com.arellomobile.mvp.viewstate.strategy.AddToEndSingleStrategy; -import com.arellomobile.mvp.viewstate.strategy.SkipStrategy; -import com.arellomobile.mvp.viewstate.strategy.StateStrategyType; +import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.SkipStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; /** * Date: 15.01.2016 diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SignOutView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SignOutView.java index 5a6b60a6..28f5902d 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SignOutView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SignOutView.java @@ -1,6 +1,6 @@ package com.omegar.mvp.sample.github.mvp.views; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; /** * Date: 18.01.2016 diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SplashView.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SplashView.java index 9e550751..a57e9a1f 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SplashView.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/mvp/views/SplashView.java @@ -1,6 +1,6 @@ package com.omegar.mvp.sample.github.mvp.views; -import com.arellomobile.mvp.MvpView; +import com.omegar.mvp.MvpView; /** * Date: 18.01.2016 diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/HomeActivity.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/HomeActivity.java index ed70a62e..875ed596 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/HomeActivity.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/HomeActivity.java @@ -15,9 +15,9 @@ import android.widget.ProgressBar; import android.widget.TextView; -import com.arellomobile.mvp.MvpAppCompatActivity; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.sample.github.R; +import com.omegar.mvp.MvpAppCompatActivity; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.sample.github.R; import com.omegar.mvp.sample.github.mvp.models.Repository; import com.omegar.mvp.sample.github.mvp.presenters.HomePresenter; import com.omegar.mvp.sample.github.mvp.presenters.RepositoriesPresenter; diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/SignInActivity.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/SignInActivity.java index eaaedbb0..0b7873a1 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/SignInActivity.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/SignInActivity.java @@ -8,9 +8,9 @@ import android.widget.Button; import android.widget.EditText; -import com.arellomobile.mvp.MvpAppCompatActivity; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.sample.github.R; +import com.omegar.mvp.MvpAppCompatActivity; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.sample.github.R; import com.omegar.mvp.sample.github.mvp.presenters.SignInPresenter; import com.omegar.mvp.sample.github.mvp.views.SignInView; diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/SplashActivity.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/SplashActivity.java index 670be1ca..ef323249 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/SplashActivity.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/activities/SplashActivity.java @@ -3,8 +3,8 @@ import android.content.Intent; import android.os.Bundle; -import com.arellomobile.mvp.MvpAppCompatActivity; -import com.arellomobile.mvp.presenter.InjectPresenter; +import com.omegar.mvp.MvpAppCompatActivity; +import com.omegar.mvp.presenter.InjectPresenter; import com.omegar.mvp.sample.github.mvp.presenters.SplashPresenter; import com.omegar.mvp.sample.github.mvp.views.SplashView; diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/adapters/MvpBaseAdapter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/adapters/MvpBaseAdapter.java index a718b944..2f8400f5 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/adapters/MvpBaseAdapter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/adapters/MvpBaseAdapter.java @@ -2,7 +2,7 @@ import android.widget.BaseAdapter; -import com.arellomobile.mvp.MvpDelegate; +import com.omegar.mvp.MvpDelegate; /** * Date: 26.01.2016 diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/adapters/RepositoriesAdapter.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/adapters/RepositoriesAdapter.java index 3d02eceb..4813a7b4 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/adapters/RepositoriesAdapter.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/adapters/RepositoriesAdapter.java @@ -10,11 +10,11 @@ import android.widget.ProgressBar; import android.widget.TextView; -import com.arellomobile.mvp.MvpDelegate; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.PresenterType; -import com.arellomobile.mvp.presenter.ProvidePresenter; -import com.arellomobile.mvp.sample.github.R; +import com.omegar.mvp.MvpDelegate; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.sample.github.R; import com.omegar.mvp.sample.github.mvp.models.Repository; import com.omegar.mvp.sample.github.mvp.presenters.RepositoryLikesPresenter; import com.omegar.mvp.sample.github.mvp.presenters.RepositoryPresenter; diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/fragments/DetailsFragment.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/fragments/DetailsFragment.java index b7bd40bc..7688e12a 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/fragments/DetailsFragment.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/fragments/DetailsFragment.java @@ -9,11 +9,11 @@ import android.view.ViewGroup; import android.widget.ImageButton; -import com.arellomobile.mvp.MvpAppCompatFragment; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.PresenterType; -import com.arellomobile.mvp.presenter.ProvidePresenter; -import com.arellomobile.mvp.sample.github.R; +import com.omegar.mvp.MvpAppCompatFragment; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.PresenterType; +import com.omegar.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.sample.github.R; import com.omegar.mvp.sample.github.mvp.models.Repository; import com.omegar.mvp.sample.github.mvp.presenters.RepositoryLikesPresenter; import com.omegar.mvp.sample.github.mvp.presenters.RepositoryPresenter; diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/views/RepositoryWidget.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/views/RepositoryWidget.java index b085ba40..73acade6 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/views/RepositoryWidget.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/ui/views/RepositoryWidget.java @@ -6,9 +6,9 @@ import android.util.AttributeSet; import android.widget.TextView; -import com.arellomobile.mvp.MvpDelegate; -import com.arellomobile.mvp.presenter.InjectPresenter; -import com.arellomobile.mvp.presenter.ProvidePresenter; +import com.omegar.mvp.MvpDelegate; +import com.omegar.mvp.presenter.InjectPresenter; +import com.omegar.mvp.presenter.ProvidePresenter; import com.omegar.mvp.sample.github.mvp.models.Repository; import com.omegar.mvp.sample.github.mvp.presenters.RepositoryPresenter; import com.omegar.mvp.sample.github.mvp.views.RepositoryView; diff --git a/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/HomePresenterTest.java b/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/HomePresenterTest.java index 2a7f51f3..2306fc00 100644 --- a/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/HomePresenterTest.java +++ b/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/HomePresenterTest.java @@ -2,7 +2,7 @@ import com.omegar.mvp.sample.github.mvp.models.Repository; import com.omegar.mvp.sample.github.mvp.views.HomeView; -import com.arellomobile.mvp.sample.github.mvp.views.HomeView$$State; +import com.omegar.mvp.sample.github.mvp.views.HomeView$$State; import org.junit.Before; import org.junit.Test; diff --git a/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoriesPresenterTest.java b/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoriesPresenterTest.java index 02e74777..7130658a 100644 --- a/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoriesPresenterTest.java +++ b/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoriesPresenterTest.java @@ -6,7 +6,7 @@ import com.omegar.mvp.sample.github.di.AppComponent; import com.omegar.mvp.sample.github.mvp.GithubService; import com.omegar.mvp.sample.github.mvp.models.Repository; -import com.arellomobile.mvp.sample.github.mvp.views.RepositoriesView$$State; +import com.omegar.mvp.sample.github.mvp.views.RepositoriesView$$State; import com.omegar.mvp.sample.github.test.GithubSampleTestRunner; import com.omegar.mvp.sample.github.test.TestComponent; import com.omegar.mvp.sample.github.test.TestComponentRule; diff --git a/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryPresenterTest.java b/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryPresenterTest.java index 3f18d60f..226166cc 100644 --- a/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryPresenterTest.java +++ b/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryPresenterTest.java @@ -3,7 +3,7 @@ import java.util.Collections; import com.omegar.mvp.sample.github.mvp.models.Repository; -import com.arellomobile.mvp.sample.github.mvp.views.RepositoryView$$State; +import com.omegar.mvp.sample.github.mvp.views.RepositoryView$$State; import com.omegar.mvp.sample.github.test.GithubSampleTestRunner; import com.omegar.mvp.sample.github.test.TestComponentRule; diff --git a/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/SignInPresenterTest.java b/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/SignInPresenterTest.java index 20660ab9..d1a6e6c5 100644 --- a/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/SignInPresenterTest.java +++ b/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/SignInPresenterTest.java @@ -5,12 +5,12 @@ import android.content.Context; import android.util.Base64; -import com.arellomobile.mvp.sample.github.R; +import com.omegar.mvp.sample.github.R; import com.omegar.mvp.sample.github.di.AppComponent; import com.omegar.mvp.sample.github.mvp.GithubService; import com.omegar.mvp.sample.github.mvp.common.AuthUtils; import com.omegar.mvp.sample.github.mvp.models.User; -import com.arellomobile.mvp.sample.github.mvp.views.SignInView$$State; +import com.omegar.mvp.sample.github.mvp.views.SignInView$$State; import com.omegar.mvp.sample.github.test.GithubSampleTestRunner; import com.omegar.mvp.sample.github.test.TestComponent; import com.omegar.mvp.sample.github.test.TestComponentRule; diff --git a/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/SignOutPresenterTest.java b/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/SignOutPresenterTest.java index a5bf6cc2..c0e499a8 100644 --- a/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/SignOutPresenterTest.java +++ b/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/SignOutPresenterTest.java @@ -1,7 +1,7 @@ package com.omegar.mvp.sample.github.mvp.presenters; import com.omegar.mvp.sample.github.mvp.common.AuthUtils; -import com.arellomobile.mvp.sample.github.mvp.views.SignOutView$$State; +import com.omegar.mvp.sample.github.mvp.views.SignOutView$$State; import com.omegar.mvp.sample.github.test.GithubSampleTestRunner; import com.omegar.mvp.sample.github.test.TestComponentRule; diff --git a/sample-kotlin/build.gradle b/sample-kotlin/build.gradle index 558130bc..ebb026d0 100644 --- a/sample-kotlin/build.gradle +++ b/sample-kotlin/build.gradle @@ -18,7 +18,7 @@ android { compileSdkVersion 28 defaultConfig { - applicationId "com.arellomobile.mvp.sample.kotlin" + applicationId "com.omegar.mvp.sample.kotlin" minSdkVersion 16 targetSdkVersion 28 versionCode 1 @@ -42,9 +42,9 @@ android { dependencies { implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.arello-mobile:moxy:1.5.6' - implementation 'com.arello-mobile:moxy-app-compat:1.5.6' - kapt 'com.arello-mobile:moxy-compiler:1.5.6' + implementation 'com.github.Omega-R.OmegaMoxy:moxy:1.5.7' + implementation 'com.github.Omega-R.OmegaMoxy:moxy-app-compat:1.5.7' + kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.5.7' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } diff --git a/sample-kotlin/src/main/AndroidManifest.xml b/sample-kotlin/src/main/AndroidManifest.xml index 472cc5ea..4df68246 100644 --- a/sample-kotlin/src/main/AndroidManifest.xml +++ b/sample-kotlin/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.omegar.mvp.sample.kotlin"> Date: Thu, 4 Apr 2019 11:26:25 +0300 Subject: [PATCH 10/36] Update README.md --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index e0fbf933..b540dbfc 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,17 @@ Templates located in [/moxy-templates](https://github.com/Arello-Mobile/Moxy/tre [FAQ](https://github.com/Arello-Mobile/Moxy/wiki/FAQ) ## Integration + +Add the JitPack repository to your build file: +```groovy +allprojects { + repositories { + ... + maven { url 'https://jitpack.io' } + } +} +``` + Base modules integration: ```groovy dependencies { From c4b2134652ef36ecaa250802fe116645b35e1ba1 Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Tue, 30 Apr 2019 11:00:20 +0300 Subject: [PATCH 11/36] Bottom sheet dialog fragment has been added --- .../material/bottomsheet/BottomSheetDialogFragment.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java diff --git a/moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java b/moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java new file mode 100644 index 00000000..49b22940 --- /dev/null +++ b/moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java @@ -0,0 +1,7 @@ +package com.google.android.material.bottomsheet; + +import androidx.appcompat.app.AppCompatDialogFragment; + +public class BottomSheetDialogFragment extends AppCompatDialogFragment { + +} \ No newline at end of file From 8ffc4c8b7dac3a479b5d58953f53713c72e82360 Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Tue, 30 Apr 2019 11:15:24 +0300 Subject: [PATCH 12/36] MvpBottomSheetDialogFragment added --- .../mvp/MvpBottomSheetDialogFragment.java | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java diff --git a/moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java new file mode 100644 index 00000000..bf70340f --- /dev/null +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java @@ -0,0 +1,97 @@ +package com.omegar.mvp; + +import android.os.Build; +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import com.google.android.material.bottomsheet.BottomSheetDialogFragment; + +public class MvpBottomSheetDialogFragment extends BottomSheetDialogFragment { + + private boolean mIsStateSaved; + private MvpDelegate mMvpDelegate; + + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + getMvpDelegate().onCreate(savedInstanceState); + } + + public void onResume() { + super.onResume(); + + mIsStateSaved = false; + + getMvpDelegate().onAttach(); + } + + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + + mIsStateSaved = true; + + getMvpDelegate().onSaveInstanceState(outState); + getMvpDelegate().onDetach(); + } + + @Override + public void onStop() { + super.onStop(); + + getMvpDelegate().onDetach(); + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + + getMvpDelegate().onDetach(); + getMvpDelegate().onDestroyView(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + + //We leave the screen and respectively all fragments will be destroyed + if (getActivity().isFinishing()) { + getMvpDelegate().onDestroy(); + return; + } + + // When we rotate device isRemoving() return true for fragment placed in backstack + // http://stackoverflow.com/questions/34649126/fragment-back-stack-and-isremoving + if (mIsStateSaved) { + mIsStateSaved = false; + return; + } + + // See https://github.com/Arello-Mobile/Moxy/issues/24 + boolean anyParentIsRemoving = false; + + if (Build.VERSION.SDK_INT >= 17) { + Fragment parent = getParentFragment(); + while (!anyParentIsRemoving && parent != null) { + anyParentIsRemoving = parent.isRemoving(); + parent = parent.getParentFragment(); + } + } + + if (isRemoving() || anyParentIsRemoving) { + getMvpDelegate().onDestroy(); + } + } + + /** + * @return The {@link MvpDelegate} being used by this Fragment. + */ + public MvpDelegate getMvpDelegate() { + if (mMvpDelegate == null) { + mMvpDelegate = new MvpDelegate<>(this); + } + + return mMvpDelegate; + } + +} From ab9231365ad912f3eaa82b44deb35418fd9c77b2 Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Wed, 2 Oct 2019 17:07:41 +0300 Subject: [PATCH 13/36] Code generation updated --- .../moxy_androidx_sapmle/BaseActivity.java | 12 +++++ .../com/moxy_androidx_sapmle/BaseView.java | 9 ++++ .../com/moxy_androidx_sapmle/MainActivity.kt | 17 +++--- .../com/moxy_androidx_sapmle/MainView.kt | 9 ++++ .../moxy_androidx_sapmle/NotMainActivity.java | 9 ++++ .../NotMainPresenter.java | 11 ++++ .../com/moxy_androidx_sapmle/NotMainView.java | 7 +++ .../moxy_androidx_sapmle/SecondInterface.kt | 7 +++ .../moxy_androidx_sapmle/first/FirstView.java | 9 ++++ .../com/omegar/mvp/compiler/MvpCompiler.java | 22 +++++++- .../compiler/viewstate/ViewInterfaceInfo.java | 15 ++++++ .../viewstate/ViewInterfaceProcessor.java | 19 +++++-- .../viewstate/ViewStateClassGenerator.java | 53 ++++++++++++++++--- .../omegar/mvp/presenter/PresenterField.java | 1 - .../mvp/sample/github/app/GithubApp.java | 2 +- .../presenters/RepositoryPresenterTest.java | 2 +- 16 files changed, 180 insertions(+), 24 deletions(-) create mode 100644 moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseActivity.java create mode 100644 moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseView.java create mode 100644 moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt create mode 100644 moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainActivity.java create mode 100644 moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainPresenter.java create mode 100644 moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainView.java create mode 100644 moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/SecondInterface.kt create mode 100644 moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseActivity.java b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseActivity.java new file mode 100644 index 00000000..664db103 --- /dev/null +++ b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseActivity.java @@ -0,0 +1,12 @@ +package example.com.moxy_androidx_sapmle; + +import com.omegar.mvp.MvpAppCompatActivity; + +public abstract class BaseActivity extends MvpAppCompatActivity implements BaseView { + + @Override + public void testFunction() { + + } + +} \ No newline at end of file diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseView.java b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseView.java new file mode 100644 index 00000000..2c9ce2c9 --- /dev/null +++ b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseView.java @@ -0,0 +1,9 @@ +package example.com.moxy_androidx_sapmle; + +import com.omegar.mvp.MvpView; + +public interface BaseView extends MvpView { + + void testFunction(); + +} \ No newline at end of file diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt index 023e3e03..534e37a3 100644 --- a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt +++ b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt @@ -3,26 +3,29 @@ package example.com.moxy_androidx_sapmle import android.os.Bundle import android.util.Log import com.omegar.mvp.MvpAppCompatActivity -import com.omegar.mvp.MvpView import com.omegar.mvp.presenter.InjectPresenter -interface MainView : MvpView { - fun printLog(msg: String) -} +class MainActivity : BaseActivity(), MainView, SecondInterface { + + override fun firstMethod() { + TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + } -class MainActivity : MvpAppCompatActivity(), MainView { - @InjectPresenter internal lateinit var presenter: MainPresenter override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) +// setContentView(R.layout.activity_main) } override fun printLog(msg: String) { Log.e(TAG, "printLog : msg : $msg activity hash code : ${hashCode()}") } + + override fun second() { + TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + } companion object { const val TAG = "MoxyDebug" diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt new file mode 100644 index 00000000..076b5dcb --- /dev/null +++ b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt @@ -0,0 +1,9 @@ +package example.com.moxy_androidx_sapmle + +import example.com.moxy_androidx_sapmle.first.FirstView + +interface MainView : FirstView { + + fun printLog(msg: String) + +} \ No newline at end of file diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainActivity.java b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainActivity.java new file mode 100644 index 00000000..b2f2d998 --- /dev/null +++ b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainActivity.java @@ -0,0 +1,9 @@ +package example.com.moxy_androidx_sapmle; + +public class NotMainActivity extends BaseActivity implements NotMainView { + + @Override + public void notMainFunction() { + + } +} diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainPresenter.java b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainPresenter.java new file mode 100644 index 00000000..d75790c9 --- /dev/null +++ b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainPresenter.java @@ -0,0 +1,11 @@ +package example.com.moxy_androidx_sapmle; + +import com.omegar.mvp.InjectViewState; +import com.omegar.mvp.MvpPresenter; + +@InjectViewState +public class NotMainPresenter extends MvpPresenter { + + + +} \ No newline at end of file diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainView.java b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainView.java new file mode 100644 index 00000000..612196dc --- /dev/null +++ b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainView.java @@ -0,0 +1,7 @@ +package example.com.moxy_androidx_sapmle; + +public interface NotMainView extends BaseView { + + void notMainFunction(); + +} diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/SecondInterface.kt b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/SecondInterface.kt new file mode 100644 index 00000000..b1ad0f04 --- /dev/null +++ b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/SecondInterface.kt @@ -0,0 +1,7 @@ +package example.com.moxy_androidx_sapmle + +interface SecondInterface { + + fun second() + +} \ No newline at end of file diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java new file mode 100644 index 00000000..948505f3 --- /dev/null +++ b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java @@ -0,0 +1,9 @@ +package example.com.moxy_androidx_sapmle.first; + +import example.com.moxy_androidx_sapmle.BaseView; + +public interface FirstView extends BaseView { + + void firstMethod(); + +} \ No newline at end of file diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java index ec79ea01..487cfbc4 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java @@ -49,7 +49,7 @@ @SuppressWarnings("unused") @AutoService(Processor.class) public class MvpCompiler extends AbstractProcessor { - public static final String MOXY_REFLECTOR_DEFAULT_PACKAGE = "com.arellomobile.mvp"; + public static final String MOXY_REFLECTOR_DEFAULT_PACKAGE = "com.omegar.mvp"; private static final String OPTION_MOXY_REFLECTOR_PACKAGE = "moxyReflectorPackage"; @@ -136,7 +136,7 @@ private boolean throwableProcess(RoundEnvironment roundEnv) { injectPresenterProcessor, presenterBinderClassGenerator); for (TypeElement usedView : injectViewStateProcessor.getUsedViews()) { - generateCode(usedView, ElementKind.INTERFACE, + generateListCode(usedView, ElementKind.INTERFACE, viewInterfaceProcessor, viewStateClassGenerator); } @@ -204,6 +204,24 @@ private void processInjectors(RoundEnvironment roundEnv, } } + private void generateListCode(Element element, + ElementKind kind, + ElementProcessor> processor, + JavaFilesGenerator> classGenerator) { + if (element.getKind() != kind) { + getMessager().printMessage(Diagnostic.Kind.ERROR, element + " must be " + kind.name()); + } + + //noinspection unchecked + List resultList = processor.process((E) element); + if (resultList == null || resultList.isEmpty()) return; + + List fileList = classGenerator.generate(new ArrayList<>(new HashSet<>(resultList))); + if (fileList == null || fileList.isEmpty()) return; + + for (JavaFile file : fileList) createSourceFile(file); + } + private void generateCode(Element element, ElementKind kind, ElementProcessor processor, diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceInfo.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceInfo.java index 0a10199d..abfb439f 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceInfo.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceInfo.java @@ -58,4 +58,19 @@ List getTypeVariables() { List getMethods() { return methods; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + ViewInterfaceInfo that = (ViewInterfaceInfo) o; + + return name != null ? name.equals(that.name) : that.name == null; + } + + @Override + public int hashCode() { + return name != null ? name.hashCode() : 0; + } } diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java index afe4e75e..bc18fa06 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java @@ -1,10 +1,12 @@ package com.omegar.mvp.compiler.viewstate; +import com.omegar.mvp.MvpView; import com.omegar.mvp.compiler.ElementProcessor; import com.omegar.mvp.compiler.MvpCompiler; import com.omegar.mvp.compiler.Util; import com.omegar.mvp.viewstate.strategy.AddToEndStrategy; import com.omegar.mvp.viewstate.strategy.StateStrategyType; +import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ParameterSpec; import java.util.ArrayList; @@ -33,9 +35,10 @@ * * @author Evgeny Kursakov */ -public class ViewInterfaceProcessor extends ElementProcessor { +public class ViewInterfaceProcessor extends ElementProcessor> { private static final String STATE_STRATEGY_TYPE_ANNOTATION = StateStrategyType.class.getName(); private static final TypeElement DEFAULT_STATE_STRATEGY = MvpCompiler.getElementUtils().getTypeElement(AddToEndStrategy.class.getCanonicalName()); + private static final ClassName MVP_VIEW_CLASS_NAME = ClassName.get(MvpView.class); private TypeElement viewInterfaceElement; private String viewInterfaceName; @@ -46,7 +49,9 @@ public List getUsedStrategies() { } @Override - public ViewInterfaceInfo process(TypeElement element) { + public List process(TypeElement element) { + List list = new ArrayList<>(); + this.viewInterfaceElement = element; viewInterfaceName = element.getSimpleName().toString(); @@ -58,7 +63,10 @@ public ViewInterfaceInfo process(TypeElement element) { getMethods(element, interfaceStateStrategyType, new ArrayList<>(), methods); // Add methods from super interfaces - methods.addAll(iterateInterfaces(0, element, interfaceStateStrategyType, methods, new ArrayList<>())); + for (TypeMirror typeMirror : element.getInterfaces()) { + final TypeElement anInterface = (TypeElement) ((DeclaredType) typeMirror).asElement(); + list.addAll(process(anInterface)); + } // Allow methods be with same names Map methodsCounter = new HashMap<>(); @@ -75,7 +83,10 @@ public ViewInterfaceInfo process(TypeElement element) { methodsCounter.put(method.getName(), counter); } - return new ViewInterfaceInfo(element, methods); + ViewInterfaceInfo info = new ViewInterfaceInfo(element, methods); + if (!info.getName().equals(MVP_VIEW_CLASS_NAME)) list.add(info); + + return list; } diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java index a70ed88c..4f20ab58 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java @@ -12,13 +12,17 @@ import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; +import com.squareup.javapoet.TypeVariableName; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Random; +import javax.annotation.Nullable; import javax.lang.model.element.Modifier; import javax.lang.model.type.DeclaredType; +import javax.tools.Diagnostic; import static com.omegar.mvp.compiler.Util.decapitalizeString; @@ -28,19 +32,53 @@ * * @author Yuri Shmakov */ -public final class ViewStateClassGenerator extends JavaFilesGenerator { +public final class ViewStateClassGenerator extends JavaFilesGenerator> { + + private static final String T = "T"; + private static final TypeVariableName GENERIC_TYPE_VARIABLE_NAME = TypeVariableName.get(T); + private static final ClassName MVP_VIEW_STATE_CLASS_NAME = ClassName.get(MvpViewState.class); + private static final ClassName VIEW_COMMAND_CLASS_NAME = ClassName.get(ViewCommand.class); + private static final ParameterizedTypeName VIEW_COMMAND_TYPE_NAME + = ParameterizedTypeName.get(VIEW_COMMAND_CLASS_NAME, GENERIC_TYPE_VARIABLE_NAME); + private static final ParameterizedTypeName MVP_VIEW_STATE_TYPE_NAME + = ParameterizedTypeName.get(MVP_VIEW_STATE_CLASS_NAME, GENERIC_TYPE_VARIABLE_NAME); @Override - public List generate(ViewInterfaceInfo viewInterfaceInfo) { + public List generate(List list) { + if (list.isEmpty()) return Collections.emptyList(); + + MvpCompiler.getMessager().printMessage(Diagnostic.Kind.WARNING, "Size " + list.size()); + + List fileList = new ArrayList<>(); + fileList.add(generate(list.get(0))); + + for (int i = 1; i < list.size(); i++) { + ViewInterfaceInfo info = list.get(i); + + JavaFile parentClassFile = fileList.get(fileList.size() - 1); + ClassName parentClassName = ClassName.get(parentClassFile.packageName, parentClassFile.typeSpec.name); + + fileList.add(generate(info, parentClassName)); + } + return fileList; + } + + private JavaFile generate(ViewInterfaceInfo viewInterfaceInfo) { + return generate(viewInterfaceInfo, null); + } + + private JavaFile generate(ViewInterfaceInfo viewInterfaceInfo, @Nullable ClassName parentClassName) { ClassName viewName = viewInterfaceInfo.getName(); TypeName nameWithTypeVariables = viewInterfaceInfo.getNameWithTypeVariables(); DeclaredType viewInterfaceType = (DeclaredType) viewInterfaceInfo.getElement().asType(); + TypeVariableName variableName = TypeVariableName.get(T, nameWithTypeVariables); TypeSpec.Builder classBuilder = TypeSpec.classBuilder(viewName.simpleName() + MvpProcessor.VIEW_STATE_SUFFIX) .addModifiers(Modifier.PUBLIC) - .superclass(ParameterizedTypeName.get(ClassName.get(MvpViewState.class), nameWithTypeVariables)) - .addSuperinterface(nameWithTypeVariables) - .addTypeVariables(viewInterfaceInfo.getTypeVariables()); + .superclass(parentClassName == null ? MVP_VIEW_STATE_TYPE_NAME : + ParameterizedTypeName.get(parentClassName, variableName)) + .addTypeVariable(variableName) + .addSuperinterface(nameWithTypeVariables); for (ViewMethod method : viewInterfaceInfo.getMethods()) { TypeSpec commandClass = generateCommandClass(method, nameWithTypeVariables); @@ -48,10 +86,9 @@ public List generate(ViewInterfaceInfo viewInterfaceInfo) { classBuilder.addMethod(generateMethod(viewInterfaceType, method, nameWithTypeVariables, commandClass)); } - JavaFile javaFile = JavaFile.builder(viewName.packageName(), classBuilder.build()) + return JavaFile.builder(viewName.packageName(), classBuilder.build()) .indent("\t") .build(); - return Collections.singletonList(javaFile); } private TypeSpec generateCommandClass(ViewMethod method, TypeName viewTypeName) { @@ -66,7 +103,7 @@ private TypeSpec generateCommandClass(ViewMethod method, TypeName viewTypeName) TypeSpec.Builder classBuilder = TypeSpec.classBuilder(method.getCommandClassName()) .addModifiers(Modifier.PUBLIC) // TODO: private and static .addTypeVariables(method.getTypeVariables()) - .superclass(ParameterizedTypeName.get(ClassName.get(ViewCommand.class), viewTypeName)) + .superclass(VIEW_COMMAND_TYPE_NAME) .addMethod(generateCommandConstructor(method)) .addMethod(applyMethod); diff --git a/moxy/src/main/java/com/omegar/mvp/presenter/PresenterField.java b/moxy/src/main/java/com/omegar/mvp/presenter/PresenterField.java index 3e6597fe..337e0a53 100644 --- a/moxy/src/main/java/com/omegar/mvp/presenter/PresenterField.java +++ b/moxy/src/main/java/com/omegar/mvp/presenter/PresenterField.java @@ -1,6 +1,5 @@ package com.omegar.mvp.presenter; -import com.arellomobile.mvp.*; import com.omegar.mvp.MvpPresenter; /** diff --git a/sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubApp.java b/sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubApp.java index 6b31ceef..555cf5c4 100644 --- a/sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubApp.java +++ b/sample-github/src/main/java/com/omegar/mvp/sample/github/app/GithubApp.java @@ -5,7 +5,7 @@ import android.support.annotation.VisibleForTesting; import com.omegar.mvp.sample.github.di.AppComponent; -import com.arellomobile.mvp.sample.github.di.DaggerAppComponent; +import com.omegar.mvp.sample.github.di.DaggerAppComponent; import com.omegar.mvp.sample.github.di.modules.ContextModule; /** diff --git a/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryPresenterTest.java b/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryPresenterTest.java index 3f18d60f..226166cc 100644 --- a/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryPresenterTest.java +++ b/sample-github/src/test/java/com/omegar/mvp/sample/github/mvp/presenters/RepositoryPresenterTest.java @@ -3,7 +3,7 @@ import java.util.Collections; import com.omegar.mvp.sample.github.mvp.models.Repository; -import com.arellomobile.mvp.sample.github.mvp.views.RepositoryView$$State; +import com.omegar.mvp.sample.github.mvp.views.RepositoryView$$State; import com.omegar.mvp.sample.github.test.GithubSampleTestRunner; import com.omegar.mvp.sample.github.test.TestComponentRule; From fae4282030bca0a41ec7df4b5f759b4d318713e1 Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Thu, 3 Oct 2019 16:00:47 +0300 Subject: [PATCH 14/36] Fixed code generation for generic types --- .../.gitignore | 0 .../build.gradle | 0 .../gradle.properties | 0 .../proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../moxy_androidx_sapmle/BaseActivity.java | 0 .../com/moxy_androidx_sapmle/BaseView.java | 0 .../com/moxy_androidx_sapmle/MainActivity.kt | 6 +-- .../com/moxy_androidx_sapmle/MainPresenter.kt | 2 +- .../com/moxy_androidx_sapmle/MainView.kt | 11 +++++ .../moxy_androidx_sapmle/NotMainActivity.java | 0 .../NotMainPresenter.java | 1 + .../com/moxy_androidx_sapmle/NotMainView.java | 0 .../moxy_androidx_sapmle/SecondInterface.kt | 0 .../moxy_androidx_sapmle/first/FirstView.java | 11 +++++ .../moxy_androidx_sapmle/packagee/Item.java | 4 ++ .../drawable-v24/ic_launcher_foreground.xml | 0 .../res/drawable/ic_launcher_background.xml | 0 .../src/main/res/layout/activity_main.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../src/main/res/values/colors.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 .../com/moxy_androidx_sapmle/MainView.kt | 9 ---- .../moxy_androidx_sapmle/first/FirstView.java | 9 ---- .../com/omegar/mvp/compiler/MvpCompiler.java | 3 +- .../viewstate/ViewInterfaceProcessor.java | 24 +++++++--- .../viewstate/ViewStateClassGenerator.java | 41 ++++++++++++------ .../InjectViewStateProcessor.java | 1 + sample-custom-strategy/build.gradle | 7 ++- .../presentation/launch/LaunchPresenter.kt | 1 - settings.gradle | 2 +- 43 files changed, 85 insertions(+), 47 deletions(-) rename {moxy-androidx-sapmle => moxy-androidx-sample}/.gitignore (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/build.gradle (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/gradle.properties (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/proguard-rules.pro (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/AndroidManifest.xml (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseActivity.java (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseView.java (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt (84%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt (92%) create mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainActivity.java (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainPresenter.java (86%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainView.java (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/kotlin/example/com/moxy_androidx_sapmle/SecondInterface.kt (100%) create mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java create mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/packagee/Item.java rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/drawable/ic_launcher_background.xml (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/layout/activity_main.xml (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/values/colors.xml (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/values/strings.xml (100%) rename {moxy-androidx-sapmle => moxy-androidx-sample}/src/main/res/values/styles.xml (100%) delete mode 100644 moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt delete mode 100644 moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java diff --git a/moxy-androidx-sapmle/.gitignore b/moxy-androidx-sample/.gitignore similarity index 100% rename from moxy-androidx-sapmle/.gitignore rename to moxy-androidx-sample/.gitignore diff --git a/moxy-androidx-sapmle/build.gradle b/moxy-androidx-sample/build.gradle similarity index 100% rename from moxy-androidx-sapmle/build.gradle rename to moxy-androidx-sample/build.gradle diff --git a/moxy-androidx-sapmle/gradle.properties b/moxy-androidx-sample/gradle.properties similarity index 100% rename from moxy-androidx-sapmle/gradle.properties rename to moxy-androidx-sample/gradle.properties diff --git a/moxy-androidx-sapmle/proguard-rules.pro b/moxy-androidx-sample/proguard-rules.pro similarity index 100% rename from moxy-androidx-sapmle/proguard-rules.pro rename to moxy-androidx-sample/proguard-rules.pro diff --git a/moxy-androidx-sapmle/src/main/AndroidManifest.xml b/moxy-androidx-sample/src/main/AndroidManifest.xml similarity index 100% rename from moxy-androidx-sapmle/src/main/AndroidManifest.xml rename to moxy-androidx-sample/src/main/AndroidManifest.xml diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseActivity.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseActivity.java similarity index 100% rename from moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseActivity.java rename to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseActivity.java diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseView.java similarity index 100% rename from moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseView.java rename to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseView.java diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt similarity index 84% rename from moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt rename to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt index 534e37a3..365ec9dc 100644 --- a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt @@ -2,12 +2,12 @@ package example.com.moxy_androidx_sapmle import android.os.Bundle import android.util.Log -import com.omegar.mvp.MvpAppCompatActivity import com.omegar.mvp.presenter.InjectPresenter +import example.com.moxy_androidx_sapmle.packagee.Item class MainActivity : BaseActivity(), MainView, SecondInterface { - override fun firstMethod() { + override fun firstMethod(item: List) { TODO("not implemented") //To change body of created functions use File | Settings | File Templates. } @@ -19,7 +19,7 @@ class MainActivity : BaseActivity(), MainView, SecondInterface { // setContentView(R.layout.activity_main) } - override fun printLog(msg: String) { + override fun printLog(msg: Double?) { Log.e(TAG, "printLog : msg : $msg activity hash code : ${hashCode()}") } diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt similarity index 92% rename from moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt rename to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt index ab64a95c..beefd6c9 100644 --- a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt @@ -10,7 +10,7 @@ class MainPresenter : MvpPresenter() { override fun onFirstViewAttach() { super.onFirstViewAttach() Log.e(MainActivity.TAG, "presenter hash code : ${hashCode()}") - viewState.printLog("TEST") + viewState.printLog(10.0) } } \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt new file mode 100644 index 00000000..ed5a0482 --- /dev/null +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt @@ -0,0 +1,11 @@ +package example.com.moxy_androidx_sapmle + +import example.com.moxy_androidx_sapmle.first.FirstView +import example.com.moxy_androidx_sapmle.packagee.Item +import java.io.Serializable + +interface MainView : FirstView, Serializable { + + fun printLog(msg: Double?) + +} \ No newline at end of file diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainActivity.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainActivity.java similarity index 100% rename from moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainActivity.java rename to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainActivity.java diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainPresenter.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainPresenter.java similarity index 86% rename from moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainPresenter.java rename to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainPresenter.java index d75790c9..acbadc4c 100644 --- a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainPresenter.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainPresenter.java @@ -2,6 +2,7 @@ import com.omegar.mvp.InjectViewState; import com.omegar.mvp.MvpPresenter; +import com.omegar.mvp.MvpView; @InjectViewState public class NotMainPresenter extends MvpPresenter { diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainView.java similarity index 100% rename from moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainView.java rename to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainView.java diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/SecondInterface.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/SecondInterface.kt similarity index 100% rename from moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/SecondInterface.kt rename to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/SecondInterface.kt diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java new file mode 100644 index 00000000..35bc478f --- /dev/null +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java @@ -0,0 +1,11 @@ +package example.com.moxy_androidx_sapmle.first; + +import java.util.List; + +import example.com.moxy_androidx_sapmle.BaseView; + +public interface FirstView extends BaseView{ + + void firstMethod(List item); + +} \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/packagee/Item.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/packagee/Item.java new file mode 100644 index 00000000..740d9c53 --- /dev/null +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/packagee/Item.java @@ -0,0 +1,4 @@ +package example.com.moxy_androidx_sapmle.packagee; + +public class Item { +} diff --git a/moxy-androidx-sapmle/src/main/res/drawable-v24/ic_launcher_foreground.xml b/moxy-androidx-sample/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from moxy-androidx-sapmle/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to moxy-androidx-sample/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/moxy-androidx-sapmle/src/main/res/drawable/ic_launcher_background.xml b/moxy-androidx-sample/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from moxy-androidx-sapmle/src/main/res/drawable/ic_launcher_background.xml rename to moxy-androidx-sample/src/main/res/drawable/ic_launcher_background.xml diff --git a/moxy-androidx-sapmle/src/main/res/layout/activity_main.xml b/moxy-androidx-sample/src/main/res/layout/activity_main.xml similarity index 100% rename from moxy-androidx-sapmle/src/main/res/layout/activity_main.xml rename to moxy-androidx-sample/src/main/res/layout/activity_main.xml diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/moxy-androidx-sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to moxy-androidx-sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/moxy-androidx-sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from moxy-androidx-sapmle/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to moxy-androidx-sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-hdpi/ic_launcher.png b/moxy-androidx-sample/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from moxy-androidx-sapmle/src/main/res/mipmap-hdpi/ic_launcher.png rename to moxy-androidx-sample/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-hdpi/ic_launcher_round.png b/moxy-androidx-sample/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from moxy-androidx-sapmle/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to moxy-androidx-sample/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-mdpi/ic_launcher.png b/moxy-androidx-sample/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from moxy-androidx-sapmle/src/main/res/mipmap-mdpi/ic_launcher.png rename to moxy-androidx-sample/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-mdpi/ic_launcher_round.png b/moxy-androidx-sample/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from moxy-androidx-sapmle/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to moxy-androidx-sample/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xhdpi/ic_launcher.png b/moxy-androidx-sample/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from moxy-androidx-sapmle/src/main/res/mipmap-xhdpi/ic_launcher.png rename to moxy-androidx-sample/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/moxy-androidx-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from moxy-androidx-sapmle/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to moxy-androidx-sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xxhdpi/ic_launcher.png b/moxy-androidx-sample/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from moxy-androidx-sapmle/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to moxy-androidx-sample/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/moxy-androidx-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from moxy-androidx-sapmle/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to moxy-androidx-sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/moxy-androidx-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from moxy-androidx-sapmle/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to moxy-androidx-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/moxy-androidx-sapmle/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/moxy-androidx-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from moxy-androidx-sapmle/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to moxy-androidx-sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/moxy-androidx-sapmle/src/main/res/values/colors.xml b/moxy-androidx-sample/src/main/res/values/colors.xml similarity index 100% rename from moxy-androidx-sapmle/src/main/res/values/colors.xml rename to moxy-androidx-sample/src/main/res/values/colors.xml diff --git a/moxy-androidx-sapmle/src/main/res/values/strings.xml b/moxy-androidx-sample/src/main/res/values/strings.xml similarity index 100% rename from moxy-androidx-sapmle/src/main/res/values/strings.xml rename to moxy-androidx-sample/src/main/res/values/strings.xml diff --git a/moxy-androidx-sapmle/src/main/res/values/styles.xml b/moxy-androidx-sample/src/main/res/values/styles.xml similarity index 100% rename from moxy-androidx-sapmle/src/main/res/values/styles.xml rename to moxy-androidx-sample/src/main/res/values/styles.xml diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt deleted file mode 100644 index 076b5dcb..00000000 --- a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt +++ /dev/null @@ -1,9 +0,0 @@ -package example.com.moxy_androidx_sapmle - -import example.com.moxy_androidx_sapmle.first.FirstView - -interface MainView : FirstView { - - fun printLog(msg: String) - -} \ No newline at end of file diff --git a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java b/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java deleted file mode 100644 index 948505f3..00000000 --- a/moxy-androidx-sapmle/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java +++ /dev/null @@ -1,9 +0,0 @@ -package example.com.moxy_androidx_sapmle.first; - -import example.com.moxy_androidx_sapmle.BaseView; - -public interface FirstView extends BaseView { - - void firstMethod(); - -} \ No newline at end of file diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java index 487cfbc4..ed89afec 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -216,7 +217,7 @@ private void generateListCode(Element element, List resultList = processor.process((E) element); if (resultList == null || resultList.isEmpty()) return; - List fileList = classGenerator.generate(new ArrayList<>(new HashSet<>(resultList))); + List fileList = classGenerator.generate(new ArrayList<>(new LinkedHashSet<>(resultList))); if (fileList == null || fileList.isEmpty()) return; for (JavaFile file : fileList) createSourceFile(file); diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java index bc18fa06..246a10ec 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java @@ -51,6 +51,7 @@ public List getUsedStrategies() { @Override public List process(TypeElement element) { List list = new ArrayList<>(); + MvpCompiler.getMessager().printMessage(Diagnostic.Kind.WARNING, "TypeElement " + element); this.viewInterfaceElement = element; viewInterfaceName = element.getSimpleName().toString(); @@ -64,8 +65,10 @@ public List process(TypeElement element) { // Add methods from super interfaces for (TypeMirror typeMirror : element.getInterfaces()) { - final TypeElement anInterface = (TypeElement) ((DeclaredType) typeMirror).asElement(); - list.addAll(process(anInterface)); + final TypeElement interfaceElement = (TypeElement) ((DeclaredType) typeMirror).asElement(); + if (isMvpElement(interfaceElement)) { + list.addAll(process(interfaceElement)); + } } // Allow methods be with same names @@ -89,6 +92,18 @@ public List process(TypeElement element) { return list; } + private boolean isMvpElement(TypeElement element) { + if (element == null) return false; + + ClassName className = ClassName.get(element); + if (className.equals(MVP_VIEW_CLASS_NAME)) return true; + + for (TypeMirror typeMirror : element.getInterfaces()) { + TypeElement interfaceElement = (TypeElement) ((DeclaredType) typeMirror).asElement(); + if (isMvpElement(interfaceElement)) return true; + } + return false; + } private void getMethods(TypeElement typeElement, TypeElement defaultStrategy, @@ -180,8 +195,7 @@ private void checkStrategyAndTagEquals(ViewMethod method, ViewMethod existingMet } } - private List iterateInterfaces(int level, - TypeElement parentElement, + private List iterateInterfaces(TypeElement parentElement, TypeElement parentDefaultStrategy, List rootMethods, List superinterfacesMethods) { @@ -199,7 +213,7 @@ private List iterateInterfaces(int level, getMethods(anInterface, defaultStrategy, rootMethods, superinterfacesMethods); - iterateInterfaces(level + 1, anInterface, defaultStrategy, rootMethods, superinterfacesMethods); + iterateInterfaces(anInterface, defaultStrategy, rootMethods, superinterfacesMethods); } return superinterfacesMethods; diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java index 4f20ab58..0b3a107f 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java @@ -22,7 +22,7 @@ import javax.annotation.Nullable; import javax.lang.model.element.Modifier; import javax.lang.model.type.DeclaredType; -import javax.tools.Diagnostic; +import javax.lang.model.type.TypeMirror; import static com.omegar.mvp.compiler.Util.decapitalizeString; @@ -34,8 +34,8 @@ */ public final class ViewStateClassGenerator extends JavaFilesGenerator> { - private static final String T = "T"; - private static final TypeVariableName GENERIC_TYPE_VARIABLE_NAME = TypeVariableName.get(T); + private static final String VIEW = "Omega$$View"; + private static final TypeVariableName GENERIC_TYPE_VARIABLE_NAME = TypeVariableName.get(VIEW); private static final ClassName MVP_VIEW_STATE_CLASS_NAME = ClassName.get(MvpViewState.class); private static final ClassName VIEW_COMMAND_CLASS_NAME = ClassName.get(ViewCommand.class); private static final ParameterizedTypeName VIEW_COMMAND_TYPE_NAME @@ -47,8 +47,6 @@ public final class ViewStateClassGenerator extends JavaFilesGenerator generate(List list) { if (list.isEmpty()) return Collections.emptyList(); - MvpCompiler.getMessager().printMessage(Diagnostic.Kind.WARNING, "Size " + list.size()); - List fileList = new ArrayList<>(); fileList.add(generate(list.get(0))); @@ -67,18 +65,20 @@ private JavaFile generate(ViewInterfaceInfo viewInterfaceInfo) { return generate(viewInterfaceInfo, null); } - private JavaFile generate(ViewInterfaceInfo viewInterfaceInfo, @Nullable ClassName parentClassName) { + private JavaFile generate(ViewInterfaceInfo viewInterfaceInfo, @Nullable ClassName superClassName) { ClassName viewName = viewInterfaceInfo.getName(); TypeName nameWithTypeVariables = viewInterfaceInfo.getNameWithTypeVariables(); DeclaredType viewInterfaceType = (DeclaredType) viewInterfaceInfo.getElement().asType(); - TypeVariableName variableName = TypeVariableName.get(T, nameWithTypeVariables); + TypeVariableName variableName = TypeVariableName.get(VIEW, nameWithTypeVariables); TypeSpec.Builder classBuilder = TypeSpec.classBuilder(viewName.simpleName() + MvpProcessor.VIEW_STATE_SUFFIX) - .addModifiers(Modifier.PUBLIC) - .superclass(parentClassName == null ? MVP_VIEW_STATE_TYPE_NAME : - ParameterizedTypeName.get(parentClassName, variableName)) - .addTypeVariable(variableName) - .addSuperinterface(nameWithTypeVariables); + .addModifiers(Modifier.PUBLIC) + .addSuperinterface(nameWithTypeVariables) + .addTypeVariables(new ArrayList(viewInterfaceInfo.getTypeVariables()) {{ + add(0, variableName); + }}) + .superclass(superClassName == null ? MVP_VIEW_STATE_TYPE_NAME : + ParameterizedTypeName.get(superClassName, generateSuperClassTypeVariables(viewInterfaceInfo, variableName))); for (ViewMethod method : viewInterfaceInfo.getMethods()) { TypeSpec commandClass = generateCommandClass(method, nameWithTypeVariables); @@ -91,11 +91,26 @@ private JavaFile generate(ViewInterfaceInfo viewInterfaceInfo, @Nullable ClassNa .build(); } + private TypeVariableName[] generateSuperClassTypeVariables(ViewInterfaceInfo viewInterfaceInfo, TypeVariableName variableName) { + List parentClassTypeVariables = new ArrayList<>(); + parentClassTypeVariables.add(variableName); + for (TypeMirror mirror : viewInterfaceInfo.getElement().getInterfaces()) { + List typeArguments = ((DeclaredType) mirror).getTypeArguments(); + for (TypeMirror typeMirror : typeArguments) { + TypeName typeName = ClassName.get(typeMirror); + TypeVariableName name = TypeVariableName.get(typeMirror.toString(), typeName); + parentClassTypeVariables.add(name); + } + } + //noinspection ToArrayCallWithZeroLengthArrayArgument + return parentClassTypeVariables.toArray(new TypeVariableName[parentClassTypeVariables.size()]); + } + private TypeSpec generateCommandClass(ViewMethod method, TypeName viewTypeName) { MethodSpec applyMethod = MethodSpec.methodBuilder("apply") .addAnnotation(Override.class) .addModifiers(Modifier.PUBLIC) - .addParameter(viewTypeName, "mvpView") + .addParameter(GENERIC_TYPE_VARIABLE_NAME, "mvpView") .addExceptions(method.getExceptions()) .addStatement("mvpView.$L($L)", method.getName(), method.getArgumentsString()) .build(); diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstateprovider/InjectViewStateProcessor.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstateprovider/InjectViewStateProcessor.java index 214e9593..e08b49f6 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstateprovider/InjectViewStateProcessor.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstateprovider/InjectViewStateProcessor.java @@ -13,6 +13,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/sample-custom-strategy/build.gradle b/sample-custom-strategy/build.gradle index 0c6ade9e..4b3307b3 100644 --- a/sample-custom-strategy/build.gradle +++ b/sample-custom-strategy/build.gradle @@ -43,10 +43,9 @@ dependencies { implementation "com.android.support:appcompat-v7:$supportVersion" implementation "com.android.support:design:$supportVersion" - def moxyVersion = '1.5.6' - implementation "com.arello-mobile:moxy:$moxyVersion" - implementation "com.arello-mobile:moxy-app-compat:$moxyVersion" - kapt "com.arello-mobile:moxy-compiler:$moxyVersion" + implementation project(':moxy') + implementation project(':moxy-android') + kapt project(':moxy-compiler') implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } diff --git a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchPresenter.kt b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchPresenter.kt index 2dbfde2d..4c050266 100644 --- a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchPresenter.kt +++ b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchPresenter.kt @@ -1,6 +1,5 @@ package com.redmadrobot.app.presentation.launch - import com.omegar.mvp.InjectViewState import com.omegar.mvp.MvpPresenter diff --git a/settings.gradle b/settings.gradle index 4a7c3ce0..c4153a45 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,7 +2,7 @@ include ':moxy', ':stub-reflector', ':moxy-android', ':moxy-compiler', ':stub-an include ':sample-github' include ':sample-kotlin' include ':sample-custom-strategy' -include ':moxy-androidx-sapmle' +include ':moxy-androidx-sample' project(':stub-reflector').projectDir = new File('moxy/stub-reflector') project(':stub-android').projectDir = new File('moxy-android/stub-android') project(':stub-appcompat').projectDir = new File('moxy-app-compat/stub-appcompat') From 1605c9349199b3e9b490681f1dcc3411c8259a54 Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Fri, 4 Oct 2019 09:53:49 +0300 Subject: [PATCH 15/36] Double JavaFile generation fixed --- .../com/omegar/mvp/compiler/MvpCompiler.java | 54 +++++++++---------- .../viewstate/ViewInterfaceProcessor.java | 2 - 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java index ed89afec..ac5a7144 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -136,10 +135,8 @@ private boolean throwableProcess(RoundEnvironment roundEnv) { processInjectors(roundEnv, InjectPresenter.class, ElementKind.FIELD, injectPresenterProcessor, presenterBinderClassGenerator); - for (TypeElement usedView : injectViewStateProcessor.getUsedViews()) { - generateListCode(usedView, ElementKind.INTERFACE, - viewInterfaceProcessor, viewStateClassGenerator); - } + generateCode(injectViewStateProcessor.getUsedViews(), ElementKind.INTERFACE, + viewInterfaceProcessor, viewStateClassGenerator); String moxyReflectorPackage = sOptions.get(OPTION_MOXY_REFLECTOR_PACKAGE); @@ -205,42 +202,43 @@ private void processInjectors(RoundEnvironment roundEnv, } } - private void generateListCode(Element element, + private void generateCode(Set elementSet, ElementKind kind, ElementProcessor> processor, JavaFilesGenerator> classGenerator) { - if (element.getKind() != kind) { - getMessager().printMessage(Diagnostic.Kind.ERROR, element + " must be " + kind.name()); + Set fileSet = new HashSet<>(); + for (Element element : elementSet) { + List list = generateCode(element, kind, processor); + if (list != null) { + fileSet.addAll(classGenerator.generate(list)); + } + } + for (JavaFile file : fileSet) { + createSourceFile(file); } - - //noinspection unchecked - List resultList = processor.process((E) element); - if (resultList == null || resultList.isEmpty()) return; - - List fileList = classGenerator.generate(new ArrayList<>(new LinkedHashSet<>(resultList))); - if (fileList == null || fileList.isEmpty()) return; - - for (JavaFile file : fileList) createSourceFile(file); } private void generateCode(Element element, - ElementKind kind, - ElementProcessor processor, - JavaFilesGenerator classGenerator) { - if (element.getKind() != kind) { - getMessager().printMessage(Diagnostic.Kind.ERROR, element + " must be " + kind.name()); - } - - //noinspection unchecked - R result = processor.process((E) element); - + ElementKind kind, + ElementProcessor processor, + JavaFilesGenerator classGenerator) { + R result = generateCode(element, kind, processor); if (result == null) return; - for (JavaFile file : classGenerator.generate(result)) { createSourceFile(file); } } + private R generateCode(Element element, + ElementKind kind, + ElementProcessor processor) { + if (element.getKind() != kind) { + getMessager().printMessage(Diagnostic.Kind.ERROR, element + " must be " + kind.name()); + } + //noinspection unchecked + return processor.process((E) element); + } + private void createSourceFile(JavaFile file) { try { file.writeTo(processingEnv.getFiler()); diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java index 246a10ec..373f9cf6 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java @@ -51,8 +51,6 @@ public List getUsedStrategies() { @Override public List process(TypeElement element) { List list = new ArrayList<>(); - MvpCompiler.getMessager().printMessage(Diagnostic.Kind.WARNING, "TypeElement " + element); - this.viewInterfaceElement = element; viewInterfaceName = element.getSimpleName().toString(); From a23f1d9dd9e31291e947b56971731c6f801fd31d Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Mon, 7 Oct 2019 13:04:32 +0300 Subject: [PATCH 16/36] Code generation for several view interfaces refactored --- moxy-androidx-sample/build.gradle | 2 +- .../src/main/AndroidManifest.xml | 4 +- .../BaseActivity.java | 2 +- .../BaseView.java | 2 +- .../MainActivity.kt | 11 +- .../MainPresenter.kt | 2 +- .../com/moxy_androidx_sample/MainView.kt | 13 ++ .../NotMainActivity.java | 2 +- .../NotMainPresenter.java | 7 + .../com/moxy_androidx_sample/NotMainView.java | 7 + .../SecondInterface.kt | 2 +- .../moxy_androidx_sample/first/FirstView.java | 12 ++ .../moxy_androidx_sample/packagee/Item.java | 4 + .../second/SecondView.java | 9 ++ .../moxy_androidx_sample/third/ThirdView.java | 9 ++ .../com/moxy_androidx_sapmle/MainView.kt | 11 -- .../NotMainPresenter.java | 12 -- .../com/moxy_androidx_sapmle/NotMainView.java | 7 - .../moxy_androidx_sapmle/first/FirstView.java | 11 -- .../moxy_androidx_sapmle/packagee/Item.java | 4 - moxy-compiler/build.gradle | 2 +- .../com/omegar/mvp/compiler/MvpCompiler.java | 12 +- .../java/com/omegar/mvp/compiler/Util.java | 37 +++++ .../compiler/viewstate/ViewInterfaceInfo.java | 149 +++++++++++------- .../viewstate/ViewInterfaceProcessor.java | 96 ++++++++--- .../mvp/compiler/viewstate/ViewMethod.java | 20 ++- .../viewstate/ViewStateClassGenerator.java | 40 +++-- .../com/omegar/mvp/compiler/CompilerTest.java | 2 +- .../omegar/mvp/tests/LocalPresenterTest.java | 2 +- .../app/presentation/launch/LaunchFragment.kt | 3 +- settings.gradle | 1 - 31 files changed, 334 insertions(+), 163 deletions(-) rename moxy-androidx-sample/src/main/kotlin/example/com/{moxy_androidx_sapmle => moxy_androidx_sample}/BaseActivity.java (81%) rename moxy-androidx-sample/src/main/kotlin/example/com/{moxy_androidx_sapmle => moxy_androidx_sample}/BaseView.java (71%) rename moxy-androidx-sample/src/main/kotlin/example/com/{moxy_androidx_sapmle => moxy_androidx_sample}/MainActivity.kt (69%) rename moxy-androidx-sample/src/main/kotlin/example/com/{moxy_androidx_sapmle => moxy_androidx_sample}/MainPresenter.kt (88%) create mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainView.kt rename moxy-androidx-sample/src/main/kotlin/example/com/{moxy_androidx_sapmle => moxy_androidx_sample}/NotMainActivity.java (76%) create mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/NotMainPresenter.java create mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/NotMainView.java rename moxy-androidx-sample/src/main/kotlin/example/com/{moxy_androidx_sapmle => moxy_androidx_sample}/SecondInterface.kt (54%) create mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java create mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/packagee/Item.java create mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java create mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java delete mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt delete mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainPresenter.java delete mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainView.java delete mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java delete mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/packagee/Item.java diff --git a/moxy-androidx-sample/build.gradle b/moxy-androidx-sample/build.gradle index 50b4f4a0..1c76fae2 100644 --- a/moxy-androidx-sample/build.gradle +++ b/moxy-androidx-sample/build.gradle @@ -24,7 +24,7 @@ android { versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "android.support.generateInfos.runner.AndroidJUnitRunner" } sourceSets { diff --git a/moxy-androidx-sample/src/main/AndroidManifest.xml b/moxy-androidx-sample/src/main/AndroidManifest.xml index 3c55fb75..ede65ff8 100644 --- a/moxy-androidx-sample/src/main/AndroidManifest.xml +++ b/moxy-androidx-sample/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="example.com.moxy_androidx_sample"> - + diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseActivity.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseActivity.java similarity index 81% rename from moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseActivity.java rename to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseActivity.java index 664db103..7c0dc5fc 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseActivity.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseActivity.java @@ -1,4 +1,4 @@ -package example.com.moxy_androidx_sapmle; +package example.com.moxy_androidx_sample; import com.omegar.mvp.MvpAppCompatActivity; diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java similarity index 71% rename from moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseView.java rename to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java index 2c9ce2c9..60e2928e 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/BaseView.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java @@ -1,4 +1,4 @@ -package example.com.moxy_androidx_sapmle; +package example.com.moxy_androidx_sample; import com.omegar.mvp.MvpView; diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt similarity index 69% rename from moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt rename to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt index 365ec9dc..b2bdbd43 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainActivity.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt @@ -1,11 +1,18 @@ -package example.com.moxy_androidx_sapmle +package example.com.moxy_androidx_sample import android.os.Bundle import android.util.Log import com.omegar.mvp.presenter.InjectPresenter -import example.com.moxy_androidx_sapmle.packagee.Item +import example.com.moxy_androidx_sample.packagee.Item class MainActivity : BaseActivity(), MainView, SecondInterface { + override fun thirdMethod() { + TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + } + + override fun secondMethod() { + TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + } override fun firstMethod(item: List) { TODO("not implemented") //To change body of created functions use File | Settings | File Templates. diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainPresenter.kt similarity index 88% rename from moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt rename to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainPresenter.kt index beefd6c9..b3bce4f3 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainPresenter.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainPresenter.kt @@ -1,4 +1,4 @@ -package example.com.moxy_androidx_sapmle +package example.com.moxy_androidx_sample import android.util.Log import com.omegar.mvp.InjectViewState diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainView.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainView.kt new file mode 100644 index 00000000..e7b153cd --- /dev/null +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainView.kt @@ -0,0 +1,13 @@ +package example.com.moxy_androidx_sample + +import example.com.moxy_androidx_sample.first.FirstView +import example.com.moxy_androidx_sample.packagee.Item +import example.com.moxy_androidx_sample.second.SecondView +import example.com.moxy_androidx_sample.third.ThirdView +import java.io.Serializable + +interface MainView : FirstView, SecondView, ThirdView, Serializable { + + fun printLog(msg: Double?) + +} \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainActivity.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/NotMainActivity.java similarity index 76% rename from moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainActivity.java rename to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/NotMainActivity.java index b2f2d998..0916c6c8 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainActivity.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/NotMainActivity.java @@ -1,4 +1,4 @@ -package example.com.moxy_androidx_sapmle; +package example.com.moxy_androidx_sample; public class NotMainActivity extends BaseActivity implements NotMainView { diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/NotMainPresenter.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/NotMainPresenter.java new file mode 100644 index 00000000..5988d375 --- /dev/null +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/NotMainPresenter.java @@ -0,0 +1,7 @@ +package example.com.moxy_androidx_sample; + +public class NotMainPresenter { + + + +} \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/NotMainView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/NotMainView.java new file mode 100644 index 00000000..313b1f7c --- /dev/null +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/NotMainView.java @@ -0,0 +1,7 @@ +package example.com.moxy_androidx_sample; + +public interface NotMainView { + + void notMainFunction(); + +} diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/SecondInterface.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/SecondInterface.kt similarity index 54% rename from moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/SecondInterface.kt rename to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/SecondInterface.kt index b1ad0f04..9fbdd825 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/SecondInterface.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/SecondInterface.kt @@ -1,4 +1,4 @@ -package example.com.moxy_androidx_sapmle +package example.com.moxy_androidx_sample interface SecondInterface { diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java new file mode 100644 index 00000000..29f4ce19 --- /dev/null +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java @@ -0,0 +1,12 @@ +package example.com.moxy_androidx_sample.first; + +import java.util.List; + +import example.com.moxy_androidx_sample.BaseView; +import example.com.moxy_androidx_sample.third.ThirdView; + +public interface FirstView extends BaseView, ThirdView { + + void firstMethod(List item); + +} \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/packagee/Item.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/packagee/Item.java new file mode 100644 index 00000000..648464fa --- /dev/null +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/packagee/Item.java @@ -0,0 +1,4 @@ +package example.com.moxy_androidx_sample.packagee; + +public class Item { +} diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java new file mode 100644 index 00000000..bd9c0ecf --- /dev/null +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java @@ -0,0 +1,9 @@ +package example.com.moxy_androidx_sample.second; + +import example.com.moxy_androidx_sample.BaseView; + +public interface SecondView extends BaseView { + + void secondMethod(); + +} \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java new file mode 100644 index 00000000..ab5a10c6 --- /dev/null +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java @@ -0,0 +1,9 @@ +package example.com.moxy_androidx_sample.third; + +import example.com.moxy_androidx_sample.BaseView; + +public interface ThirdView extends BaseView { + + void thirdMethod(); + +} diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt deleted file mode 100644 index ed5a0482..00000000 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/MainView.kt +++ /dev/null @@ -1,11 +0,0 @@ -package example.com.moxy_androidx_sapmle - -import example.com.moxy_androidx_sapmle.first.FirstView -import example.com.moxy_androidx_sapmle.packagee.Item -import java.io.Serializable - -interface MainView : FirstView, Serializable { - - fun printLog(msg: Double?) - -} \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainPresenter.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainPresenter.java deleted file mode 100644 index acbadc4c..00000000 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package example.com.moxy_androidx_sapmle; - -import com.omegar.mvp.InjectViewState; -import com.omegar.mvp.MvpPresenter; -import com.omegar.mvp.MvpView; - -@InjectViewState -public class NotMainPresenter extends MvpPresenter { - - - -} \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainView.java deleted file mode 100644 index 612196dc..00000000 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/NotMainView.java +++ /dev/null @@ -1,7 +0,0 @@ -package example.com.moxy_androidx_sapmle; - -public interface NotMainView extends BaseView { - - void notMainFunction(); - -} diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java deleted file mode 100644 index 35bc478f..00000000 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/first/FirstView.java +++ /dev/null @@ -1,11 +0,0 @@ -package example.com.moxy_androidx_sapmle.first; - -import java.util.List; - -import example.com.moxy_androidx_sapmle.BaseView; - -public interface FirstView extends BaseView{ - - void firstMethod(List item); - -} \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/packagee/Item.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/packagee/Item.java deleted file mode 100644 index 740d9c53..00000000 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sapmle/packagee/Item.java +++ /dev/null @@ -1,4 +0,0 @@ -package example.com.moxy_androidx_sapmle.packagee; - -public class Item { -} diff --git a/moxy-compiler/build.gradle b/moxy-compiler/build.gradle index 7a34e47f..308ba770 100644 --- a/moxy-compiler/build.gradle +++ b/moxy-compiler/build.gradle @@ -263,6 +263,6 @@ dependencies { testImplementation deps.compiletesting testImplementation deps.asm - // workaround to use test resources (https://stackoverflow.com/q/24870464) + // workaround to use generateInfos resources (https://stackoverflow.com/q/24870464) testRuntime files(sourceSets.test.output.resourcesDir) } \ No newline at end of file diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java index ac5a7144..b0f71b9e 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java @@ -22,6 +22,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.Messager; @@ -112,7 +114,11 @@ public boolean process(Set annotations, RoundEnvironment } catch (RuntimeException e) { getMessager().printMessage(Diagnostic.Kind.OTHER, "Moxy compilation failed. Could you copy stack trace above and write us (or make issue on Github)?"); e.printStackTrace(); - getMessager().printMessage(Diagnostic.Kind.ERROR, "Moxy compilation failed; see the compiler error output for details (" + e + ")"); + String s = Stream + .of(e.getStackTrace()) + .map(StackTraceElement::toString) + .collect(Collectors.joining("\n")); + getMessager().printMessage(Diagnostic.Kind.ERROR, "Moxy compilation failed; see the compiler error output for details (" + s + ")"); } return true; @@ -209,9 +215,7 @@ private void generateCode(Set elementSet, Set fileSet = new HashSet<>(); for (Element element : elementSet) { List list = generateCode(element, kind, processor); - if (list != null) { - fileSet.addAll(classGenerator.generate(list)); - } + if (list != null) fileSet.addAll(classGenerator.generate(list)); } for (JavaFile file : fileSet) { createSourceFile(file); diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java index a9ef3d47..48d2bf11 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java @@ -16,11 +16,17 @@ */ package com.omegar.mvp.compiler; +import com.omegar.mvp.MvpView; +import com.squareup.javapoet.ClassName; + +import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; +import javax.annotation.Nullable; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; @@ -41,6 +47,9 @@ */ @SuppressWarnings("WeakerAccess") public final class Util { + + public static final ClassName MVP_VIEW_CLASS_NAME = ClassName.get(MvpView.class); + public static String fillGenerics(Map types, TypeMirror param) { return fillGenerics(types, Collections.singletonList(param)); } @@ -190,4 +199,32 @@ public static boolean hasEmptyConstructor(TypeElement element) { public static String decapitalizeString(String string) { return string == null || string.isEmpty() ? "" : string.length() == 1 ? string.toLowerCase() : Character.toLowerCase(string.charAt(0)) + string.substring(1); } + + public static boolean isMvpElement(TypeElement element) { + if (element == null) return false; + + ClassName className = ClassName.get(element); + if (className.equals(MVP_VIEW_CLASS_NAME)) return true; + + for (TypeMirror typeMirror : element.getInterfaces()) { + TypeElement interfaceElement = (TypeElement) ((DeclaredType) typeMirror).asElement(); + if (isMvpElement(interfaceElement)) return true; + } + return false; + } + + public static E lastOrNull(@Nullable Set set) { + if (set == null || set.isEmpty()) return null; + return lastOrNull(new ArrayList<>(set)); + } + + public static E lastOrNull(@Nullable List list) { + if (list == null || list.isEmpty()) return null; + return list.get(list.size() - 1); + } + + public static TypeElement asElement(TypeMirror mirror) { + return (TypeElement) ((DeclaredType) mirror).asElement(); + } + } diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceInfo.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceInfo.java index abfb439f..d063b0f3 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceInfo.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceInfo.java @@ -1,14 +1,18 @@ package com.omegar.mvp.compiler.viewstate; +import com.omegar.mvp.compiler.Util; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeVariableName; import java.util.List; +import java.util.function.Function; import java.util.stream.Collectors; +import javax.annotation.Nullable; import javax.lang.model.element.TypeElement; +import javax.lang.model.type.TypeMirror; /** * Date: 27-Jul-2017 @@ -17,60 +21,93 @@ * @author Evgeny Kursakov */ class ViewInterfaceInfo { - private final TypeElement element; - private final ClassName name; - private final List typeVariables; - private final List methods; - - ViewInterfaceInfo(TypeElement element, List methods) { - this.element = element; - this.name = ClassName.get(element); - this.methods = methods; - - this.typeVariables = element.getTypeParameters().stream() - .map(TypeVariableName::get) - .collect(Collectors.toList()); - } - - public TypeElement getElement() { - return element; - } - - ClassName getName() { - return name; - } - - TypeName getNameWithTypeVariables() { - if (typeVariables.isEmpty()) { - return name; - } else { - TypeVariableName[] names = new TypeVariableName[typeVariables.size()]; - typeVariables.toArray(names); - - return ParameterizedTypeName.get(name, names); - } - } - - List getTypeVariables() { - return typeVariables; - } - - List getMethods() { - return methods; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - ViewInterfaceInfo that = (ViewInterfaceInfo) o; - - return name != null ? name.equals(that.name) : that.name == null; - } - - @Override - public int hashCode() { - return name != null ? name.hashCode() : 0; - } + @Nullable + private final ViewInterfaceInfo superInterfaceInfo; + private final TypeElement element; + private final ClassName name; + private final List typeVariables; + private final List methods; + private final List superTypeMvpElements; + + ViewInterfaceInfo(TypeElement element, List methods) { + this(null, element, methods); + } + + ViewInterfaceInfo(@Nullable ViewInterfaceInfo superInterfaceInfo, TypeElement element, List methods) { + this.superInterfaceInfo = superInterfaceInfo; + this.element = element; + this.name = ClassName.get(element); + this.methods = methods; + + this.typeVariables = element.getTypeParameters().stream() + .map(TypeVariableName::get) + .collect(Collectors.toList()); + superTypeMvpElements = element.getInterfaces().stream() + .map((Function) Util::asElement) + .filter(Util::isMvpElement) + .collect(Collectors.toList()); + } + + @Nullable + ViewInterfaceInfo getSuperInterfaceInfo() { + return superInterfaceInfo; + } + + public TypeElement getElement() { + return element; + } + + ClassName getName() { + return name; + } + + TypeName getNameWithTypeVariables() { + if (typeVariables.isEmpty()) { + return name; + } else { + TypeVariableName[] names = new TypeVariableName[typeVariables.size()]; + typeVariables.toArray(names); + + return ParameterizedTypeName.get(name, names); + } + } + + List getTypeVariables() { + return typeVariables; + } + + List getMethods() { + return methods; + } + + TypeElement getSuperClassElement() { + return superInterfaceInfo == null ? null : superInterfaceInfo.getElement(); + } + + List getSuperTypeMvpElements() { + return superTypeMvpElements; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + ViewInterfaceInfo that = (ViewInterfaceInfo) o; + + return name != null ? name.equals(that.name) : that.name == null; + } + + @Override + public int hashCode() { + return name != null ? name.hashCode() : 0; + } + + @Override + public String toString() { + return "ViewInterfaceInfo{" + + "superInterfaceInfo=" + superInterfaceInfo + + ", element=" + element + + '}'; + } } diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java index 373f9cf6..9c9db207 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java @@ -1,17 +1,17 @@ package com.omegar.mvp.compiler.viewstate; -import com.omegar.mvp.MvpView; import com.omegar.mvp.compiler.ElementProcessor; import com.omegar.mvp.compiler.MvpCompiler; import com.omegar.mvp.compiler.Util; import com.omegar.mvp.viewstate.strategy.AddToEndStrategy; import com.omegar.mvp.viewstate.strategy.StateStrategyType; -import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ParameterSpec; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -29,6 +29,10 @@ import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic; +import static com.omegar.mvp.compiler.Util.MVP_VIEW_CLASS_NAME; +import static com.omegar.mvp.compiler.Util.asElement; +import static com.omegar.mvp.compiler.Util.isMvpElement; + /** * Date: 27-Jul-2017 * Time: 13:09 @@ -38,7 +42,6 @@ public class ViewInterfaceProcessor extends ElementProcessor> { private static final String STATE_STRATEGY_TYPE_ANNOTATION = StateStrategyType.class.getName(); private static final TypeElement DEFAULT_STATE_STRATEGY = MvpCompiler.getElementUtils().getTypeElement(AddToEndStrategy.class.getCanonicalName()); - private static final ClassName MVP_VIEW_CLASS_NAME = ClassName.get(MvpView.class); private TypeElement viewInterfaceElement; private String viewInterfaceName; @@ -50,7 +53,62 @@ public List getUsedStrategies() { @Override public List process(TypeElement element) { - List list = new ArrayList<>(); + List list = new ArrayList<>(generateInfos(element)); + fillWithNotInheredMethods(list); + return list; + } + + private void fillWithNotInheredMethods(List list) { + for (ViewInterfaceInfo info : list) { + List infoMethods = info.getMethods(); + + if (info.getSuperTypeMvpElements().size() > 1) { + List inheredMethods = getInheredMethods(info); + Set notInheredMethods = getNotInheredMethods(info, list); + for (ViewMethod method : notInheredMethods) { + if (!inheredMethods.contains(method)) infoMethods.add(method); + } + } + } + } + + private List getInheredMethods(ViewInterfaceInfo info) { + List methods = new ArrayList<>(info.getMethods()); + + ViewInterfaceInfo superInterfaceInfo = info.getSuperInterfaceInfo(); + if (superInterfaceInfo != null) methods.addAll(getInheredMethods(superInterfaceInfo)); + + return methods; + } + + private Set getNotInheredMethods(ViewInterfaceInfo info, List infoList) { + if (info.getSuperTypeMvpElements().size() <= 1) return Collections.emptySet(); + + assert info.getSuperInterfaceInfo() != null; + TypeElement superClassElement = info.getSuperInterfaceInfo().getElement(); + + Set methodSet = new LinkedHashSet<>(); + for (TypeElement element : info.getSuperTypeMvpElements()) { + if (!element.equals(superClassElement)) { + ViewInterfaceInfo infoByTypeElement = getViewInterfaceInfoByTypeElement(infoList, element); + if (infoByTypeElement != null) { + methodSet.addAll(getInheredMethods(infoByTypeElement)); + methodSet.addAll(getNotInheredMethods(infoByTypeElement, infoList)); + } + } + } + return methodSet; + } + + private ViewInterfaceInfo getViewInterfaceInfoByTypeElement(List list, TypeElement element) { + for (ViewInterfaceInfo info : list) { + if (info.getElement().equals(element)) return info; + } + return null; + } + + private Set generateInfos(TypeElement element) { + Set interfaceInfos = new LinkedHashSet<>(); this.viewInterfaceElement = element; viewInterfaceName = element.getSimpleName().toString(); @@ -61,11 +119,16 @@ public List process(TypeElement element) { // Get methods for input class getMethods(element, interfaceStateStrategyType, new ArrayList<>(), methods); - // Add methods from super interfaces + // Add methods from super interfaces + ViewInterfaceInfo superInterfaceInfo = null; for (TypeMirror typeMirror : element.getInterfaces()) { - final TypeElement interfaceElement = (TypeElement) ((DeclaredType) typeMirror).asElement(); + final TypeElement interfaceElement = asElement(typeMirror); if (isMvpElement(interfaceElement)) { - list.addAll(process(interfaceElement)); + Set parentInfos = generateInfos(interfaceElement); + if (superInterfaceInfo == null) { + superInterfaceInfo = Util.lastOrNull(parentInfos); + } + interfaceInfos.addAll(parentInfos); } } @@ -84,23 +147,10 @@ public List process(TypeElement element) { methodsCounter.put(method.getName(), counter); } - ViewInterfaceInfo info = new ViewInterfaceInfo(element, methods); - if (!info.getName().equals(MVP_VIEW_CLASS_NAME)) list.add(info); + ViewInterfaceInfo info = new ViewInterfaceInfo(superInterfaceInfo, element, methods); + if (!info.getName().equals(MVP_VIEW_CLASS_NAME)) interfaceInfos.add(info); - return list; - } - - private boolean isMvpElement(TypeElement element) { - if (element == null) return false; - - ClassName className = ClassName.get(element); - if (className.equals(MVP_VIEW_CLASS_NAME)) return true; - - for (TypeMirror typeMirror : element.getInterfaces()) { - TypeElement interfaceElement = (TypeElement) ((DeclaredType) typeMirror).asElement(); - if (isMvpElement(interfaceElement)) return true; - } - return false; + return interfaceInfos; } private void getMethods(TypeElement typeElement, diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewMethod.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewMethod.java index 42626119..36336a5a 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewMethod.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewMethod.java @@ -134,13 +134,27 @@ public boolean equals(Object o) { ViewMethod that = (ViewMethod) o; - return name.equals(that.name) && parameterSpecs.equals(that.parameterSpecs); + if (methodElement != null ? !methodElement.equals(that.methodElement) : that.methodElement != null) return false; + if (name != null ? !name.equals(that.name) : that.name != null) return false; + if (tag != null ? !tag.equals(that.tag) : that.tag != null) return false; + if (argumentsString != null ? !argumentsString.equals(that.argumentsString) : that.argumentsString != null) return false; + return uniqueSuffix != null ? uniqueSuffix.equals(that.uniqueSuffix) : that.uniqueSuffix == null; } @Override public int hashCode() { - int result = name.hashCode(); - result = 31 * result + parameterSpecs.hashCode(); + int result = methodElement != null ? methodElement.hashCode() : 0; + result = 31 * result + (name != null ? name.hashCode() : 0); + result = 31 * result + (tag != null ? tag.hashCode() : 0); + result = 31 * result + (argumentsString != null ? argumentsString.hashCode() : 0); + result = 31 * result + (uniqueSuffix != null ? uniqueSuffix.hashCode() : 0); return result; } + + @Override + public String toString() { + return "ViewMethod{" + + "name='" + name + '\'' + + '}'; + } } diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java index 0b3a107f..df3a0837 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java @@ -16,10 +16,11 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Random; -import javax.annotation.Nullable; import javax.lang.model.element.Modifier; import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeMirror; @@ -43,29 +44,27 @@ public final class ViewStateClassGenerator extends JavaFilesGenerator filesMap = new HashMap<>(); + @Override public List generate(List list) { if (list.isEmpty()) return Collections.emptyList(); - List fileList = new ArrayList<>(); - fileList.add(generate(list.get(0))); - - for (int i = 1; i < list.size(); i++) { + for (int i = 0; i < list.size(); i++) { ViewInterfaceInfo info = list.get(i); - JavaFile parentClassFile = fileList.get(fileList.size() - 1); - ClassName parentClassName = ClassName.get(parentClassFile.packageName, parentClassFile.typeSpec.name); - - fileList.add(generate(info, parentClassName)); + JavaFile javaFile = filesMap.get(info); + if (javaFile == null) { + javaFile = generate(info); + fileList.add(javaFile); + filesMap.put(info, javaFile); + } + fileList.add(javaFile); } return fileList; } private JavaFile generate(ViewInterfaceInfo viewInterfaceInfo) { - return generate(viewInterfaceInfo, null); - } - - private JavaFile generate(ViewInterfaceInfo viewInterfaceInfo, @Nullable ClassName superClassName) { ClassName viewName = viewInterfaceInfo.getName(); TypeName nameWithTypeVariables = viewInterfaceInfo.getNameWithTypeVariables(); DeclaredType viewInterfaceType = (DeclaredType) viewInterfaceInfo.getElement().asType(); @@ -76,9 +75,18 @@ private JavaFile generate(ViewInterfaceInfo viewInterfaceInfo, @Nullable ClassNa .addSuperinterface(nameWithTypeVariables) .addTypeVariables(new ArrayList(viewInterfaceInfo.getTypeVariables()) {{ add(0, variableName); - }}) - .superclass(superClassName == null ? MVP_VIEW_STATE_TYPE_NAME : - ParameterizedTypeName.get(superClassName, generateSuperClassTypeVariables(viewInterfaceInfo, variableName))); + }}); + + ViewInterfaceInfo info = viewInterfaceInfo.getSuperInterfaceInfo(); + if (info == null || filesMap.get(info) == null) { + classBuilder.superclass(MVP_VIEW_STATE_TYPE_NAME); + } else { + JavaFile file = filesMap.get(info); + ClassName superClassName = ClassName.get(file.packageName, file.typeSpec.name);; + classBuilder.superclass( + ParameterizedTypeName.get(superClassName, generateSuperClassTypeVariables(viewInterfaceInfo, variableName)) + ); + } for (ViewMethod method : viewInterfaceInfo.getMethods()) { TypeSpec commandClass = generateCommandClass(method, nameWithTypeVariables); diff --git a/moxy/src/test/java/com/omegar/mvp/compiler/CompilerTest.java b/moxy/src/test/java/com/omegar/mvp/compiler/CompilerTest.java index 5d74f934..9d632ac7 100644 --- a/moxy/src/test/java/com/omegar/mvp/compiler/CompilerTest.java +++ b/moxy/src/test/java/com/omegar/mvp/compiler/CompilerTest.java @@ -98,7 +98,7 @@ protected void assertCompilationResultIs(Table classNames = Lists.newArrayList(); List sourceFiles = Lists.newArrayList(); diff --git a/moxy/src/test/java/com/omegar/mvp/tests/LocalPresenterTest.java b/moxy/src/test/java/com/omegar/mvp/tests/LocalPresenterTest.java index 31f0d7c6..c1b7832b 100644 --- a/moxy/src/test/java/com/omegar/mvp/tests/LocalPresenterTest.java +++ b/moxy/src/test/java/com/omegar/mvp/tests/LocalPresenterTest.java @@ -115,7 +115,7 @@ public void checkSaveState() { mTestViewMvpDelegate.onCreate(bundle); mTestViewMvpDelegate.onAttach(); - //TODO: should be passed! Or change test + //TODO: should be passed! Or change generateInfos //assertTrue("Local presenter has different hashCode after recreate", hashCode == mDelegateLocalPresenterTestView.mInjectViewStatePresenter.hashCode()); mTestViewMvpDelegate.onDetach(); diff --git a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt index e8143226..275bf9f2 100644 --- a/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt +++ b/sample-custom-strategy/src/main/kotlin/com/redmadrobot/app/presentation/launch/LaunchFragment.kt @@ -11,11 +11,10 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.omegar.mvp.MvpAppCompatFragment + import com.omegar.mvp.presenter.InjectPresenter import com.omegar.mvp.presenter.ProvidePresenter import com.redmadrobot.sample_custom_strategy.R -import kotlinx.android.synthetic.main.fragment_launch.* class LaunchFragment : MvpAppCompatFragment(), LaunchView { diff --git a/settings.gradle b/settings.gradle index c4153a45..4013f683 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,6 @@ include ':moxy', ':stub-reflector', ':moxy-android', ':moxy-compiler', ':stub-android', ':moxy-app-compat', ':moxy-androidx', ':stub-appcompat', ':stub-androidx' include ':sample-github' include ':sample-kotlin' -include ':sample-custom-strategy' include ':moxy-androidx-sample' project(':stub-reflector').projectDir = new File('moxy/stub-reflector') project(':stub-android').projectDir = new File('moxy-android/stub-android') From 41c86c00691467fcb1f78f9d6a77b777245355cf Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Mon, 7 Oct 2019 14:00:23 +0300 Subject: [PATCH 17/36] Code generation optimized --- .../viewstate/ViewInterfaceProcessor.java | 16 ++++++++-------- .../viewstate/ViewStateClassGenerator.java | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java index 9c9db207..6f808a80 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java @@ -64,8 +64,7 @@ private void fillWithNotInheredMethods(List list) { if (info.getSuperTypeMvpElements().size() > 1) { List inheredMethods = getInheredMethods(info); - Set notInheredMethods = getNotInheredMethods(info, list); - for (ViewMethod method : notInheredMethods) { + for (ViewMethod method : getNotInheredMethods(info, list)) { if (!inheredMethods.contains(method)) infoMethods.add(method); } } @@ -82,18 +81,19 @@ private List getInheredMethods(ViewInterfaceInfo info) { } private Set getNotInheredMethods(ViewInterfaceInfo info, List infoList) { - if (info.getSuperTypeMvpElements().size() <= 1) return Collections.emptySet(); + List elements = info.getSuperTypeMvpElements(); + if (elements.size() <= 1) return Collections.emptySet(); assert info.getSuperInterfaceInfo() != null; TypeElement superClassElement = info.getSuperInterfaceInfo().getElement(); Set methodSet = new LinkedHashSet<>(); - for (TypeElement element : info.getSuperTypeMvpElements()) { + for (TypeElement element : elements) { if (!element.equals(superClassElement)) { - ViewInterfaceInfo infoByTypeElement = getViewInterfaceInfoByTypeElement(infoList, element); - if (infoByTypeElement != null) { - methodSet.addAll(getInheredMethods(infoByTypeElement)); - methodSet.addAll(getNotInheredMethods(infoByTypeElement, infoList)); + ViewInterfaceInfo infoByType = getViewInterfaceInfoByTypeElement(infoList, element); + if (infoByType != null) { + methodSet.addAll(getInheredMethods(infoByType)); + methodSet.addAll(getNotInheredMethods(infoByType, infoList)); } } } diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java index df3a0837..52c745ed 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java @@ -78,11 +78,11 @@ private JavaFile generate(ViewInterfaceInfo viewInterfaceInfo) { }}); ViewInterfaceInfo info = viewInterfaceInfo.getSuperInterfaceInfo(); - if (info == null || filesMap.get(info) == null) { + JavaFile file = filesMap.get(info); + if (file == null) { classBuilder.superclass(MVP_VIEW_STATE_TYPE_NAME); } else { - JavaFile file = filesMap.get(info); - ClassName superClassName = ClassName.get(file.packageName, file.typeSpec.name);; + ClassName superClassName = ClassName.get(file.packageName, file.typeSpec.name); classBuilder.superclass( ParameterizedTypeName.get(superClassName, generateSuperClassTypeVariables(viewInterfaceInfo, variableName)) ); From f897ada3a03e861e224160927a0e4c3172008efb Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Mon, 7 Oct 2019 17:42:01 +0300 Subject: [PATCH 18/36] Class generator updated --- .../mvp/compiler/viewstate/ViewStateClassGenerator.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java index 52c745ed..03ddd118 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java @@ -3,6 +3,7 @@ import com.omegar.mvp.MvpProcessor; import com.omegar.mvp.compiler.JavaFilesGenerator; import com.omegar.mvp.compiler.MvpCompiler; +import com.omegar.mvp.compiler.Util; import com.omegar.mvp.viewstate.MvpViewState; import com.omegar.mvp.viewstate.ViewCommand; import com.squareup.javapoet.ClassName; @@ -89,7 +90,7 @@ private JavaFile generate(ViewInterfaceInfo viewInterfaceInfo) { } for (ViewMethod method : viewInterfaceInfo.getMethods()) { - TypeSpec commandClass = generateCommandClass(method, nameWithTypeVariables); + TypeSpec commandClass = generateCommandClass(method); classBuilder.addType(commandClass); classBuilder.addMethod(generateMethod(viewInterfaceType, method, nameWithTypeVariables, commandClass)); } @@ -102,7 +103,9 @@ private JavaFile generate(ViewInterfaceInfo viewInterfaceInfo) { private TypeVariableName[] generateSuperClassTypeVariables(ViewInterfaceInfo viewInterfaceInfo, TypeVariableName variableName) { List parentClassTypeVariables = new ArrayList<>(); parentClassTypeVariables.add(variableName); - for (TypeMirror mirror : viewInterfaceInfo.getElement().getInterfaces()) { + + TypeMirror mirror = Util.firstOrNull(viewInterfaceInfo.getElement().getInterfaces()); + if (mirror != null) { List typeArguments = ((DeclaredType) mirror).getTypeArguments(); for (TypeMirror typeMirror : typeArguments) { TypeName typeName = ClassName.get(typeMirror); @@ -114,7 +117,7 @@ private TypeVariableName[] generateSuperClassTypeVariables(ViewInterfaceInfo vie return parentClassTypeVariables.toArray(new TypeVariableName[parentClassTypeVariables.size()]); } - private TypeSpec generateCommandClass(ViewMethod method, TypeName viewTypeName) { + private TypeSpec generateCommandClass(ViewMethod method) { MethodSpec applyMethod = MethodSpec.methodBuilder("apply") .addAnnotation(Override.class) .addModifiers(Modifier.PUBLIC) From 43e914bce533971169cd1dc6f2fe8a4500a221b5 Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Tue, 8 Oct 2019 14:13:00 +0300 Subject: [PATCH 19/36] Adding not inhered ViewMethod logic updated --- .../com/moxy_androidx_sample/MainActivity.kt | 16 ++++++++++- .../com/moxy_androidx_sample/MainPresenter.kt | 2 +- .../com/moxy_androidx_sample/MainView.kt | 7 ++--- .../moxy_androidx_sample/fifth/FifthView.java | 9 ++++++ .../moxy_androidx_sample/first/FirstView.java | 6 ++++ .../moxy_androidx_sample/fourth/FourthView.kt | 9 ++++++ .../java/com/omegar/mvp/compiler/Util.java | 5 ++++ .../viewstate/ViewInterfaceProcessor.java | 5 +++- .../mvp/compiler/viewstate/ViewMethod.java | 28 +++++++++++++++++++ 9 files changed, 80 insertions(+), 7 deletions(-) create mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/FifthView.java create mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt index b2bdbd43..61512d51 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt @@ -1,11 +1,25 @@ package example.com.moxy_androidx_sample +import android.location.Location import android.os.Bundle import android.util.Log import com.omegar.mvp.presenter.InjectPresenter +import example.com.moxy_androidx_sample.first.FirstView import example.com.moxy_androidx_sample.packagee.Item class MainActivity : BaseActivity(), MainView, SecondInterface { + override fun fourth(item: String?) { + TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + } + + override fun firstLog(m: Item?) { + TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + } + + override fun firstCopyMethod(item: MutableList?) { + TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + } + override fun thirdMethod() { TODO("not implemented") //To change body of created functions use File | Settings | File Templates. } @@ -26,7 +40,7 @@ class MainActivity : BaseActivity(), MainView, SecondInterface { // setContentView(R.layout.activity_main) } - override fun printLog(msg: Double?) { + override fun printLog(msg: Double?, log: String?) { Log.e(TAG, "printLog : msg : $msg activity hash code : ${hashCode()}") } diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainPresenter.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainPresenter.kt index b3bce4f3..48b3866c 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainPresenter.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainPresenter.kt @@ -10,7 +10,7 @@ class MainPresenter : MvpPresenter() { override fun onFirstViewAttach() { super.onFirstViewAttach() Log.e(MainActivity.TAG, "presenter hash code : ${hashCode()}") - viewState.printLog(10.0) + viewState.printLog(10.0, "Kek") } } \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainView.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainView.kt index e7b153cd..314ca229 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainView.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainView.kt @@ -1,13 +1,12 @@ package example.com.moxy_androidx_sample +import example.com.moxy_androidx_sample.fifth.FifthView import example.com.moxy_androidx_sample.first.FirstView import example.com.moxy_androidx_sample.packagee.Item import example.com.moxy_androidx_sample.second.SecondView -import example.com.moxy_androidx_sample.third.ThirdView -import java.io.Serializable -interface MainView : FirstView, SecondView, ThirdView, Serializable { +interface MainView : FirstView, SecondView, FifthView { - fun printLog(msg: Double?) + fun printLog(msg: Double?, log: String?) } \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/FifthView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/FifthView.java new file mode 100644 index 00000000..42b7774f --- /dev/null +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/FifthView.java @@ -0,0 +1,9 @@ +package example.com.moxy_androidx_sample.fifth; + +import example.com.moxy_androidx_sample.fourth.FourthView; + +public interface FifthView extends FourthView { + + + +} diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java index 29f4ce19..141b5eee 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java @@ -1,5 +1,7 @@ package example.com.moxy_androidx_sample.first; +import android.location.Location; + import java.util.List; import example.com.moxy_androidx_sample.BaseView; @@ -9,4 +11,8 @@ public interface FirstView extends BaseView, ThirdView { void firstMethod(List item); + void firstCopyMethod(List item); + + void firstLog(M m); + } \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt new file mode 100644 index 00000000..07156bc0 --- /dev/null +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt @@ -0,0 +1,9 @@ +package example.com.moxy_androidx_sample.fourth + +import example.com.moxy_androidx_sample.BaseView + +interface FourthView : BaseView { + + fun fourth(item: R) + +} \ No newline at end of file diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java index 48d2bf11..c2aedc56 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java @@ -213,6 +213,11 @@ public static boolean isMvpElement(TypeElement element) { return false; } + public static E firstOrNull(@Nullable List list) { + if (list == null || list.isEmpty()) return null; + return list.get(0); + } + public static E lastOrNull(@Nullable Set set) { if (set == null || set.isEmpty()) return null; return lastOrNull(new ArrayList<>(set)); diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java index 6f808a80..78c9140c 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java @@ -60,12 +60,15 @@ public List process(TypeElement element) { private void fillWithNotInheredMethods(List list) { for (ViewInterfaceInfo info : list) { + TypeElement element = info.getElement(); List infoMethods = info.getMethods(); if (info.getSuperTypeMvpElements().size() > 1) { List inheredMethods = getInheredMethods(info); for (ViewMethod method : getNotInheredMethods(info, list)) { - if (!inheredMethods.contains(method)) infoMethods.add(method); + if (!inheredMethods.contains(method)) { + infoMethods.add(new ViewMethod((DeclaredType) element.asType(), method)); + } } } } diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewMethod.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewMethod.java index 36336a5a..b523292a 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewMethod.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewMethod.java @@ -35,6 +35,18 @@ class ViewMethod { private String uniqueSuffix; + ViewMethod(DeclaredType targetInterfaceElement, ViewMethod method) { + this.methodElement = method.getElement(); + this.name = method.name; + this.strategy = method.strategy; + this.tag = method.tag; + this.parameterSpecs = formatParameters(targetInterfaceElement, method.methodElement, method.parameterSpecs); + this.exceptions = method.exceptions; + this.typeVariables = method.typeVariables; + this.argumentsString = method.argumentsString; + this.uniqueSuffix = method.uniqueSuffix; + } + ViewMethod(DeclaredType targetInterfaceElement, ExecutableElement methodElement, TypeElement strategy, @@ -78,6 +90,22 @@ class ViewMethod { this.uniqueSuffix = ""; } + private List formatParameters(DeclaredType enclosingType, ExecutableElement element, + List parameterSpecs) { + List list = new ArrayList<>(); + + ExecutableType executableType = (ExecutableType) MvpCompiler.getTypeUtils().asMemberOf(enclosingType, element); + List resolvedParameterTypes = executableType.getParameterTypes(); + + for (int i = 0; i < parameterSpecs.size(); i++) { + ParameterSpec parameter = parameterSpecs.get(i); + TypeName type = TypeName.get(resolvedParameterTypes.get(i)); + list.add(ParameterSpec.builder(type, parameter.name).build()); + } + + return list; + } + ExecutableElement getElement() { return methodElement; } From e9bcf240ae1d0d78db98c39493b6b43b3884544e Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Tue, 8 Oct 2019 14:46:14 +0300 Subject: [PATCH 20/36] time logs added --- .../java/com/omegar/mvp/compiler/MvpCompiler.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java index b0f71b9e..2c989b45 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java @@ -18,10 +18,12 @@ import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Collections; +import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -125,6 +127,7 @@ public boolean process(Set annotations, RoundEnvironment } private boolean throwableProcess(RoundEnvironment roundEnv) { + long startGeneration = new Date().getTime(); checkInjectors(roundEnv, InjectPresenter.class, new PresenterInjectorRules(ElementKind.FIELD, Modifier.PUBLIC, Modifier.DEFAULT)); InjectViewStateProcessor injectViewStateProcessor = new InjectViewStateProcessor(); @@ -138,11 +141,18 @@ private boolean throwableProcess(RoundEnvironment roundEnv) { processInjectors(roundEnv, InjectViewState.class, ElementKind.CLASS, injectViewStateProcessor, viewStateProviderClassGenerator); + long generateInjectViewState = new Date().getTime(); + getMessager().printMessage(Diagnostic.Kind.WARNING, "generateInjectViewState " + (generateInjectViewState - startGeneration)); + processInjectors(roundEnv, InjectPresenter.class, ElementKind.FIELD, injectPresenterProcessor, presenterBinderClassGenerator); + long generateInjectPresenter = new Date().getTime(); + getMessager().printMessage(Diagnostic.Kind.WARNING, "generateInjectPresenter " + (generateInjectPresenter - generateInjectViewState)); generateCode(injectViewStateProcessor.getUsedViews(), ElementKind.INTERFACE, viewInterfaceProcessor, viewStateClassGenerator); + long generateCode = new Date().getTime(); + getMessager().printMessage(Diagnostic.Kind.WARNING, "generateCode " + (generateCode - generateInjectPresenter)); String moxyReflectorPackage = sOptions.get(OPTION_MOXY_REFLECTOR_PACKAGE); @@ -162,6 +172,9 @@ private boolean throwableProcess(RoundEnvironment roundEnv) { createSourceFile(moxyReflector); + long createSourceFile = new Date().getTime(); + getMessager().printMessage(Diagnostic.Kind.WARNING, "createSourceFile " + (createSourceFile - generateCode)); + return true; } From 3e84b36a5362da66e5f51c2498fdb47a82f56a7b Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Tue, 8 Oct 2019 14:54:52 +0300 Subject: [PATCH 21/36] Time logs removed --- .../java/com/omegar/mvp/compiler/MvpCompiler.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java index 2c989b45..338389bd 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java @@ -1,5 +1,6 @@ package com.omegar.mvp.compiler; +import com.google.auto.service.AutoService; import com.omegar.mvp.GenerateViewState; import com.omegar.mvp.InjectViewState; import com.omegar.mvp.RegisterMoxyReflectorPackages; @@ -11,19 +12,16 @@ import com.omegar.mvp.compiler.viewstateprovider.InjectViewStateProcessor; import com.omegar.mvp.compiler.viewstateprovider.ViewStateProviderClassGenerator; import com.omegar.mvp.presenter.InjectPresenter; -import com.google.auto.service.AutoService; import com.squareup.javapoet.JavaFile; import java.io.IOException; import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Collections; -import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -127,7 +125,6 @@ public boolean process(Set annotations, RoundEnvironment } private boolean throwableProcess(RoundEnvironment roundEnv) { - long startGeneration = new Date().getTime(); checkInjectors(roundEnv, InjectPresenter.class, new PresenterInjectorRules(ElementKind.FIELD, Modifier.PUBLIC, Modifier.DEFAULT)); InjectViewStateProcessor injectViewStateProcessor = new InjectViewStateProcessor(); @@ -141,18 +138,11 @@ private boolean throwableProcess(RoundEnvironment roundEnv) { processInjectors(roundEnv, InjectViewState.class, ElementKind.CLASS, injectViewStateProcessor, viewStateProviderClassGenerator); - long generateInjectViewState = new Date().getTime(); - getMessager().printMessage(Diagnostic.Kind.WARNING, "generateInjectViewState " + (generateInjectViewState - startGeneration)); - processInjectors(roundEnv, InjectPresenter.class, ElementKind.FIELD, injectPresenterProcessor, presenterBinderClassGenerator); - long generateInjectPresenter = new Date().getTime(); - getMessager().printMessage(Diagnostic.Kind.WARNING, "generateInjectPresenter " + (generateInjectPresenter - generateInjectViewState)); generateCode(injectViewStateProcessor.getUsedViews(), ElementKind.INTERFACE, viewInterfaceProcessor, viewStateClassGenerator); - long generateCode = new Date().getTime(); - getMessager().printMessage(Diagnostic.Kind.WARNING, "generateCode " + (generateCode - generateInjectPresenter)); String moxyReflectorPackage = sOptions.get(OPTION_MOXY_REFLECTOR_PACKAGE); @@ -172,9 +162,6 @@ private boolean throwableProcess(RoundEnvironment roundEnv) { createSourceFile(moxyReflector); - long createSourceFile = new Date().getTime(); - getMessager().printMessage(Diagnostic.Kind.WARNING, "createSourceFile " + (createSourceFile - generateCode)); - return true; } From e1a97296dfee98835ae79279beaa2d40c2811e1c Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Tue, 8 Oct 2019 17:01:45 +0300 Subject: [PATCH 22/36] View interface inside other interface - generation bug fixed --- build.gradle | 2 +- .../com/moxy_androidx_sample/MainActivity.kt | 4 ++-- .../com/moxy_androidx_sample/MainPresenter.kt | 3 ++- .../example/com/moxy_androidx_sample/MainView.kt | 12 ------------ .../moxy_androidx_sample/contract/Contract.kt | 16 ++++++++++++++++ .../fifth/{FifthView.java => Contract.java} | 4 +++- .../main/java/com/omegar/mvp/compiler/Util.java | 11 +++++++++++ .../viewstate/ViewStateClassGenerator.java | 6 +++--- 8 files changed, 38 insertions(+), 20 deletions(-) delete mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainView.kt create mode 100644 moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/contract/Contract.kt rename moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/{FifthView.java => Contract.java} (56%) diff --git a/build.gradle b/build.gradle index 34ec28ad..c65ae264 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ allprojects { ext { targetVersionCode = 46 targetVersionName = "1.5.6" - kotlin_version = '1.3.21' + kotlin_version = '1.3.41' deps = [ android : 'com.google.android:android:1.6_r2', diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt index 61512d51..40c87f00 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt @@ -4,10 +4,10 @@ import android.location.Location import android.os.Bundle import android.util.Log import com.omegar.mvp.presenter.InjectPresenter -import example.com.moxy_androidx_sample.first.FirstView +import example.com.moxy_androidx_sample.contract.Contract import example.com.moxy_androidx_sample.packagee.Item -class MainActivity : BaseActivity(), MainView, SecondInterface { +class MainActivity : BaseActivity(), Contract.MainView, SecondInterface { override fun fourth(item: String?) { TODO("not implemented") //To change body of created functions use File | Settings | File Templates. } diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainPresenter.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainPresenter.kt index 48b3866c..b4e77ce0 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainPresenter.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainPresenter.kt @@ -3,9 +3,10 @@ package example.com.moxy_androidx_sample import android.util.Log import com.omegar.mvp.InjectViewState import com.omegar.mvp.MvpPresenter +import example.com.moxy_androidx_sample.contract.Contract @InjectViewState -class MainPresenter : MvpPresenter() { +class MainPresenter : MvpPresenter() { override fun onFirstViewAttach() { super.onFirstViewAttach() diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainView.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainView.kt deleted file mode 100644 index 314ca229..00000000 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainView.kt +++ /dev/null @@ -1,12 +0,0 @@ -package example.com.moxy_androidx_sample - -import example.com.moxy_androidx_sample.fifth.FifthView -import example.com.moxy_androidx_sample.first.FirstView -import example.com.moxy_androidx_sample.packagee.Item -import example.com.moxy_androidx_sample.second.SecondView - -interface MainView : FirstView, SecondView, FifthView { - - fun printLog(msg: Double?, log: String?) - -} \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/contract/Contract.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/contract/Contract.kt new file mode 100644 index 00000000..c2e62912 --- /dev/null +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/contract/Contract.kt @@ -0,0 +1,16 @@ +package example.com.moxy_androidx_sample.contract + +import example.com.moxy_androidx_sample.fifth.Contract +import example.com.moxy_androidx_sample.first.FirstView +import example.com.moxy_androidx_sample.packagee.Item +import example.com.moxy_androidx_sample.second.SecondView + +interface Contract { + + interface MainView : FirstView, SecondView, Contract.FifthView { + + fun printLog(msg: Double?, log: String?) + + } + +} \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/FifthView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java similarity index 56% rename from moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/FifthView.java rename to moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java index 42b7774f..6a7efbde 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/FifthView.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java @@ -2,8 +2,10 @@ import example.com.moxy_androidx_sample.fourth.FourthView; -public interface FifthView extends FourthView { +public interface Contract { + interface FifthView extends FourthView { + } } diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java index c2aedc56..1fb2a909 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/Util.java @@ -39,6 +39,7 @@ import javax.lang.model.type.TypeMirror; import javax.lang.model.type.TypeVariable; import javax.lang.model.type.WildcardType; +import javax.tools.Diagnostic; /** * Utilities for handling types in annotation processors @@ -128,6 +129,16 @@ public static String getFullClassName(TypeElement typeElement) { return packageName + className.replaceAll("\\.", "\\$"); } + public static String getSimpleClassName(TypeElement typeElement) { + String packageName = MvpCompiler.getElementUtils().getPackageOf(typeElement).getQualifiedName().toString(); + if (packageName.length() > 0) { + packageName += "."; + } + + String className = typeElement.toString().substring(packageName.length()); + return className.replaceAll("\\.", "\\$"); + } + public static AnnotationMirror getAnnotation(Element element, String annotationClass) { for (AnnotationMirror annotationMirror : element.getAnnotationMirrors()) { if (annotationMirror.getAnnotationType().asElement().toString().equals(annotationClass)) diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java index 03ddd118..e9c2bbd5 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewStateClassGenerator.java @@ -71,7 +71,7 @@ private JavaFile generate(ViewInterfaceInfo viewInterfaceInfo) { DeclaredType viewInterfaceType = (DeclaredType) viewInterfaceInfo.getElement().asType(); TypeVariableName variableName = TypeVariableName.get(VIEW, nameWithTypeVariables); - TypeSpec.Builder classBuilder = TypeSpec.classBuilder(viewName.simpleName() + MvpProcessor.VIEW_STATE_SUFFIX) + TypeSpec.Builder classBuilder = TypeSpec.classBuilder(Util.getSimpleClassName(viewInterfaceInfo.getElement()) + MvpProcessor.VIEW_STATE_SUFFIX) .addModifiers(Modifier.PUBLIC) .addSuperinterface(nameWithTypeVariables) .addTypeVariables(new ArrayList(viewInterfaceInfo.getTypeVariables()) {{ @@ -160,8 +160,8 @@ private MethodSpec generateMethod(DeclaredType enclosingType, ViewMethod method, .addStatement("return") .endControlFlow() .addCode("\n") - .beginControlFlow("for ($T view : mViews)", viewTypeName) - .addStatement("view.$L($L)", method.getName(), method.getArgumentsString()) + .beginControlFlow("for ($T view$$ : mViews)", viewTypeName) + .addStatement("view$$.$L($L)", method.getName(), method.getArgumentsString()) .endControlFlow() .addCode("\n") .addStatement("mViewCommands.afterApply($L)", commandFieldName) From 52d2850e9e31c380746bcc37dfe2720d2e018ae8 Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Tue, 8 Oct 2019 17:50:28 +0300 Subject: [PATCH 23/36] Default strategy removed --- .../moxy_androidx_sample/contract/Contract.kt | 3 +++ .../com/omegar/mvp/compiler/MvpCompiler.java | 5 ----- .../viewstate/ViewInterfaceProcessor.java | 21 +++++++++++++++---- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/contract/Contract.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/contract/Contract.kt index c2e62912..52080ef7 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/contract/Contract.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/contract/Contract.kt @@ -1,5 +1,7 @@ package example.com.moxy_androidx_sample.contract +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy +import com.omegar.mvp.viewstate.strategy.StateStrategyType import example.com.moxy_androidx_sample.fifth.Contract import example.com.moxy_androidx_sample.first.FirstView import example.com.moxy_androidx_sample.packagee.Item @@ -7,6 +9,7 @@ import example.com.moxy_androidx_sample.second.SecondView interface Contract { + @StateStrategyType(AddToEndSingleStrategy::class) interface MainView : FirstView, SecondView, Contract.FifthView { fun printLog(msg: Double?, log: String?) diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java index 338389bd..c2eed972 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java @@ -114,11 +114,6 @@ public boolean process(Set annotations, RoundEnvironment } catch (RuntimeException e) { getMessager().printMessage(Diagnostic.Kind.OTHER, "Moxy compilation failed. Could you copy stack trace above and write us (or make issue on Github)?"); e.printStackTrace(); - String s = Stream - .of(e.getStackTrace()) - .map(StackTraceElement::toString) - .collect(Collectors.joining("\n")); - getMessager().printMessage(Diagnostic.Kind.ERROR, "Moxy compilation failed; see the compiler error output for details (" + s + ")"); } return true; diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java index 78c9140c..ab97249a 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java @@ -3,7 +3,6 @@ import com.omegar.mvp.compiler.ElementProcessor; import com.omegar.mvp.compiler.MvpCompiler; import com.omegar.mvp.compiler.Util; -import com.omegar.mvp.viewstate.strategy.AddToEndStrategy; import com.omegar.mvp.viewstate.strategy.StateStrategyType; import com.squareup.javapoet.ParameterSpec; @@ -41,7 +40,6 @@ */ public class ViewInterfaceProcessor extends ElementProcessor> { private static final String STATE_STRATEGY_TYPE_ANNOTATION = StateStrategyType.class.getName(); - private static final TypeElement DEFAULT_STATE_STRATEGY = MvpCompiler.getElementUtils().getTypeElement(AddToEndStrategy.class.getCanonicalName()); private TypeElement viewInterfaceElement; private String viewInterfaceName; @@ -157,7 +155,7 @@ private Set generateInfos(TypeElement element) { } private void getMethods(TypeElement typeElement, - TypeElement defaultStrategy, + TypeElement parentStrategy, List rootMethods, List superinterfacesMethods) { for (Element element : typeElement.getEnclosedElements()) { @@ -189,7 +187,22 @@ private void getMethods(TypeElement typeElement, if (strategyClassFromAnnotation != null) { strategyClass = (TypeElement) ((DeclaredType) strategyClassFromAnnotation).asElement(); } else { - strategyClass = defaultStrategy != null ? defaultStrategy : DEFAULT_STATE_STRATEGY; + if (parentStrategy != null) { + strategyClass = parentStrategy; + } else { + String message = String.format("You are trying generate ViewState for %s. " + + "But %s interface and \"%s\" method don't provide Strategy type. " + + "Please annotate your %s interface or method with Strategy." + "\n\n" + + "@StateStrategyType(AddToEndSingleStrategy::class)" + "\n" + "fun %s", + typeElement.getSimpleName(), + typeElement.getSimpleName(), + methodElement.getSimpleName(), + typeElement.getSimpleName(), + methodElement.getSimpleName() + ); + MvpCompiler.getMessager().printMessage(Diagnostic.Kind.ERROR, message); + return; + } } // get tag from annotation From 140b1538cfaad9d6f549a19177b5b9276056a121 Mon Sep 17 00:00:00 2001 From: Anton Knyazev Date: Tue, 8 Oct 2019 18:02:30 +0300 Subject: [PATCH 24/36] Add For example --- .../omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java index ab97249a..c3c95865 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java @@ -193,7 +193,7 @@ private void getMethods(TypeElement typeElement, String message = String.format("You are trying generate ViewState for %s. " + "But %s interface and \"%s\" method don't provide Strategy type. " + "Please annotate your %s interface or method with Strategy." + "\n\n" + - "@StateStrategyType(AddToEndSingleStrategy::class)" + "\n" + "fun %s", + "For example:\n@StateStrategyType(AddToEndSingleStrategy::class)" + "\n" + "fun %s", typeElement.getSimpleName(), typeElement.getSimpleName(), methodElement.getSimpleName(), From 9aeb0aec9a0a441ee857edaf86e483cb18ce30f3 Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Wed, 9 Oct 2019 11:58:32 +0300 Subject: [PATCH 25/36] Gradle updated; IncrementalAnnotationProcessor annotation added --- build.gradle | 31 +++++++++++-------- gradle/wrapper/gradle-wrapper.properties | 4 +-- moxy-androidx-sample/build.gradle | 2 +- .../com/moxy_androidx_sample/BaseView.java | 3 ++ .../moxy_androidx_sample/fifth/Contract.java | 4 +++ .../moxy_androidx_sample/first/FirstView.java | 4 +++ .../moxy_androidx_sample/fourth/FourthView.kt | 3 ++ .../second/SecondView.java | 4 +++ .../moxy_androidx_sample/third/ThirdView.java | 4 +++ moxy-compiler/build.gradle | 5 ++- .../com/omegar/mvp/compiler/MvpCompiler.java | 6 ++-- 11 files changed, 51 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index c65ae264..8faa5f89 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } @@ -24,20 +24,25 @@ allprojects { ext { targetVersionCode = 46 targetVersionName = "1.5.6" - kotlin_version = '1.3.41' + kotlin_version = '1.3.50' + def autoServiceVersion = '1.0-rc5' + def gradleIncapHelperVersion = '0.2' deps = [ - android : 'com.google.android:android:1.6_r2', - javapoet : 'com.squareup:javapoet:1.10.0', - junit : 'junit:junit:4.12', - mockito : 'org.mockito:mockito-core:1.10.19', - truth : 'com.google.truth:truth:0.34', - robolectric : 'org.robolectric:robolectric:3.0', - compiletesting: 'com.google.testing.compile:compile-testing:0.15', - asm : ['org.ow2.asm:asm:6.0', 'org.ow2.asm:asm-util:6.0'], - autoservice : 'com.google.auto.service:auto-service:1.0-rc4', - autocommon : 'com.google.auto:auto-common:0.10', - guava : 'com.google.guava:guava:21.0', + android : 'com.google.android:android:1.6_r2', + javapoet : 'com.squareup:javapoet:1.10.0', + junit : 'junit:junit:4.12', + mockito : 'org.mockito:mockito-core:1.10.19', + truth : 'com.google.truth:truth:0.34', + robolectric : 'org.robolectric:robolectric:3.0', + compiletesting : 'com.google.testing.compile:compile-testing:0.15', + asm : ['org.ow2.asm:asm:6.0', 'org.ow2.asm:asm-util:6.0'], + autoservice : "com.google.auto.service:auto-service:$autoServiceVersion", + autoserviceAnnotations : "com.google.auto.service:auto-service-annotations:$autoServiceVersion", + autocommon : 'com.google.auto:auto-common:0.10', + guava : 'com.google.guava:guava:21.0', + gradleIncapHelperAnnotations: "net.ltgt.gradle.incap:incap:$gradleIncapHelperVersion", + gradleIncapHelperProcessor : "net.ltgt.gradle.incap:incap-processor:$gradleIncapHelperVersion" ] } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ee04ff52..fd97bee2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 21 17:43:47 MSK 2019 +#Wed Oct 09 11:52:42 MSK 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/moxy-androidx-sample/build.gradle b/moxy-androidx-sample/build.gradle index 1c76fae2..64f4375c 100644 --- a/moxy-androidx-sample/build.gradle +++ b/moxy-androidx-sample/build.gradle @@ -40,7 +40,7 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation project(':moxy') implementation project(':moxy-androidx') kapt project(':moxy-compiler') diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java index 60e2928e..4b812536 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java @@ -1,7 +1,10 @@ package example.com.moxy_androidx_sample; import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; +@StateStrategyType(AddToEndSingleStrategy.class) public interface BaseView extends MvpView { void testFunction(); diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java index 6a7efbde..db10d24b 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java @@ -1,9 +1,13 @@ package example.com.moxy_androidx_sample.fifth; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; + import example.com.moxy_androidx_sample.fourth.FourthView; public interface Contract { + @StateStrategyType(AddToEndSingleStrategy.class) interface FifthView extends FourthView { } diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java index 141b5eee..81c3b81c 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java @@ -2,11 +2,15 @@ import android.location.Location; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; + import java.util.List; import example.com.moxy_androidx_sample.BaseView; import example.com.moxy_androidx_sample.third.ThirdView; +@StateStrategyType(AddToEndSingleStrategy.class) public interface FirstView extends BaseView, ThirdView { void firstMethod(List item); diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt index 07156bc0..fe88665b 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt @@ -1,7 +1,10 @@ package example.com.moxy_androidx_sample.fourth +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy +import com.omegar.mvp.viewstate.strategy.StateStrategyType import example.com.moxy_androidx_sample.BaseView +@StateStrategyType(AddToEndSingleStrategy::class) interface FourthView : BaseView { fun fourth(item: R) diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java index bd9c0ecf..30b4c0da 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java @@ -1,7 +1,11 @@ package example.com.moxy_androidx_sample.second; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; + import example.com.moxy_androidx_sample.BaseView; +@StateStrategyType(AddToEndSingleStrategy.class) public interface SecondView extends BaseView { void secondMethod(); diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java index ab5a10c6..766ccaf4 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java @@ -1,7 +1,11 @@ package example.com.moxy_androidx_sample.third; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; + import example.com.moxy_androidx_sample.BaseView; +@StateStrategyType(AddToEndSingleStrategy.class) public interface ThirdView extends BaseView { void thirdMethod(); diff --git a/moxy-compiler/build.gradle b/moxy-compiler/build.gradle index 308ba770..286503f3 100644 --- a/moxy-compiler/build.gradle +++ b/moxy-compiler/build.gradle @@ -251,8 +251,11 @@ dependencies { implementation deps.javapoet compileOnly deps.autocommon - compileOnly deps.autoservice + compileOnly deps.autoserviceAnnotations + annotationProcessor deps.autoservice compileOnly deps.guava + compileOnly deps.gradleIncapHelperAnnotations + annotationProcessor deps.gradleIncapHelperProcessor javadocDeps project(':moxy') javadocDeps deps.javapoet diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java index c2eed972..fdcc06bf 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java @@ -14,6 +14,9 @@ import com.omegar.mvp.presenter.InjectPresenter; import com.squareup.javapoet.JavaFile; +import net.ltgt.gradle.incap.IncrementalAnnotationProcessor; +import net.ltgt.gradle.incap.IncrementalAnnotationProcessorType; + import java.io.IOException; import java.lang.annotation.Annotation; import java.util.ArrayList; @@ -22,8 +25,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.Messager; @@ -50,6 +51,7 @@ @SuppressWarnings("unused") @AutoService(Processor.class) +@IncrementalAnnotationProcessor(IncrementalAnnotationProcessorType.AGGREGATING) public class MvpCompiler extends AbstractProcessor { public static final String MOXY_REFLECTOR_DEFAULT_PACKAGE = "com.omegar.mvp"; From d7799dc0a600da1e9e6d5648d0b0d108c924f3d9 Mon Sep 17 00:00:00 2001 From: Anton Knyazev Date: Wed, 11 Dec 2019 11:31:51 +0300 Subject: [PATCH 26/36] Remove possible annotate StateStrategyType for interface Remove deprecreated annotation GenerateViewState --- .../com/moxy_androidx_sample/BaseView.java | 2 +- .../moxy_androidx_sample/contract/Contract.kt | 2 +- .../moxy_androidx_sample/fifth/Contract.java | 1 - .../moxy_androidx_sample/first/FirstView.java | 4 +- .../moxy_androidx_sample/fourth/FourthView.kt | 2 +- .../second/SecondView.java | 2 +- .../moxy_androidx_sample/third/ThirdView.java | 2 +- .../com/omegar/mvp/compiler/MvpCompiler.java | 4 +- .../viewstate/ViewInterfaceProcessor.java | 66 ++++--------------- .../strategies_inheritance/ChildView.java | 3 +- .../strategies_inheritance/ParentView.java | 4 +- .../com/omegar/mvp/GenerateViewState.java | 17 ----- .../viewstate/strategy/StateStrategyType.java | 2 +- .../java/com/omegar/mvp/view/ChildView.java | 2 - .../java/com/omegar/mvp/view/ParentView.java | 2 - ...tateChildWithIncorrectStrategyTagView.java | 2 - .../resources/view/ViewStateForClassView.java | 2 - .../resources/view/ViewStateForNotView.java | 3 - 18 files changed, 29 insertions(+), 93 deletions(-) delete mode 100644 moxy/src/main/java/com/omegar/mvp/GenerateViewState.java diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java index 4b812536..4a424be3 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java @@ -4,9 +4,9 @@ import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; import com.omegar.mvp.viewstate.strategy.StateStrategyType; -@StateStrategyType(AddToEndSingleStrategy.class) public interface BaseView extends MvpView { + @StateStrategyType(AddToEndSingleStrategy.class) void testFunction(); } \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/contract/Contract.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/contract/Contract.kt index 52080ef7..ac4614db 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/contract/Contract.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/contract/Contract.kt @@ -9,9 +9,9 @@ import example.com.moxy_androidx_sample.second.SecondView interface Contract { - @StateStrategyType(AddToEndSingleStrategy::class) interface MainView : FirstView, SecondView, Contract.FifthView { + @StateStrategyType(AddToEndSingleStrategy::class) fun printLog(msg: Double?, log: String?) } diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java index db10d24b..83d9134e 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java @@ -7,7 +7,6 @@ public interface Contract { - @StateStrategyType(AddToEndSingleStrategy.class) interface FifthView extends FourthView { } diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java index 81c3b81c..1d80efcf 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java @@ -10,13 +10,15 @@ import example.com.moxy_androidx_sample.BaseView; import example.com.moxy_androidx_sample.third.ThirdView; -@StateStrategyType(AddToEndSingleStrategy.class) public interface FirstView extends BaseView, ThirdView { + @StateStrategyType(AddToEndSingleStrategy.class) void firstMethod(List item); + @StateStrategyType(AddToEndSingleStrategy.class) void firstCopyMethod(List item); + @StateStrategyType(AddToEndSingleStrategy.class) void firstLog(M m); } \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt index fe88665b..e6af7063 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt @@ -4,9 +4,9 @@ import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy import com.omegar.mvp.viewstate.strategy.StateStrategyType import example.com.moxy_androidx_sample.BaseView -@StateStrategyType(AddToEndSingleStrategy::class) interface FourthView : BaseView { + @StateStrategyType(AddToEndSingleStrategy::class) fun fourth(item: R) } \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java index 30b4c0da..9d2b3606 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java @@ -5,9 +5,9 @@ import example.com.moxy_androidx_sample.BaseView; -@StateStrategyType(AddToEndSingleStrategy.class) public interface SecondView extends BaseView { + @StateStrategyType(AddToEndSingleStrategy.class) void secondMethod(); } \ No newline at end of file diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java index 766ccaf4..440f47c7 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java @@ -5,9 +5,9 @@ import example.com.moxy_androidx_sample.BaseView; -@StateStrategyType(AddToEndSingleStrategy.class) public interface ThirdView extends BaseView { + @StateStrategyType(AddToEndSingleStrategy.class) void thirdMethod(); } diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java index fdcc06bf..2b7a7051 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java @@ -1,7 +1,6 @@ package com.omegar.mvp.compiler; import com.google.auto.service.AutoService; -import com.omegar.mvp.GenerateViewState; import com.omegar.mvp.InjectViewState; import com.omegar.mvp.RegisterMoxyReflectorPackages; import com.omegar.mvp.compiler.presenterbinder.InjectPresenterProcessor; @@ -95,8 +94,7 @@ public Set getSupportedAnnotationTypes() { Collections.addAll(supportedAnnotationTypes, InjectPresenter.class.getCanonicalName(), InjectViewState.class.getCanonicalName(), - RegisterMoxyReflectorPackages.class.getCanonicalName(), - GenerateViewState.class.getCanonicalName()); + RegisterMoxyReflectorPackages.class.getCanonicalName()); return supportedAnnotationTypes; } diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java index c3c95865..389cd44c 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/viewstate/ViewInterfaceProcessor.java @@ -22,7 +22,6 @@ import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.Modifier; import javax.lang.model.element.TypeElement; -import javax.lang.model.element.TypeParameterElement; import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; @@ -115,10 +114,8 @@ private Set generateInfos(TypeElement element) { List methods = new ArrayList<>(); - TypeElement interfaceStateStrategyType = getInterfaceStateStrategyType(element); - // Get methods for input class - getMethods(element, interfaceStateStrategyType, new ArrayList<>(), methods); + getMethods(element, new ArrayList<>(), methods); // Add methods from super interfaces ViewInterfaceInfo superInterfaceInfo = null; @@ -155,7 +152,6 @@ private Set generateInfos(TypeElement element) { } private void getMethods(TypeElement typeElement, - TypeElement parentStrategy, List rootMethods, List superinterfacesMethods) { for (Element element : typeElement.getEnclosedElements()) { @@ -187,22 +183,19 @@ private void getMethods(TypeElement typeElement, if (strategyClassFromAnnotation != null) { strategyClass = (TypeElement) ((DeclaredType) strategyClassFromAnnotation).asElement(); } else { - if (parentStrategy != null) { - strategyClass = parentStrategy; - } else { - String message = String.format("You are trying generate ViewState for %s. " + - "But %s interface and \"%s\" method don't provide Strategy type. " + - "Please annotate your %s interface or method with Strategy." + "\n\n" + - "For example:\n@StateStrategyType(AddToEndSingleStrategy::class)" + "\n" + "fun %s", - typeElement.getSimpleName(), - typeElement.getSimpleName(), - methodElement.getSimpleName(), - typeElement.getSimpleName(), - methodElement.getSimpleName() - ); - MvpCompiler.getMessager().printMessage(Diagnostic.Kind.ERROR, message); - return; - } + String message = String.format("You are trying generate ViewState for %s. " + + "But %s interface and \"%s\" method don't provide Strategy type. " + + "Please annotate your %s interface or method with Strategy." + "\n\n" + + "For example:\n@StateStrategyType(AddToEndSingleStrategy::class)" + "\n" + "fun %s", + typeElement.getSimpleName(), + typeElement.getSimpleName(), + methodElement.getSimpleName(), + typeElement.getSimpleName(), + methodElement.getSimpleName() + ); + MvpCompiler.getMessager().printMessage(Diagnostic.Kind.ERROR, message); + return; + } // get tag from annotation @@ -259,37 +252,6 @@ private void checkStrategyAndTagEquals(ViewMethod method, ViewMethod existingMet } } - private List iterateInterfaces(TypeElement parentElement, - TypeElement parentDefaultStrategy, - List rootMethods, - List superinterfacesMethods) { - for (TypeMirror typeMirror : parentElement.getInterfaces()) { - final TypeElement anInterface = (TypeElement) ((DeclaredType) typeMirror).asElement(); - final List typeArguments = ((DeclaredType) typeMirror).getTypeArguments(); - final List typeParameters = anInterface.getTypeParameters(); - if (typeArguments.size() > typeParameters.size()) { - throw new IllegalArgumentException("Code generation for interface " + anInterface.getSimpleName() + " failed. Simplify your generics."); - } - - TypeElement defaultStrategy = parentDefaultStrategy != null ? parentDefaultStrategy : getInterfaceStateStrategyType(anInterface); - - getMethods(anInterface, defaultStrategy, rootMethods, superinterfacesMethods); - - iterateInterfaces(anInterface, defaultStrategy, rootMethods, superinterfacesMethods); - } - - return superinterfacesMethods; - } - - private TypeElement getInterfaceStateStrategyType(TypeElement typeElement) { - AnnotationMirror annotation = Util.getAnnotation(typeElement, STATE_STRATEGY_TYPE_ANNOTATION); - TypeMirror value = Util.getAnnotationValueAsTypeMirror(annotation, "value"); - if (value != null && value.getKind() == TypeKind.DECLARED) { - return (TypeElement) ((DeclaredType) value).asElement(); - } else { - return null; - } - } } diff --git a/moxy-compiler/src/test/resources/view/strategies_inheritance/ChildView.java b/moxy-compiler/src/test/resources/view/strategies_inheritance/ChildView.java index a3363a6e..b15cb28e 100644 --- a/moxy-compiler/src/test/resources/view/strategies_inheritance/ChildView.java +++ b/moxy-compiler/src/test/resources/view/strategies_inheritance/ChildView.java @@ -5,13 +5,14 @@ import view.strategies_inheritance.strategies.ChildDefaultStrategy; import view.strategies_inheritance.strategies.Strategy2; -@StateStrategyType(ChildDefaultStrategy.class) public interface ChildView extends ParentView { + @StateStrategyType(ChildDefaultStrategy.class) void parentMethod1(); // ParentDefaultStrategy -> ChildDefaultStrategy @StateStrategyType(Strategy2.class) void parentMethod2(); // ParentDefaultStrategy -> Strategy2 + @StateStrategyType(ChildDefaultStrategy.class) void childMethod(); // ChildDefaultStrategy @StateStrategyType(Strategy2.class) diff --git a/moxy-compiler/src/test/resources/view/strategies_inheritance/ParentView.java b/moxy-compiler/src/test/resources/view/strategies_inheritance/ParentView.java index 27329016..04a17f22 100644 --- a/moxy-compiler/src/test/resources/view/strategies_inheritance/ParentView.java +++ b/moxy-compiler/src/test/resources/view/strategies_inheritance/ParentView.java @@ -6,12 +6,14 @@ import view.strategies_inheritance.strategies.ParentDefaultStrategy; import view.strategies_inheritance.strategies.Strategy1; -@StateStrategyType(ParentDefaultStrategy.class) public interface ParentView extends MvpView { + @StateStrategyType(ParentDefaultStrategy.class) void parentMethod1(); // ParentDefaultStrategy + @StateStrategyType(ParentDefaultStrategy.class) void parentMethod2(); // ParentDefaultStrategy + @StateStrategyType(ParentDefaultStrategy.class) void parentMethod3(); // ParentDefaultStrategy @StateStrategyType(Strategy1.class) diff --git a/moxy/src/main/java/com/omegar/mvp/GenerateViewState.java b/moxy/src/main/java/com/omegar/mvp/GenerateViewState.java deleted file mode 100644 index df18e70d..00000000 --- a/moxy/src/main/java/com/omegar/mvp/GenerateViewState.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.omegar.mvp; - -import java.lang.annotation.Target; - - -import static java.lang.annotation.ElementType.TYPE; - -/** - *

      Generate view state class for annotated view interface.

      - *

      Generated class implements this view interface.

      - * - * @deprecated As of release 0.4.1, {@link InjectViewState} generate view state, if it needed - */ -@Target(value = TYPE) -@Deprecated -public @interface GenerateViewState { -} diff --git a/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/StateStrategyType.java b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/StateStrategyType.java index f073d8d8..b7a91fcd 100644 --- a/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/StateStrategyType.java +++ b/moxy/src/main/java/com/omegar/mvp/viewstate/strategy/StateStrategyType.java @@ -12,7 +12,7 @@ * @author Yuri Shmakov * @author Alexander Blinov */ -@Target(value = {ElementType.TYPE, ElementType.METHOD}) +@Target(value = {ElementType.METHOD}) @Retention(value = RetentionPolicy.RUNTIME) public @interface StateStrategyType { Class value(); diff --git a/moxy/src/test/java/com/omegar/mvp/view/ChildView.java b/moxy/src/test/java/com/omegar/mvp/view/ChildView.java index acc84988..acdf1473 100644 --- a/moxy/src/test/java/com/omegar/mvp/view/ChildView.java +++ b/moxy/src/test/java/com/omegar/mvp/view/ChildView.java @@ -1,6 +1,5 @@ package com.omegar.mvp.view; -import com.omegar.mvp.GenerateViewState; import com.omegar.mvp.viewstate.strategy.SkipStrategy; import com.omegar.mvp.viewstate.strategy.StateStrategyType; @@ -10,7 +9,6 @@ * * @author Savin Mikhail */ -@GenerateViewState @StateStrategyType(SkipStrategy.class) public interface ChildView extends ParentView, SimpleInterface { @Override diff --git a/moxy/src/test/java/com/omegar/mvp/view/ParentView.java b/moxy/src/test/java/com/omegar/mvp/view/ParentView.java index a70ac0ab..a7802c32 100644 --- a/moxy/src/test/java/com/omegar/mvp/view/ParentView.java +++ b/moxy/src/test/java/com/omegar/mvp/view/ParentView.java @@ -1,6 +1,5 @@ package com.omegar.mvp.view; -import com.omegar.mvp.GenerateViewState; import com.omegar.mvp.MvpView; import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; import com.omegar.mvp.viewstate.strategy.StateStrategyType; @@ -11,7 +10,6 @@ * * @author Savin Mikhail */ -@GenerateViewState public interface ParentView extends MvpView { void withoutStrategyMethod(); diff --git a/moxy/src/test/resources/view/ViewStateChildWithIncorrectStrategyTagView.java b/moxy/src/test/resources/view/ViewStateChildWithIncorrectStrategyTagView.java index b72fdd7c..59a6a46d 100644 --- a/moxy/src/test/resources/view/ViewStateChildWithIncorrectStrategyTagView.java +++ b/moxy/src/test/resources/view/ViewStateChildWithIncorrectStrategyTagView.java @@ -1,6 +1,5 @@ package view; -import com.omegar.mvp.GenerateViewState; /** * Date: 26.02.2016 @@ -8,7 +7,6 @@ * * @author Savin Mikhail */ -@GenerateViewState public interface ViewStateChildWithIncorrectStrategyTagView extends ViewStateParentView, ViewStateParentStrategyTagView { } diff --git a/moxy/src/test/resources/view/ViewStateForClassView.java b/moxy/src/test/resources/view/ViewStateForClassView.java index d260098a..215bf6a7 100644 --- a/moxy/src/test/resources/view/ViewStateForClassView.java +++ b/moxy/src/test/resources/view/ViewStateForClassView.java @@ -1,6 +1,5 @@ package view; -import com.omegar.mvp.GenerateViewState; import com.omegar.mvp.MvpView; /** @@ -9,7 +8,6 @@ * * @author Savin Mikhail */ -@GenerateViewState public class ViewStateForClassView implements MvpView { public void showProgress() { diff --git a/moxy/src/test/resources/view/ViewStateForNotView.java b/moxy/src/test/resources/view/ViewStateForNotView.java index 0fbdf729..6f6ec713 100644 --- a/moxy/src/test/resources/view/ViewStateForNotView.java +++ b/moxy/src/test/resources/view/ViewStateForNotView.java @@ -1,13 +1,10 @@ package view; -import com.omegar.mvp.GenerateViewState; - /** * Date: 26.02.2016 * Time: 11:08 * * @author Savin Mikhail */ -@GenerateViewState public interface ViewStateForNotView { } From 0b6c05cec7ab8415728cdcf03d61a7f3f9280d0a Mon Sep 17 00:00:00 2001 From: Anton Knyazev Date: Mon, 23 Mar 2020 16:58:54 +0300 Subject: [PATCH 27/36] Make injectviewstate not required --- .../kotlin/example/com/moxy_androidx_sample/MainPresenter.kt | 1 - moxy/src/main/java/com/omegar/mvp/InjectViewState.java | 2 ++ moxy/src/main/java/com/omegar/mvp/MvpPresenter.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainPresenter.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainPresenter.kt index b4e77ce0..42a1539b 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainPresenter.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainPresenter.kt @@ -5,7 +5,6 @@ import com.omegar.mvp.InjectViewState import com.omegar.mvp.MvpPresenter import example.com.moxy_androidx_sample.contract.Contract -@InjectViewState class MainPresenter : MvpPresenter() { override fun onFirstViewAttach() { diff --git a/moxy/src/main/java/com/omegar/mvp/InjectViewState.java b/moxy/src/main/java/com/omegar/mvp/InjectViewState.java index b3cad3e0..2b1f84a1 100644 --- a/moxy/src/main/java/com/omegar/mvp/InjectViewState.java +++ b/moxy/src/main/java/com/omegar/mvp/InjectViewState.java @@ -1,5 +1,6 @@ package com.omegar.mvp; +import java.lang.annotation.Inherited; import java.lang.annotation.Target; import com.omegar.mvp.viewstate.MvpViewState; @@ -15,6 +16,7 @@ * code, that broke your app. */ @Target(value = TYPE) +@Inherited public @interface InjectViewState { Class value() default DefaultViewState.class; diff --git a/moxy/src/main/java/com/omegar/mvp/MvpPresenter.java b/moxy/src/main/java/com/omegar/mvp/MvpPresenter.java index fe411806..98b8d65e 100644 --- a/moxy/src/main/java/com/omegar/mvp/MvpPresenter.java +++ b/moxy/src/main/java/com/omegar/mvp/MvpPresenter.java @@ -15,6 +15,7 @@ * @author Alexander Blinov * @author Konstantin Tckhovrebov */ +@InjectViewState public abstract class MvpPresenter { private boolean mFirstLaunch = true; private String mTag; From 71cace7969dda9b7ab4e996ada4bd40b15c6c737 Mon Sep 17 00:00:00 2001 From: Anton Knyazev Date: Mon, 23 Mar 2020 16:59:26 +0300 Subject: [PATCH 28/36] Fix save state for child fragment --- moxy/src/main/java/com/omegar/mvp/MvpDelegate.java | 1 + 1 file changed, 1 insertion(+) diff --git a/moxy/src/main/java/com/omegar/mvp/MvpDelegate.java b/moxy/src/main/java/com/omegar/mvp/MvpDelegate.java index 5586812f..224fee64 100644 --- a/moxy/src/main/java/com/omegar/mvp/MvpDelegate.java +++ b/moxy/src/main/java/com/omegar/mvp/MvpDelegate.java @@ -194,6 +194,7 @@ public void onDestroyView() { childDelegatesClone.addAll(mChildDelegates); for (MvpDelegate childDelegate : childDelegatesClone) { + childDelegate.onSaveInstanceState(); childDelegate.onDestroyView(); } From e9a1d7d23071a4d111911d39522ba01be4af593d Mon Sep 17 00:00:00 2001 From: just-d-a Date: Wed, 14 Oct 2020 17:21:00 +0300 Subject: [PATCH 29/36] add feature for androidx --- .../com/moxy_androidx_sample/BaseActivity.java | 11 +++++++++++ .../com/omegar/mvp/MvpAppCompatActivity.java | 11 +++++++++++ moxy-androidx/stub-androidx/build.gradle | 1 + .../appcompat/app/AppCompatActivity.java | 11 +++++++++++ .../androidx/fragment/app/FragmentActivity.java | 10 ++++++++++ .../com/omegar/mvp/annotation/ContentView.java | 12 ++++++++++++ .../com/omegar/mvp/annotation/LayoutRes.java | 17 +++++++++++++++++ 7 files changed, 73 insertions(+) create mode 100644 moxy/src/main/java/com/omegar/mvp/annotation/ContentView.java create mode 100644 moxy/src/main/java/com/omegar/mvp/annotation/LayoutRes.java diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseActivity.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseActivity.java index 7c0dc5fc..238bf45f 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseActivity.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseActivity.java @@ -1,9 +1,20 @@ package example.com.moxy_androidx_sample; +import androidx.annotation.ContentView; +import androidx.annotation.LayoutRes; import com.omegar.mvp.MvpAppCompatActivity; public abstract class BaseActivity extends MvpAppCompatActivity implements BaseView { + public BaseActivity() { + super(); + } + + @ContentView + public BaseActivity(@LayoutRes int contentLayoutId) { + super(contentLayoutId); + } + @Override public void testFunction() { diff --git a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java index d5f03d20..1eb51959 100755 --- a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java @@ -3,6 +3,8 @@ import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; +import com.omegar.mvp.annotation.ContentView; +import com.omegar.mvp.annotation.LayoutRes; /** * Date: 25-July-18 @@ -14,6 +16,15 @@ public class MvpAppCompatActivity extends AppCompatActivity { private MvpDelegate mMvpDelegate; + public MvpAppCompatActivity() { + super(); + } + + @ContentView + public MvpAppCompatActivity(@LayoutRes int contentLayoutId) { + super(contentLayoutId); + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/moxy-androidx/stub-androidx/build.gradle b/moxy-androidx/stub-androidx/build.gradle index d6d06d13..4ad37f46 100755 --- a/moxy-androidx/stub-androidx/build.gradle +++ b/moxy-androidx/stub-androidx/build.gradle @@ -4,5 +4,6 @@ sourceCompatibility = JavaVersion.VERSION_1_7 targetCompatibility = JavaVersion.VERSION_1_7 dependencies { + implementation project(path: ':moxy') compileOnly deps.android } diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java index 6dc4e354..cef5d79b 100755 --- a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java @@ -3,6 +3,8 @@ import android.os.Bundle; import androidx.fragment.app.FragmentActivity; +import com.omegar.mvp.annotation.ContentView; +import com.omegar.mvp.annotation.LayoutRes; /** * Date: 25-July-18 @@ -13,6 +15,15 @@ public class AppCompatActivity extends FragmentActivity { + public AppCompatActivity() { + super(); + } + + @ContentView + public AppCompatActivity(@LayoutRes int contentLayoutId) { + super(contentLayoutId); + } + protected void onCreate(Bundle savedInstanceState) { throw new RuntimeException("Stub!"); } diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/FragmentActivity.java b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/FragmentActivity.java index ff2e0765..fc64024c 100644 --- a/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/FragmentActivity.java +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/FragmentActivity.java @@ -1,5 +1,7 @@ package androidx.fragment.app; +import com.omegar.mvp.annotation.LayoutRes; + /** * Date: 25-July-18 * Time: 4:41 @@ -8,6 +10,14 @@ */ public class FragmentActivity { + + public FragmentActivity() { + super(); + } + public FragmentActivity(@LayoutRes int contentLayoutId) { + super(); + } + public boolean isFinishing() { throw new RuntimeException("Stub!"); } diff --git a/moxy/src/main/java/com/omegar/mvp/annotation/ContentView.java b/moxy/src/main/java/com/omegar/mvp/annotation/ContentView.java new file mode 100644 index 00000000..936dbce1 --- /dev/null +++ b/moxy/src/main/java/com/omegar/mvp/annotation/ContentView.java @@ -0,0 +1,12 @@ +package com.omegar.mvp.annotation; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.RetentionPolicy.CLASS; + +@Retention(CLASS) +@Target({CONSTRUCTOR}) +public @interface ContentView { +} \ No newline at end of file diff --git a/moxy/src/main/java/com/omegar/mvp/annotation/LayoutRes.java b/moxy/src/main/java/com/omegar/mvp/annotation/LayoutRes.java new file mode 100644 index 00000000..845ef367 --- /dev/null +++ b/moxy/src/main/java/com/omegar/mvp/annotation/LayoutRes.java @@ -0,0 +1,17 @@ +package com.omegar.mvp.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.LOCAL_VARIABLE; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.CLASS; + +@Documented +@Retention(CLASS) +@Target({METHOD, PARAMETER, FIELD, LOCAL_VARIABLE}) +public @interface LayoutRes { +} From 7cdb28c68dc40fe59ef37ba42181b910722988a6 Mon Sep 17 00:00:00 2001 From: just-d-a Date: Wed, 14 Oct 2020 19:37:10 +0300 Subject: [PATCH 30/36] add androidx annotations path --- .../kotlin/example/com/moxy_androidx_sample/MainActivity.kt | 2 +- .../src/main/java/com/omegar/mvp/MvpAppCompatActivity.java | 5 +++-- .../src/main/java/androidx}/annotation/ContentView.java | 2 +- .../src/main/java/androidx}/annotation/LayoutRes.java | 2 +- .../main/java/androidx/appcompat/app/AppCompatActivity.java | 5 +++-- .../main/java/androidx/fragment/app/FragmentActivity.java | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) rename {moxy/src/main/java/com/omegar/mvp => moxy-androidx/stub-androidx/src/main/java/androidx}/annotation/ContentView.java (88%) rename {moxy/src/main/java/com/omegar/mvp => moxy-androidx/stub-androidx/src/main/java/androidx}/annotation/LayoutRes.java (93%) diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt index 40c87f00..18cd8699 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/MainActivity.kt @@ -7,7 +7,7 @@ import com.omegar.mvp.presenter.InjectPresenter import example.com.moxy_androidx_sample.contract.Contract import example.com.moxy_androidx_sample.packagee.Item -class MainActivity : BaseActivity(), Contract.MainView, SecondInterface { +class MainActivity : BaseActivity(R.layout.activity_main), Contract.MainView, SecondInterface { override fun fourth(item: String?) { TODO("not implemented") //To change body of created functions use File | Settings | File Templates. } diff --git a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java index 1eb51959..d3fb0cc5 100755 --- a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java @@ -2,9 +2,10 @@ import android.os.Bundle; +import androidx.annotation.ContentView; +import androidx.annotation.LayoutRes; import androidx.appcompat.app.AppCompatActivity; -import com.omegar.mvp.annotation.ContentView; -import com.omegar.mvp.annotation.LayoutRes; + /** * Date: 25-July-18 diff --git a/moxy/src/main/java/com/omegar/mvp/annotation/ContentView.java b/moxy-androidx/stub-androidx/src/main/java/androidx/annotation/ContentView.java similarity index 88% rename from moxy/src/main/java/com/omegar/mvp/annotation/ContentView.java rename to moxy-androidx/stub-androidx/src/main/java/androidx/annotation/ContentView.java index 936dbce1..f5b7d6ac 100644 --- a/moxy/src/main/java/com/omegar/mvp/annotation/ContentView.java +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/annotation/ContentView.java @@ -1,4 +1,4 @@ -package com.omegar.mvp.annotation; +package androidx.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/moxy/src/main/java/com/omegar/mvp/annotation/LayoutRes.java b/moxy-androidx/stub-androidx/src/main/java/androidx/annotation/LayoutRes.java similarity index 93% rename from moxy/src/main/java/com/omegar/mvp/annotation/LayoutRes.java rename to moxy-androidx/stub-androidx/src/main/java/androidx/annotation/LayoutRes.java index 845ef367..9e4757b1 100644 --- a/moxy/src/main/java/com/omegar/mvp/annotation/LayoutRes.java +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/annotation/LayoutRes.java @@ -1,4 +1,4 @@ -package com.omegar.mvp.annotation; +package androidx.annotation; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java index cef5d79b..811867d0 100755 --- a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatActivity.java @@ -2,9 +2,10 @@ import android.os.Bundle; +import androidx.annotation.ContentView; +import androidx.annotation.LayoutRes; import androidx.fragment.app.FragmentActivity; -import com.omegar.mvp.annotation.ContentView; -import com.omegar.mvp.annotation.LayoutRes; + /** * Date: 25-July-18 diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/FragmentActivity.java b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/FragmentActivity.java index fc64024c..98a35c26 100644 --- a/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/FragmentActivity.java +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/FragmentActivity.java @@ -1,6 +1,6 @@ package androidx.fragment.app; -import com.omegar.mvp.annotation.LayoutRes; +import androidx.annotation.LayoutRes; /** * Date: 25-July-18 From de23332ca3b87c0d90c3ea3b4c656cdf8b9d277f Mon Sep 17 00:00:00 2001 From: just-d-a Date: Wed, 14 Oct 2020 19:41:01 +0300 Subject: [PATCH 31/36] delete moxy implementation --- moxy-androidx/stub-androidx/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/moxy-androidx/stub-androidx/build.gradle b/moxy-androidx/stub-androidx/build.gradle index 4ad37f46..d6d06d13 100755 --- a/moxy-androidx/stub-androidx/build.gradle +++ b/moxy-androidx/stub-androidx/build.gradle @@ -4,6 +4,5 @@ sourceCompatibility = JavaVersion.VERSION_1_7 targetCompatibility = JavaVersion.VERSION_1_7 dependencies { - implementation project(path: ':moxy') compileOnly deps.android } From 53af46f9989a65e5bb778a75548941fe67a0f20e Mon Sep 17 00:00:00 2001 From: just-d-a Date: Thu, 15 Oct 2020 11:10:19 +0300 Subject: [PATCH 32/36] add constructors to fragments --- .../main/java/com/omegar/mvp/MvpAppCompatActivity.java | 8 ++------ .../com/omegar/mvp/MvpAppCompatDialogFragment.java | 10 ++++++++++ .../main/java/com/omegar/mvp/MvpAppCompatFragment.java | 6 ++++++ .../com/omegar/mvp/MvpBottomSheetDialogFragment.java | 5 +++++ .../appcompat/app/AppCompatDialogFragment.java | 7 +++++++ .../java/androidx/fragment/app/DialogFragment.java | 6 ++++++ .../src/main/java/androidx/fragment/app/Fragment.java | 6 ++++++ .../bottomsheet/BottomSheetDialogFragment.java | 3 +++ 8 files changed, 45 insertions(+), 6 deletions(-) diff --git a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java index d3fb0cc5..85e4b6d5 100755 --- a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatActivity.java @@ -17,14 +17,10 @@ public class MvpAppCompatActivity extends AppCompatActivity { private MvpDelegate mMvpDelegate; - public MvpAppCompatActivity() { - super(); - } + public MvpAppCompatActivity() { super(); } @ContentView - public MvpAppCompatActivity(@LayoutRes int contentLayoutId) { - super(contentLayoutId); - } + public MvpAppCompatActivity(@LayoutRes int contentLayoutId) { super(contentLayoutId); } @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java index 9d1fd2b4..d581320d 100644 --- a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java @@ -3,6 +3,8 @@ import android.os.Build; import android.os.Bundle; +import androidx.annotation.ContentView; +import androidx.annotation.LayoutRes; import androidx.appcompat.app.AppCompatDialogFragment; import androidx.fragment.app.Fragment; @@ -11,6 +13,14 @@ public class MvpAppCompatDialogFragment extends AppCompatDialogFragment { private boolean mIsStateSaved; private MvpDelegate mMvpDelegate; + public MvpAppCompatDialogFragment() { super(); } + + @ContentView + public MvpAppCompatDialogFragment(@LayoutRes int contentLayoutId) { + super(contentLayoutId); + } + + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java index 38babd6e..ed4f4b42 100644 --- a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java @@ -1,6 +1,8 @@ package com.omegar.mvp; import android.os.Bundle; + +import androidx.annotation.LayoutRes; import androidx.fragment.app.Fragment; /** @@ -17,6 +19,10 @@ public class MvpAppCompatFragment extends Fragment { private MvpDelegate mMvpDelegate; + public MvpAppCompatFragment() { super(); } + + public MvpAppCompatFragment(@LayoutRes int contentLayoutId) { super(); } + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java index bf70340f..7e55b499 100644 --- a/moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java @@ -3,6 +3,7 @@ import android.os.Build; import android.os.Bundle; +import androidx.annotation.LayoutRes; import androidx.fragment.app.Fragment; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; @@ -12,6 +13,10 @@ public class MvpBottomSheetDialogFragment extends BottomSheetDialogFragment { private boolean mIsStateSaved; private MvpDelegate mMvpDelegate; + public MvpBottomSheetDialogFragment() { super(); } + + public MvpBottomSheetDialogFragment(@LayoutRes int contentLayoutId) { super(); } + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java index 3cd337eb..b4203df1 100644 --- a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java @@ -1,5 +1,7 @@ package androidx.appcompat.app; +import androidx.annotation.ContentView; +import androidx.annotation.LayoutRes; import androidx.fragment.app.DialogFragment; /** @@ -9,5 +11,10 @@ * @author R12rus */ public class AppCompatDialogFragment extends DialogFragment { + public AppCompatDialogFragment() { super(); } + @ContentView + public AppCompatDialogFragment(@LayoutRes int contentLayoutId) { + super(contentLayoutId); + } } \ No newline at end of file diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java index 125a4921..3f353511 100644 --- a/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java @@ -1,5 +1,8 @@ package androidx.fragment.app; +import androidx.annotation.ContentView; +import androidx.annotation.LayoutRes; + /** * Date: 22-March-19 * Time: 08:58 @@ -7,5 +10,8 @@ * @author R12rus */ public class DialogFragment extends Fragment { + public DialogFragment() { super(); } + @ContentView + public DialogFragment(@LayoutRes int contentLayoutId) { super(contentLayoutId); } } \ No newline at end of file diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/Fragment.java b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/Fragment.java index 3c396732..642ddc4c 100644 --- a/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/Fragment.java +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/Fragment.java @@ -2,6 +2,8 @@ import android.os.Bundle; +import androidx.annotation.LayoutRes; + /** * Date: 25-July-18 * Time: 4:38 @@ -10,6 +12,10 @@ */ public class Fragment { + public Fragment() { super(); } + + public Fragment(@LayoutRes int contentLayoutId) { super(); } + public void onCreate(Bundle savedInstanceState) { throw new RuntimeException("Stub!"); } diff --git a/moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java b/moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java index 49b22940..4372b1a6 100644 --- a/moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java +++ b/moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java @@ -1,7 +1,10 @@ package com.google.android.material.bottomsheet; +import androidx.annotation.LayoutRes; import androidx.appcompat.app.AppCompatDialogFragment; public class BottomSheetDialogFragment extends AppCompatDialogFragment { + public BottomSheetDialogFragment() { super(); } + public BottomSheetDialogFragment(@LayoutRes int contentLayoutId) { super(); } } \ No newline at end of file From 1ba5415dd63dcb163dab8bbe97b1db8b6b15d5db Mon Sep 17 00:00:00 2001 From: just-d-a Date: Thu, 15 Oct 2020 11:43:58 +0300 Subject: [PATCH 33/36] delete constructors from dialog fragment --- .../java/com/omegar/mvp/MvpAppCompatDialogFragment.java | 8 -------- .../java/com/omegar/mvp/MvpBottomSheetDialogFragment.java | 4 ---- .../androidx/appcompat/app/AppCompatDialogFragment.java | 5 ----- .../main/java/androidx/fragment/app/DialogFragment.java | 3 --- .../material/bottomsheet/BottomSheetDialogFragment.java | 2 -- 5 files changed, 22 deletions(-) diff --git a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java index d581320d..b85b1470 100644 --- a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java @@ -13,14 +13,6 @@ public class MvpAppCompatDialogFragment extends AppCompatDialogFragment { private boolean mIsStateSaved; private MvpDelegate mMvpDelegate; - public MvpAppCompatDialogFragment() { super(); } - - @ContentView - public MvpAppCompatDialogFragment(@LayoutRes int contentLayoutId) { - super(contentLayoutId); - } - - public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java index 7e55b499..769946a3 100644 --- a/moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java @@ -13,10 +13,6 @@ public class MvpBottomSheetDialogFragment extends BottomSheetDialogFragment { private boolean mIsStateSaved; private MvpDelegate mMvpDelegate; - public MvpBottomSheetDialogFragment() { super(); } - - public MvpBottomSheetDialogFragment(@LayoutRes int contentLayoutId) { super(); } - public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java index b4203df1..3b1d74b0 100644 --- a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java @@ -11,10 +11,5 @@ * @author R12rus */ public class AppCompatDialogFragment extends DialogFragment { - public AppCompatDialogFragment() { super(); } - @ContentView - public AppCompatDialogFragment(@LayoutRes int contentLayoutId) { - super(contentLayoutId); - } } \ No newline at end of file diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java index 3f353511..5f2d9951 100644 --- a/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java @@ -10,8 +10,5 @@ * @author R12rus */ public class DialogFragment extends Fragment { - public DialogFragment() { super(); } - @ContentView - public DialogFragment(@LayoutRes int contentLayoutId) { super(contentLayoutId); } } \ No newline at end of file diff --git a/moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java b/moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java index 4372b1a6..abfff4d1 100644 --- a/moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java +++ b/moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java @@ -4,7 +4,5 @@ import androidx.appcompat.app.AppCompatDialogFragment; public class BottomSheetDialogFragment extends AppCompatDialogFragment { - public BottomSheetDialogFragment() { super(); } - public BottomSheetDialogFragment(@LayoutRes int contentLayoutId) { super(); } } \ No newline at end of file From c16baa3458320045e129516a3a1aa90aa7cc9b34 Mon Sep 17 00:00:00 2001 From: just-d-a Date: Thu, 15 Oct 2020 11:49:48 +0300 Subject: [PATCH 34/36] add super param --- .../src/main/java/com/omegar/mvp/MvpAppCompatFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java index ed4f4b42..67af3320 100644 --- a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java @@ -21,7 +21,7 @@ public class MvpAppCompatFragment extends Fragment { public MvpAppCompatFragment() { super(); } - public MvpAppCompatFragment(@LayoutRes int contentLayoutId) { super(); } + public MvpAppCompatFragment(@LayoutRes int contentLayoutId) { super(contentLayoutId); } public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); From f5eddbd0734b11827766777c0a3e381492902676 Mon Sep 17 00:00:00 2001 From: just-d-a Date: Thu, 15 Oct 2020 11:58:35 +0300 Subject: [PATCH 35/36] add content view annotation --- .../src/main/java/com/omegar/mvp/MvpAppCompatFragment.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java index 67af3320..96a06507 100644 --- a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatFragment.java @@ -2,6 +2,7 @@ import android.os.Bundle; +import androidx.annotation.ContentView; import androidx.annotation.LayoutRes; import androidx.fragment.app.Fragment; @@ -21,6 +22,7 @@ public class MvpAppCompatFragment extends Fragment { public MvpAppCompatFragment() { super(); } + @ContentView public MvpAppCompatFragment(@LayoutRes int contentLayoutId) { super(contentLayoutId); } public void onCreate(Bundle savedInstanceState) { From f3e419eb2ac86b6327421c14687583b8634ff298 Mon Sep 17 00:00:00 2001 From: just-d-a Date: Thu, 15 Oct 2020 18:00:45 +0300 Subject: [PATCH 36/36] add content view annotation --- .../main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java | 2 -- .../main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java | 1 - .../java/androidx/appcompat/app/AppCompatDialogFragment.java | 2 -- .../src/main/java/androidx/fragment/app/DialogFragment.java | 3 --- .../material/bottomsheet/BottomSheetDialogFragment.java | 1 - 5 files changed, 9 deletions(-) diff --git a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java index b85b1470..9d1fd2b4 100644 --- a/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpAppCompatDialogFragment.java @@ -3,8 +3,6 @@ import android.os.Build; import android.os.Bundle; -import androidx.annotation.ContentView; -import androidx.annotation.LayoutRes; import androidx.appcompat.app.AppCompatDialogFragment; import androidx.fragment.app.Fragment; diff --git a/moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java b/moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java index 769946a3..bf70340f 100644 --- a/moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java +++ b/moxy-androidx/src/main/java/com/omegar/mvp/MvpBottomSheetDialogFragment.java @@ -3,7 +3,6 @@ import android.os.Build; import android.os.Bundle; -import androidx.annotation.LayoutRes; import androidx.fragment.app.Fragment; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java index 3b1d74b0..3cd337eb 100644 --- a/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/appcompat/app/AppCompatDialogFragment.java @@ -1,7 +1,5 @@ package androidx.appcompat.app; -import androidx.annotation.ContentView; -import androidx.annotation.LayoutRes; import androidx.fragment.app.DialogFragment; /** diff --git a/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java index 5f2d9951..125a4921 100644 --- a/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java +++ b/moxy-androidx/stub-androidx/src/main/java/androidx/fragment/app/DialogFragment.java @@ -1,8 +1,5 @@ package androidx.fragment.app; -import androidx.annotation.ContentView; -import androidx.annotation.LayoutRes; - /** * Date: 22-March-19 * Time: 08:58 diff --git a/moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java b/moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java index abfff4d1..49b22940 100644 --- a/moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java +++ b/moxy-androidx/stub-androidx/src/main/java/com/google/android/material/bottomsheet/BottomSheetDialogFragment.java @@ -1,6 +1,5 @@ package com.google.android.material.bottomsheet; -import androidx.annotation.LayoutRes; import androidx.appcompat.app.AppCompatDialogFragment; public class BottomSheetDialogFragment extends AppCompatDialogFragment {