Skip to content

Commit 952ef83

Browse files
Pass intent extras directly to OnThisDayFragment
1 parent 94b80fe commit 952ef83

File tree

2 files changed

+3
-16
lines changed

2 files changed

+3
-16
lines changed

app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayActivity.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,11 @@ import org.wikipedia.Constants
66
import org.wikipedia.Constants.InvokeSource
77
import org.wikipedia.activity.SingleFragmentActivity
88
import org.wikipedia.dataclient.WikiSite
9-
import org.wikipedia.extensions.parcelableExtra
10-
import org.wikipedia.extensions.serializableExtra
119

1210
class OnThisDayActivity : SingleFragmentActivity<OnThisDayFragment>() {
1311

1412
override fun createFragment(): OnThisDayFragment {
15-
return OnThisDayFragment.newInstance(intent.getIntExtra(EXTRA_AGE, 0),
16-
intent.parcelableExtra(Constants.ARG_WIKISITE)!!,
17-
intent.getIntExtra(EXTRA_YEAR, -1),
18-
intent.serializableExtra(Constants.INTENT_EXTRA_INVOKE_SOURCE)!!)
13+
return OnThisDayFragment.newInstance(intent.extras!!)
1914
}
2015

2116
companion object {

app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.kt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import android.view.View
66
import android.view.ViewGroup
77
import android.view.animation.AnimationUtils
88
import androidx.appcompat.app.AppCompatActivity
9-
import androidx.core.os.bundleOf
109
import androidx.fragment.app.Fragment
1110
import androidx.fragment.app.viewModels
1211
import androidx.lifecycle.Lifecycle
@@ -16,8 +15,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
1615
import androidx.recyclerview.widget.RecyclerView
1716
import com.google.android.material.tabs.TabLayoutMediator
1817
import kotlinx.coroutines.launch
19-
import org.wikipedia.Constants
20-
import org.wikipedia.Constants.InvokeSource
2118
import org.wikipedia.R
2219
import org.wikipedia.databinding.FragmentOnThisDayBinding
2320
import org.wikipedia.databinding.ViewEventsLayoutBinding
@@ -271,14 +268,9 @@ class OnThisDayFragment : Fragment(), CustomDatePicker.Callback {
271268
private const val VIEW_TYPE_ITEM = 0
272269
private const val VIEW_TYPE_FOOTER = 1
273270

274-
fun newInstance(age: Int, wikiSite: WikiSite, year: Int, invokeSource: InvokeSource): OnThisDayFragment {
271+
fun newInstance(bundle: Bundle): OnThisDayFragment {
275272
return OnThisDayFragment().apply {
276-
arguments = bundleOf(
277-
OnThisDayActivity.EXTRA_AGE to age,
278-
Constants.ARG_WIKISITE to wikiSite,
279-
OnThisDayActivity.EXTRA_YEAR to year,
280-
Constants.INTENT_EXTRA_INVOKE_SOURCE to invokeSource
281-
)
273+
arguments = bundle
282274
}
283275
}
284276
}

0 commit comments

Comments
 (0)