Skip to content

Commit 0c1ad79

Browse files
Merge pull request #77 from Omega-R/feature/hotfix
Feature/hotfix
2 parents 7f16db7 + 0f7d354 commit 0c1ad79

9 files changed

Lines changed: 98 additions & 97 deletions

File tree

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.10'
4+
ext.kotlin_version = '1.2.30'
55
ext.supportVersion = '27.0.2'
66
ext.compileSdkVersion = 27
77
ext.targetSdkVersion = 27
@@ -12,7 +12,7 @@ buildscript {
1212
jcenter()
1313
}
1414
dependencies {
15-
classpath 'com.android.tools.build:gradle:3.0.1'
15+
classpath 'com.android.tools.build:gradle:3.1.0'
1616
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1717
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
1818

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/ActivityIntentBuilder.kt

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,21 @@ import com.omega_r.libs.omegaintentbuilder.interfaces.IntentHandler
1616
import com.omega_r.libs.omegaintentbuilder.handlers.ActivityIntentHandler
1717
import com.omega_r.libs.omegaintentbuilder.handlers.ContextIntentHandler
1818

19-
class ActivityIntentBuilder<T: Activity> (private val context: Context,
20-
activity: Class<T>): BaseIntentBuilder<T>(context, activity), IntentHandler {
19+
class ActivityIntentBuilder<T : Activity>(
20+
private val context: Context,
21+
activity: Class<T>
22+
) : BaseIntentBuilder<ActivityIntentBuilder<T>, T>(context, activity), IntentHandler {
2123

22-
override fun createIntentHandler(): ContextIntentHandler {
23-
return ContextIntentHandler(context, createIntent())
24-
}
24+
override fun createIntentHandler(): ContextIntentHandler {
25+
return ContextIntentHandler(context, createIntent())
26+
}
2527

26-
override fun createIntentHandler(activity: Activity): ActivityIntentHandler {
27-
return ActivityIntentHandler(activity, createIntent())
28-
}
28+
override fun createIntentHandler(activity: Activity): ActivityIntentHandler {
29+
return ActivityIntentHandler(activity, createIntent())
30+
}
2931

30-
override fun startActivity() {
31-
createIntentHandler().startActivity()
32-
}
32+
override fun startActivity() {
33+
createIntentHandler().startActivity()
34+
}
3335

3436
}

0 commit comments

Comments
 (0)