Skip to content

Commit 75abe5e

Browse files
anton-knyazevanton-knyazev
committed
Extracted Launchers to OmegaLaunchers
1 parent 795e983 commit 75abe5e

File tree

20 files changed

+61
-687
lines changed

20 files changed

+61
-687
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ dependencies {
5454
kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.5.7'
5555
implementation 'com.github.Omega-R.OmegaTypes:omegatypes:7ce4c69'
5656
implementation 'com.github.Omega-R.OmegaTypes:glide:7ce4c69'
57+
implementation 'com.github.Omega-R:OmegaLaunchers:1.0.1'
5758

5859

5960
}

‎app/src/main/java/com/omega_r/base/simple/MainActivity.kt‎

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,33 @@
11
package com.omega_r.base.simple
22

3+
import android.os.Bundle
34
import android.view.View
45
import androidx.recyclerview.widget.RecyclerView
56
import com.omega_r.base.adapters.OmegaAutoAdapter
67
import com.omega_r.base.adapters.OmegaListAdapter
7-
import com.omega_r.base.adapters.OmegaViewPagerAdapter
88
import com.omega_r.base.annotations.OmegaContentView
99
import com.omega_r.base.binders.IdHolder
10-
import com.omega_r.base.binders.OmegaBindable
1110
import com.omega_r.base.components.OmegaActivity
1211
import com.omega_r.libs.omegatypes.Image
1312
import com.omega_r.libs.omegatypes.Text
1413
import com.omega_r.libs.omegatypes.from
14+
import com.omegar.libs.omegalaunchers.createActivityLauncher
15+
import com.omegar.libs.omegalaunchers.tools.put
1516
import com.omegar.mvp.presenter.InjectPresenter
1617

1718
@OmegaContentView(R.layout.activity_main)
1819
class MainActivity : OmegaActivity(), MainView {
1920

21+
companion object {
22+
23+
private const val EXTRA_TITLE = "title"
24+
25+
fun createLauncher(title: String) = createActivityLauncher(
26+
EXTRA_TITLE put title
27+
)
28+
29+
}
30+
2031
@InjectPresenter
2132
override lateinit var presenter: MainPresenter
2233

@@ -60,13 +71,37 @@ class MainActivity : OmegaActivity(), MainView {
6071
showToast(Text.from(it.id.toString()))
6172
}
6273

74+
75+
override fun onCreate(savedInstanceState: Bundle?) {
76+
super.onCreate(savedInstanceState)
77+
title = intent.getStringExtra(EXTRA_TITLE)
78+
}
79+
6380
private fun onClickItem(item: Image) {
6481
showToast(Text.from("Click $item"))
82+
83+
// ActivityLauncher.launch(this, null, createLauncher("1"), createLauncher("2"))
84+
85+
createLauncher("1").launch(this, createLauncher("2"))
6586
}
6687

67-
data class Item (val text: String = "123", val list: List<SubItem> = listOf(SubItem(), SubItem(), SubItem(), SubItem(), SubItem(), SubItem(), SubItem(), SubItem(), SubItem(), SubItem()))
88+
data class Item(
89+
val text: String = "123",
90+
val list: List<SubItem> = listOf(
91+
SubItem(),
92+
SubItem(),
93+
SubItem(),
94+
SubItem(),
95+
SubItem(),
96+
SubItem(),
97+
SubItem(),
98+
SubItem(),
99+
SubItem(),
100+
SubItem()
101+
)
102+
)
68103

69-
data class SubItem (val text: String = "123")
104+
data class SubItem(val text: String = "123")
70105

71106
enum class Field(override val id: Int) : IdHolder {
72107
ITEM1(R.id.recyclerview),

‎lib/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ dependencies {
5555

5656
implementation 'com.github.Omega-R.OmegaMoxy:moxy:1.5.8'
5757
implementation 'com.github.Omega-R.OmegaMoxy:moxy-androidx:1.5.8'
58+
implementation 'com.github.Omega-R:OmegaLaunchers:1.0.1'
59+
5860
kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.5.8'
5961

6062
implementation "com.github.Omega-R:OmegaRecyclerView:${omegaRecyclerView}@aar"

‎lib/src/main/java/com/omega_r/base/adapters/OmegaViewPagerAdapter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import androidx.fragment.app.Fragment
1010
import androidx.fragment.app.FragmentManager
1111
import androidx.fragment.app.FragmentStatePagerAdapter
1212
import com.omega_r.base.components.OmegaFragment
13-
import com.omega_r.base.launchers.FragmentLauncher
13+
import com.omegar.libs.omegalaunchers.FragmentLauncher
1414

1515
/**
1616
* Created by Anton Knyazev on 27.04.2019.

‎lib/src/main/java/com/omega_r/base/components/OmegaActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ import com.omega_r.base.annotations.*
1717
import com.omega_r.base.binders.IdHolder
1818
import com.omega_r.base.binders.managers.BindersManager
1919
import com.omega_r.base.clickers.ClickManager
20-
import com.omega_r.base.launchers.ActivityLauncher
21-
import com.omega_r.base.launchers.DialogFragmentLauncher
22-
import com.omega_r.base.launchers.FragmentLauncher
2320
import com.omega_r.base.mvp.model.Action
2421
import com.omega_r.base.mvp.views.findAnnotation
2522
import com.omega_r.base.tools.WaitingDialog
2623
import com.omega_r.libs.omegatypes.Text
24+
import com.omegar.libs.omegalaunchers.ActivityLauncher
25+
import com.omegar.libs.omegalaunchers.DialogFragmentLauncher
26+
import com.omegar.libs.omegalaunchers.FragmentLauncher
2727
import com.omegar.mvp.MvpAppCompatActivity
2828

2929
/**

‎lib/src/main/java/com/omega_r/base/components/OmegaBottomSheetDialogFragment.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import com.omega_r.base.annotations.OmegaTheme
1313
import com.omega_r.base.binders.IdHolder
1414
import com.omega_r.base.binders.managers.ResettableBindersManager
1515
import com.omega_r.base.clickers.ClickManager
16-
import com.omega_r.base.launchers.ActivityLauncher
17-
import com.omega_r.base.launchers.DialogFragmentLauncher
18-
import com.omega_r.base.launchers.FragmentLauncher
1916
import com.omega_r.base.mvp.model.Action
2017
import com.omega_r.base.mvp.views.findAnnotation
2118
import com.omega_r.libs.omegatypes.Text
19+
import com.omegar.libs.omegalaunchers.ActivityLauncher
20+
import com.omegar.libs.omegalaunchers.DialogFragmentLauncher
21+
import com.omegar.libs.omegalaunchers.FragmentLauncher
2222
import com.omegar.mvp.MvpBottomSheetDialogFragment
2323

2424
abstract class OmegaBottomSheetDialogFragment : MvpBottomSheetDialogFragment(), OmegaComponent {

‎lib/src/main/java/com/omega_r/base/components/OmegaComponent.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
99
import com.google.android.material.snackbar.Snackbar
1010
import com.omega_r.base.binders.OmegaBindable
1111
import com.omega_r.base.clickers.OmegaClickable
12-
import com.omega_r.base.launchers.ActivityLauncher
13-
import com.omega_r.base.launchers.Launcher
1412
import com.omega_r.base.mvp.presenters.OmegaPresenter
1513
import com.omega_r.base.mvp.views.OmegaView
1614
import com.omega_r.base.mvp.model.Action
1715
import com.omega_r.base.mvp.model.setAction
1816
import com.omega_r.base.mvp.model.setButtons
1917
import com.omega_r.base.mvp.model.setPositiveButton
2018
import com.omega_r.libs.omegatypes.Text
19+
import com.omegar.libs.omegalaunchers.Launcher
2120
import java.io.Serializable
2221

2322
/**

‎lib/src/main/java/com/omega_r/base/components/OmegaDialogFragment.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import com.omega_r.base.annotations.OmegaTheme
1313
import com.omega_r.base.binders.IdHolder
1414
import com.omega_r.base.binders.managers.ResettableBindersManager
1515
import com.omega_r.base.clickers.ClickManager
16-
import com.omega_r.base.launchers.ActivityLauncher
17-
import com.omega_r.base.launchers.DialogFragmentLauncher
18-
import com.omega_r.base.launchers.FragmentLauncher
1916
import com.omega_r.base.mvp.views.findAnnotation
2017
import com.omega_r.base.mvp.model.Action
2118
import com.omega_r.base.mvp.views.OmegaView
2219
import com.omega_r.libs.omegatypes.Text
20+
import com.omegar.libs.omegalaunchers.ActivityLauncher
21+
import com.omegar.libs.omegalaunchers.DialogFragmentLauncher
22+
import com.omegar.libs.omegalaunchers.FragmentLauncher
2323
import com.omegar.mvp.MvpAppCompatDialogFragment
2424
import java.io.Serializable
2525

‎lib/src/main/java/com/omega_r/base/components/OmegaFragment.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ import com.omega_r.base.annotations.OmegaTheme
1313
import com.omega_r.base.binders.IdHolder
1414
import com.omega_r.base.binders.managers.ResettableBindersManager
1515
import com.omega_r.base.clickers.ClickManager
16-
import com.omega_r.base.launchers.ActivityLauncher
17-
import com.omega_r.base.launchers.DialogFragmentLauncher
18-
import com.omega_r.base.launchers.FragmentLauncher
19-
import com.omega_r.base.launchers.Launcher
2016
import com.omega_r.base.mvp.views.findAnnotation
2117
import com.omega_r.base.mvp.model.Action
2218
import com.omega_r.libs.omegatypes.Text
19+
import com.omegar.libs.omegalaunchers.ActivityLauncher
20+
import com.omegar.libs.omegalaunchers.DialogFragmentLauncher
21+
import com.omegar.libs.omegalaunchers.FragmentLauncher
2322
import com.omegar.mvp.MvpAppCompatFragment
2423

2524
/**

‎lib/src/main/java/com/omega_r/base/launchers/ActivityLauncher.kt‎

Lines changed: 0 additions & 187 deletions
This file was deleted.

0 commit comments

Comments
 (0)