Skip to content

Commit

Permalink
arello-mobile replaced with omegar
Browse files Browse the repository at this point in the history
  • Loading branch information
roman_tcaregorodtcev committed Mar 22, 2019
1 parent aa02e1f commit e2bd0b1
Show file tree
Hide file tree
Showing 90 changed files with 181 additions and 181 deletions.
12 changes: 6 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,30 +77,30 @@ 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'
}
```

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'
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'
}
```
Expand All @@ -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'
}
```

Expand Down
2 changes: 1 addition & 1 deletion moxy-androidx-sapmle/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
2 changes: 1 addition & 1 deletion moxy-compiler/src/test/resources/multimodules/app/MoxyReflector.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.arellomobile.mvp;
package com.omegar.mvp;

import com.omegar.mvp.ViewStateProvider;

Expand Down
4 changes: 2 additions & 2 deletions moxy-templates/Java/MoxyActivity/globals.xml.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<global id="superClassFqcn" type="string" value="
<#if superClass == 'baseActivity'>${packageName}.ui.activity.BaseActivity
<#elseif superClass == 'appCompat'>com.arellomobile.mvp.MvpAppCompatActivity
<#else>com.arellomobile.mvp.MvpActivity</#if>
<#elseif superClass == 'appCompat'>com.omegar.mvp.MvpAppCompatActivity
<#else>com.omegar.mvp.MvpActivity</#if>
" />

<global id="manifestOut" value="${manifestDir}" />
Expand Down
4 changes: 2 additions & 2 deletions ...tes/Java/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package ${packageName}.presentation.presenter${dotSubpackage};

<#if applicationPackage??>import ${applicationPackage}.R;</#if>
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}> {
Expand Down
2 changes: 1 addition & 1 deletion moxy-templates/Java/MoxyActivity/root/src/app_package/presentation/view/BlankView.java.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ${packageName}.presentation.view${dotSubpackage};

import com.arellomobile.mvp.MvpView;
import com.omegar.mvp.MvpView;

public interface ${viewName} extends MvpView {

Expand Down
4 changes: 2 additions & 2 deletions moxy-templates/Java/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.java.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import ${superClassFqcn};
import ${packageName}.R;
</#if>

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;
</#if>

public class ${className} extends ${superClassName} implements ${viewName} {
Expand Down
4 changes: 2 additions & 2 deletions moxy-templates/Java/MoxyFragment/globals.xml.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<global id="superClassFqcn" type="string" value="
<#if superClass == 'baseFragment'>${packageName}.ui.fragment.BaseFragment
<#elseif superClass == 'appCompat'>com.arellomobile.mvp.MvpAppCompatFragment
<#else>com.arellomobile.mvp.MvpFragment</#if>
<#elseif superClass == 'appCompat'>com.omegar.mvp.MvpAppCompatFragment
<#else>com.omegar.mvp.MvpFragment</#if>
" />

<global id="useSupport" type="boolean" value="${(minApiLevel lt 11)?string}" />
Expand Down
4 changes: 2 additions & 2 deletions ...tes/Java/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package ${packageName}.presentation.presenter${dotSubpackage};

<#if applicationPackage??>import ${applicationPackage}.R;</#if>
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}> {
Expand Down
2 changes: 1 addition & 1 deletion moxy-templates/Java/MoxyFragment/root/src/app_package/presentation/view/BlankView.java.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ${packageName}.presentation.view${dotSubpackage};

import com.arellomobile.mvp.MvpView;
import com.omegar.mvp.MvpView;

public interface ${viewName} extends MvpView {

Expand Down
4 changes: 2 additions & 2 deletions moxy-templates/Java/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.java.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import ${superClassFqcn};
import ${packageName}.R;
</#if>

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;
</#if>

public class ${className} extends ${superClassName} implements ${viewName} {
Expand Down
4 changes: 2 additions & 2 deletions moxy-templates/Kotlin/MoxyActivity/globals.xml.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<global id="superClassFqcn" type="string" value="
<#if superClass == 'baseActivity'>${packageName}.ui.activity.BaseActivity
<#elseif superClass == 'appCompat'>com.arellomobile.mvp.MvpAppCompatActivity
<#else>com.arellomobile.mvp.MvpActivity</#if>
<#elseif superClass == 'appCompat'>com.omegar.mvp.MvpAppCompatActivity
<#else>com.omegar.mvp.MvpActivity</#if>
" />

<global id="manifestOut" value="${manifestDir}" />
Expand Down
4 changes: 2 additions & 2 deletions ...tes/Kotlin/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion moxy-templates/Kotlin/MoxyActivity/root/src/app_package/presentation/view/BlankView.kt.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ${packageName}.presentation.view${dotSubpackage}

import com.arellomobile.mvp.MvpView
import com.omegar.mvp.MvpView

interface ${viewName} : MvpView {

Expand Down
4 changes: 2 additions & 2 deletions moxy-templates/Kotlin/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.kt.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ 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}

import ${superClassFqcn};

<#if createProvidesMethod>
import com.arellomobile.mvp.presenter.ProvidePresenter;
import com.omegar.mvp.presenter.ProvidePresenter;
</#if>


Expand Down
4 changes: 2 additions & 2 deletions ...tes/Kotlin/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion moxy-templates/Kotlin/MoxyFragment/root/src/app_package/presentation/view/BlankView.kt.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ${packageName}.presentation.view${dotSubpackage}

import com.arellomobile.mvp.MvpView
import com.omegar.mvp.MvpView

interface ${viewName} : MvpView {

Expand Down
4 changes: 2 additions & 2 deletions moxy-templates/Kotlin/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions moxy-templates/common/MoxyActivity/globals.xml.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<global id="superClassFqcn" type="string" value="
<#if superClass == 'baseActivity'>${packageName}.ui.activity.BaseActivity
<#elseif superClass == 'appCompat'>com.arellomobile.mvp.MvpAppCompatActivity
<#else>com.arellomobile.mvp.MvpActivity</#if>
<#elseif superClass == 'appCompat'>com.omegar.mvp.MvpAppCompatActivity
<#else>com.omegar.mvp.MvpActivity</#if>
" />

<global id="manifestOut" value="${manifestDir}" />
Expand Down
4 changes: 2 additions & 2 deletions ...s/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package ${packageName}.presentation.presenter${dotSubpackage};

<#if applicationPackage??>import ${applicationPackage}.R;</#if>
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}> {
Expand Down
4 changes: 2 additions & 2 deletions ...tes/common/MoxyActivity/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.java.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ${packageName}.presentation.view${dotSubpackage};

import com.arellomobile.mvp.MvpView;
import com.omegar.mvp.MvpView;

public interface ${viewName} extends MvpView {

Expand Down
2 changes: 1 addition & 1 deletion moxy-templates/common/MoxyActivity/root/src/app_package/presentation/view/BlankView.kt.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ${packageName}.presentation.view${dotSubpackage}

import com.arellomobile.mvp.MvpView
import com.omegar.mvp.MvpView

interface ${viewName} : MvpView {

Expand Down
4 changes: 2 additions & 2 deletions moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.java.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import ${superClassFqcn};
import ${packageName}.R;
</#if>

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;
</#if>

public class ${className} extends ${superClassName} implements ${viewName} {
Expand Down
4 changes: 2 additions & 2 deletions moxy-templates/common/MoxyActivity/root/src/app_package/ui/activity/BlankActivity.kt.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ 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}

import ${superClassFqcn};

<#if createProvidesMethod>
import com.arellomobile.mvp.presenter.ProvidePresenter;
import com.omegar.mvp.presenter.ProvidePresenter;
</#if>


Expand Down
4 changes: 2 additions & 2 deletions moxy-templates/common/MoxyFragment/globals.xml.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<global id="superClassFqcn" type="string" value="
<#if superClass == 'baseFragment'>${packageName}.ui.fragment.BaseFragment
<#elseif superClass == 'appCompat'>com.arellomobile.mvp.MvpAppCompatFragment
<#else>com.arellomobile.mvp.MvpFragment</#if>
<#elseif superClass == 'appCompat'>com.omegar.mvp.MvpAppCompatFragment
<#else>com.omegar.mvp.MvpFragment</#if>
" />

<global id="useSupport" type="boolean" value="${(minApiLevel lt 11)?string}" />
Expand Down
4 changes: 2 additions & 2 deletions ...s/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.java.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package ${packageName}.presentation.presenter${dotSubpackage};

<#if applicationPackage??>import ${applicationPackage}.R;</#if>
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}> {
Expand Down
4 changes: 2 additions & 2 deletions ...tes/common/MoxyFragment/root/src/app_package/presentation/presenter/BlankPresenter.kt.ftl
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.java.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ${packageName}.presentation.view${dotSubpackage};

import com.arellomobile.mvp.MvpView;
import com.omegar.mvp.MvpView;

public interface ${viewName} extends MvpView {

Expand Down
2 changes: 1 addition & 1 deletion moxy-templates/common/MoxyFragment/root/src/app_package/presentation/view/BlankView.kt.ftl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ${packageName}.presentation.view${dotSubpackage}

import com.arellomobile.mvp.MvpView
import com.omegar.mvp.MvpView

interface ${viewName} : MvpView {

Expand Down
4 changes: 2 additions & 2 deletions moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.java.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import ${superClassFqcn};
import ${packageName}.R;
</#if>

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;
</#if>

public class ${className} extends ${superClassName} implements ${viewName} {
Expand Down
4 changes: 2 additions & 2 deletions moxy-templates/common/MoxyFragment/root/src/app_package/ui/fragment/BlankFragment.kt.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion moxy/src/main/java/com/omegar/mvp/MvpDelegate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ public Bundle getChildrenSaveState() {
/**
* @return generated tag in format: &lt;parent_delegate_tag&gt; &lt;delegated_class_full_name&gt;$MvpDelegate@&lt;hashCode&gt;
* <p>
* 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 + " " : "";
Expand Down
4 changes: 2 additions & 2 deletions moxy/src/test/resources/params/EmptyParams.java
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading

0 comments on commit e2bd0b1

Please sign in to comment.