Skip to content

Commit 608d7af

Browse files
Merge pull request #7 from Omega-R/viewCommand_inheritance_generation
View command inheritance generation
2 parents f3f65d3 + 3e84b36 commit 608d7af

File tree

149 files changed

+1009
-325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+1009
-325
lines changed

README.md

Lines changed: 27 additions & 7 deletions

build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ buildscript {
77
google()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.2.1'
10+
classpath 'com.android.tools.build:gradle:3.3.2'
11+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1112
}
1213
}
1314

@@ -16,12 +17,14 @@ allprojects {
1617
jcenter()
1718
mavenCentral()
1819
google()
20+
maven { url 'https://jitpack.io' }
1921
}
2022
}
2123

2224
ext {
2325
targetVersionCode = 46
2426
targetVersionName = "1.5.6"
27+
kotlin_version = '1.3.21'
2528

2629
deps = [
2730
android : 'com.google.android:android:1.6_r2',
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Nov 24 23:06:24 NOVT 2018
1+
#Thu Mar 21 17:43:47 MSK 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
buildscript {
2-
ext.kotlin_version = '1.3.10'
32
repositories {
43
google()
54
jcenter()
@@ -19,13 +18,13 @@ android {
1918
compileSdkVersion 28
2019

2120
defaultConfig {
22-
applicationId "com.arellomobile.mvp.sample.androidx"
21+
applicationId "com.omegar.mvp.sample.androidx"
2322
minSdkVersion 16
2423
targetSdkVersion 28
2524
versionCode 1
2625
versionName "1.0"
2726

28-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
27+
testInstrumentationRunner "android.support.generateInfos.runner.AndroidJUnitRunner"
2928
}
3029

3130
sourceSets {

moxy-androidx-sapmle/src/main/AndroidManifest.xml renamed to moxy-androidx-sample/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="example.com.moxy_androidx_sapmle">
3+
package="example.com.moxy_androidx_sample">
44

55
<application
66
android:allowBackup="true"
@@ -9,7 +9,7 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
1111
android:theme="@style/AppTheme">
12-
<activity android:name=".MainActivity">
12+
<activity android:name="example.com.moxy_androidx_sample.MainActivity">
1313
<intent-filter>
1414
<action android:name="android.intent.action.MAIN"/>
1515

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package example.com.moxy_androidx_sample;
2+
3+
import com.omegar.mvp.MvpAppCompatActivity;
4+
5+
public abstract class BaseActivity extends MvpAppCompatActivity implements BaseView {
6+
7+
@Override
8+
public void testFunction() {
9+
10+
}
11+
12+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package example.com.moxy_androidx_sample;
2+
3+
import com.omegar.mvp.MvpView;
4+
5+
public interface BaseView extends MvpView {
6+
7+
void testFunction();
8+
9+
}

0 commit comments

Comments
 (0)