Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	README.md

Author: KsenyaBol

LICENSE

@@ -0,0 +1,50 @@
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
+    id 'com.google.devtools.ksp'
+}
+
+android {
+    namespace 'com.omegar.mvp'
+    compileSdk 33
+
+    defaultConfig {
+        applicationId "com.omegar.mvp"
+        minSdk 21
+        targetSdk 33
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.google.android.material:material:1.7.0'
+
+    implementation project(":moxy:androidx")
+
+    ksp project(":moxy:compiler")
+
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+}

moxy-ktx/.gitignore app/.gitignoremoxy-ktx/.gitignore renamed to app/.gitignore

@@ -18,4 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile

app/build.gradle

@@ -0,0 +1,25 @@
+package com.omegar.mvp
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.omegar.mvp", appContext.packageName)
+    }
+}

sample-custom-strategy/proguard-rules.pro app/proguard-rules.prosample-custom-strategy/proguard-rules.pro renamed to app/proguard-rules.pro

@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="example.com.moxy_androidx_sample">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name="example.com.moxy_androidx_sample.MainActivity">
+        android:theme="@style/Theme.OmegaMoxy"
+        tools:targetApi="31">
+
+        <activity android:name=".MoxyActivity"
+            android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
     </application>
 
 </manifest>

app/src/androidTest/java/com/omegar/mvp/ExampleInstrumentedTest.kt

@@ -0,0 +1,11 @@
+package com.omegar.mvp
+
+interface Addon<N> {
+
+    var addon: N?
+        get() = null
+        set(value) {
+            TODO()
+        }
+
+}

…oidx-sample/src/main/AndroidManifest.xml app/src/main/AndroidManifest.xmlmoxy-androidx-sample/src/main/AndroidManifest.xml renamed to app/src/main/AndroidManifest.xml moxy-androidx-sample/src/main/AndroidManifest.xml renamed to app/src/main/AndroidManifest.xml

@@ -0,0 +1,10 @@
+package com.omegar.mvp
+
+
+/**
+ * Created by Anton Knyazev on 09.06.2023.
+ * Copyright (c) 2023 Omega https://omega-r.com
+ */
+@InjectViewState
+open class BasePresenter<T: Number, VIEW: BaseView>: MvpPresenter<VIEW>() {
+}

app/src/main/java/com/omegar/mvp/Addon.kt

@@ -0,0 +1,12 @@
+package com.omegar.mvp
+
+
+/**
+ * Created by Anton Knyazev on 09.06.2023.
+ * Copyright (c) 2023 Omega https://omega-r.com
+ */
+interface BaseView: MvpView {
+
+    fun base() {}
+
+}

app/src/main/java/com/omegar/mvp/BasePresenter.kt

@@ -0,0 +1,38 @@
+package com.omegar.mvp
+
+import android.os.Bundle
+import android.widget.Toast
+import com.omegar.mvp.ktx.providePresenter
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+
+class MoxyActivity: MvpAppCompatActivity(R.layout.activity_moxy), MoxyView {
+
+    companion object {
+        var first: Boolean = true
+    }
+
+    private val presenter: MoxyPresenter by providePresenter {
+        MoxyPresenter()
+    }
+
+    override var duration: Duration = 0.seconds
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (savedInstanceState == null) {
+            supportFragmentManager.beginTransaction()
+                .replace(R.id.test, MoxyFragment())
+                .commit()
+        }
+    }
+
+    override fun test(count: Int) {
+        Toast.makeText(this, "Test", Toast.LENGTH_LONG).show()
+    }
+
+    override fun showToast(message: String) {
+        Toast.makeText(this, message, Toast.LENGTH_LONG).show()
+    }
+
+}