From 9193baa807cb024b0cdfc67de2d38b502d789bc6 Mon Sep 17 00:00:00 2001 From: Vova Buberenko Date: Sat, 12 Oct 2019 00:55:09 +0300 Subject: [PATCH 1/3] Make activities start unified --- .../chuckerteam/chucker/internal/ui/MainActivity.kt | 2 +- .../chucker/internal/ui/error/ErrorActivity.kt | 13 +++++++------ .../internal/ui/transaction/TransactionActivity.kt | 10 ++++------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/ui/MainActivity.kt b/library/src/main/java/com/chuckerteam/chucker/internal/ui/MainActivity.kt index bfa43b160..84e71578f 100644 --- a/library/src/main/java/com/chuckerteam/chucker/internal/ui/MainActivity.kt +++ b/library/src/main/java/com/chuckerteam/chucker/internal/ui/MainActivity.kt @@ -82,7 +82,7 @@ class MainActivity : } override fun onErrorClick(throwableId: Long, position: Int) { - startActivity(ErrorActivity.newInstance(this, throwableId)) + ErrorActivity.start(this, throwableId) } override fun onTransactionClick(transactionId: Long, position: Int) { diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorActivity.kt b/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorActivity.kt index 38ae72c0e..25734af0f 100644 --- a/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorActivity.kt +++ b/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorActivity.kt @@ -15,7 +15,6 @@ import com.chuckerteam.chucker.internal.data.entity.RecordedThrowable import com.chuckerteam.chucker.internal.data.repository.RepositoryProvider import java.text.DateFormat -private const val EXTRA_THROWABLE_ID = "EXTRA_THROWABLE_ID" private const val TEXT_PLAIN = "text/plain" internal class ErrorActivity : AppCompatActivity() { @@ -105,11 +104,13 @@ internal class ErrorActivity : AppCompatActivity() { } companion object { - @JvmStatic - fun newInstance(context: Context, throwableId: Long) = - Intent(context, ErrorActivity::class.java).apply { - putExtra(EXTRA_THROWABLE_ID, throwableId) - } + private const val EXTRA_THROWABLE_ID = "transaction_id" + + fun start(context: Context, throwableId: Long) { + val intent = Intent(context, ErrorActivity::class.java) + intent.putExtra(EXTRA_THROWABLE_ID, throwableId) + context.startActivity(intent) + } } private val RecordedThrowable.formattedDate: String diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionActivity.kt b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionActivity.kt index 1eb11a4f8..231926bc5 100644 --- a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionActivity.kt +++ b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionActivity.kt @@ -40,6 +40,7 @@ internal class TransactionActivity : BaseChuckerActivity() { private lateinit var title: TextView private lateinit var adapter: PagerAdapter + private var selectedTabPosition = 0 private var transactionId: Long = 0 private var transaction: HttpTransaction? = null @@ -61,7 +62,7 @@ internal class TransactionActivity : BaseChuckerActivity() { val tabLayout = findViewById(R.id.tabs) tabLayout.setupWithViewPager(viewPager) - transactionId = intent.getLongExtra(ARG_TRANSACTION_ID, 0) + transactionId = intent.getLongExtra(EXTRA_TRANSACTION_ID, 0) } override fun onResume() { @@ -149,14 +150,11 @@ internal class TransactionActivity : BaseChuckerActivity() { } companion object { + private const val EXTRA_TRANSACTION_ID = "transaction_id" - private const val ARG_TRANSACTION_ID = "transaction_id" - private var selectedTabPosition = 0 - - @JvmStatic fun start(context: Context, transactionId: Long) { val intent = Intent(context, TransactionActivity::class.java) - intent.putExtra(ARG_TRANSACTION_ID, transactionId) + intent.putExtra(EXTRA_TRANSACTION_ID, transactionId) context.startActivity(intent) } } From 6061781448bf46eb32ea98948374eebae48d5ba8 Mon Sep 17 00:00:00 2001 From: Vova Buberenko Date: Mon, 14 Oct 2019 20:38:35 +0300 Subject: [PATCH 2/3] Move constant into companion object --- .../com/chuckerteam/chucker/internal/ui/error/ErrorActivity.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorActivity.kt b/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorActivity.kt index 25734af0f..79f258a38 100644 --- a/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorActivity.kt +++ b/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorActivity.kt @@ -15,8 +15,6 @@ import com.chuckerteam.chucker.internal.data.entity.RecordedThrowable import com.chuckerteam.chucker.internal.data.repository.RepositoryProvider import java.text.DateFormat -private const val TEXT_PLAIN = "text/plain" - internal class ErrorActivity : AppCompatActivity() { private var throwableId: Long = 0 @@ -105,6 +103,7 @@ internal class ErrorActivity : AppCompatActivity() { companion object { private const val EXTRA_THROWABLE_ID = "transaction_id" + private const val TEXT_PLAIN = "text/plain" fun start(context: Context, throwableId: Long) { val intent = Intent(context, ErrorActivity::class.java) From 7a0a846a2305f35a41bfc5447a1a2667828acd6c Mon Sep 17 00:00:00 2001 From: Vova Buberenko Date: Tue, 15 Oct 2019 00:09:25 +0300 Subject: [PATCH 3/3] Move selectedTabPosition back into companion --- .../chucker/internal/ui/transaction/TransactionActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionActivity.kt b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionActivity.kt index 231926bc5..600a4870e 100644 --- a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionActivity.kt +++ b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionActivity.kt @@ -40,7 +40,6 @@ internal class TransactionActivity : BaseChuckerActivity() { private lateinit var title: TextView private lateinit var adapter: PagerAdapter - private var selectedTabPosition = 0 private var transactionId: Long = 0 private var transaction: HttpTransaction? = null @@ -151,6 +150,7 @@ internal class TransactionActivity : BaseChuckerActivity() { companion object { private const val EXTRA_TRANSACTION_ID = "transaction_id" + private var selectedTabPosition = 0 fun start(context: Context, transactionId: Long) { val intent = Intent(context, TransactionActivity::class.java)