Skip to content

Commit 13367bc

Browse files
committed
Change to one liner
1 parent 91be855 commit 13367bc

File tree

1 file changed

+14
-49
lines changed

1 file changed

+14
-49
lines changed

DependencyProperty/src/main/java/com/wada811/dependencyproperty/DependencyProperty.kt

+14-49
Original file line numberDiff line numberDiff line change
@@ -11,64 +11,29 @@ import androidx.lifecycle.AndroidViewModel
1111
import androidx.work.ListenableWorker
1212

1313
@Deprecated("Use dependency<T, R>(resolve)", ReplaceWith("this.dependency<T, R>(resolve)"), DeprecationLevel.WARNING)
14-
fun <T : DependencyModule, R> Application.dependency(clazz: Class<T>, resolve: T.() -> R): Lazy<R> {
15-
return lazy { dependencyModule(clazz).resolve() }
16-
}
17-
18-
inline fun <reified T : DependencyModule, R> Application.dependency(noinline resolve: (T) -> R): Lazy<R> {
19-
return dependency(T::class.java, resolve)
20-
}
14+
fun <T : DependencyModule, R> Application.dependency(clazz: Class<T>, resolve: T.() -> R): Lazy<R> = lazy { dependencyModule(clazz).resolve() }
15+
inline fun <reified T : DependencyModule, R> Application.dependency(noinline resolve: (T) -> R): Lazy<R> = dependency(T::class.java, resolve)
2116

2217
@Deprecated("Use dependency<T, R>(resolve)", ReplaceWith("this.dependency<T, R>(resolve)"), DeprecationLevel.WARNING)
23-
fun <T : DependencyModule, R> FragmentActivity.dependency(clazz: Class<T>, resolve: T.() -> R): Lazy<R> {
24-
return lazy { dependencyModule(clazz).resolve() }
25-
}
26-
27-
inline fun <reified T : DependencyModule, R> FragmentActivity.dependency(noinline resolve: (T) -> R): Lazy<R> {
28-
return dependency(T::class.java, resolve)
29-
}
18+
fun <T : DependencyModule, R> FragmentActivity.dependency(clazz: Class<T>, resolve: T.() -> R): Lazy<R> = lazy { dependencyModule(clazz).resolve() }
19+
inline fun <reified T : DependencyModule, R> FragmentActivity.dependency(noinline resolve: (T) -> R): Lazy<R> = dependency(T::class.java, resolve)
3020

3121
@Deprecated("Use dependency<T, R>(resolve)", ReplaceWith("this.dependency<T, R>(resolve)"), DeprecationLevel.WARNING)
32-
fun <T : DependencyModule, R> Fragment.dependency(clazz: Class<T>, resolve: T.() -> R): Lazy<R> {
33-
return lazy { dependencyModule(clazz).resolve() }
34-
}
35-
36-
inline fun <reified T : DependencyModule, R> Fragment.dependency(noinline resolve: (T) -> R): Lazy<R> {
37-
return dependency(T::class.java, resolve)
38-
}
22+
fun <T : DependencyModule, R> Fragment.dependency(clazz: Class<T>, resolve: T.() -> R): Lazy<R> = lazy { dependencyModule(clazz).resolve() }
23+
inline fun <reified T : DependencyModule, R> Fragment.dependency(noinline resolve: (T) -> R): Lazy<R> = dependency(T::class.java, resolve)
3924

4025
@Deprecated("Use dependency<T, R>(resolve)", ReplaceWith("this.dependency<T, R>(resolve)"), DeprecationLevel.WARNING)
41-
fun <T : DependencyModule, R> AndroidViewModel.dependency(clazz: Class<T>, resolve: T.() -> R): Lazy<R> {
42-
return lazy { dependencyModule(clazz).resolve() }
43-
}
44-
45-
inline fun <reified T : DependencyModule, R> AndroidViewModel.dependency(noinline resolve: (T) -> R): Lazy<R> {
46-
return dependency(T::class.java, resolve)
47-
}
26+
fun <T : DependencyModule, R> AndroidViewModel.dependency(clazz: Class<T>, resolve: T.() -> R): Lazy<R> = lazy { dependencyModule(clazz).resolve() }
27+
inline fun <reified T : DependencyModule, R> AndroidViewModel.dependency(noinline resolve: (T) -> R): Lazy<R> = dependency(T::class.java, resolve)
4828

4929
@Deprecated("Use dependency<T, R>(resolve)", ReplaceWith("this.dependency<T, R>(resolve)"), DeprecationLevel.WARNING)
50-
fun <T : DependencyModule, R> Service.dependency(clazz: Class<T>, resolve: T.() -> R): Lazy<R> {
51-
return lazy { dependencyModule(clazz).resolve() }
52-
}
53-
54-
inline fun <reified T : DependencyModule, R> Service.dependency(noinline resolve: (T) -> R): Lazy<R> {
55-
return dependency(T::class.java, resolve)
56-
}
30+
fun <T : DependencyModule, R> Service.dependency(clazz: Class<T>, resolve: T.() -> R): Lazy<R> = lazy { dependencyModule(clazz).resolve() }
31+
inline fun <reified T : DependencyModule, R> Service.dependency(noinline resolve: (T) -> R): Lazy<R> = dependency(T::class.java, resolve)
5732

5833
@Deprecated("Use dependency<T, R>(resolve)", ReplaceWith("this.dependency<T, R>(resolve)"), DeprecationLevel.WARNING)
59-
fun <T : DependencyModule, R> Context.dependency(clazz: Class<T>, resolve: T.() -> R): Lazy<R> {
60-
return lazy { dependencyModule(clazz).resolve() }
61-
}
62-
63-
inline fun <reified T : DependencyModule, R> Context.dependency(noinline resolve: (T) -> R): Lazy<R> {
64-
return dependency(T::class.java, resolve)
65-
}
34+
fun <T : DependencyModule, R> Context.dependency(clazz: Class<T>, resolve: T.() -> R): Lazy<R> = lazy { dependencyModule(clazz).resolve() }
35+
inline fun <reified T : DependencyModule, R> Context.dependency(noinline resolve: (T) -> R): Lazy<R> = dependency(T::class.java, resolve)
6636

6737
@Deprecated("Use dependency<T, R>(resolve)", ReplaceWith("this.dependency<T, R>(resolve)"), DeprecationLevel.WARNING)
68-
fun <T : DependencyModule, R> ListenableWorker.dependency(clazz: Class<T>, resolve: T.() -> R): Lazy<R> {
69-
return lazy { dependencyModule(clazz).resolve() }
70-
}
71-
72-
inline fun <reified T : DependencyModule, R> ListenableWorker.dependency(noinline resolve: (T) -> R): Lazy<R> {
73-
return dependency(T::class.java, resolve)
74-
}
38+
fun <T : DependencyModule, R> ListenableWorker.dependency(clazz: Class<T>, resolve: T.() -> R): Lazy<R> = lazy { dependencyModule(clazz).resolve() }
39+
inline fun <reified T : DependencyModule, R> ListenableWorker.dependency(noinline resolve: (T) -> R): Lazy<R> = dependency(T::class.java, resolve)

0 commit comments

Comments
 (0)