diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt index 593b3e4..be29647 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt @@ -3,10 +3,10 @@ package cy.agorise.bitsybitshareswallet.activities import android.content.Intent import androidx.appcompat.app.AppCompatActivity -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter import android.os.Bundle +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager import cy.agorise.bitsybitshareswallet.BuildConfig import cy.agorise.bitsybitshareswallet.R import cy.agorise.bitsybitshareswallet.fragments.BalancesFragment @@ -18,12 +18,12 @@ import kotlinx.android.synthetic.main.activity_main.* class MainActivity : AppCompatActivity() { /** - * The [android.support.v4.view.PagerAdapter] that will provide + * The [androidx.fragment.app.FragmentPagerAdapter] that will provide * fragments for each of the sections. We use a * {@link FragmentPagerAdapter} derivative, which will keep every * loaded fragment in memory. If this becomes too memory intensive, it * may be best to switch to a - * [android.support.v4.app.FragmentStatePagerAdapter]. + * [androidx.fragment.app.FragmentStatePagerAdapter]. */ private var mSectionsPagerAdapter: SectionsPagerAdapter? = null @@ -64,9 +64,9 @@ class MainActivity : AppCompatActivity() { * A [FragmentPagerAdapter] that returns a fragment corresponding to * one of the sections/tabs/pages. */ - inner class SectionsPagerAdapter(fm: androidx.fragment.app.FragmentManager) : androidx.fragment.app.FragmentPagerAdapter(fm) { + inner class SectionsPagerAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm) { - override fun getItem(position: Int): androidx.fragment.app.Fragment { + override fun getItem(position: Int): Fragment { return when (position) { 0 -> BalancesFragment() 1 -> TransactionsFragment() diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt index 5e72956..7d6f00e 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt @@ -14,7 +14,7 @@ import cy.agorise.bitsybitshareswallet.activities.SendTransactionActivity import cy.agorise.bitsybitshareswallet.viewmodels.BalancesViewModel import kotlinx.android.synthetic.main.fragment_balances.* -class BalancesFragment : androidx.fragment.app.Fragment() { +class BalancesFragment : Fragment() { companion object { fun newInstance() = BalancesFragment() diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/MerchantsFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/MerchantsFragment.kt index ff37dc0..4714120 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/MerchantsFragment.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/MerchantsFragment.kt @@ -10,7 +10,7 @@ import android.view.ViewGroup import cy.agorise.bitsybitshareswallet.R import cy.agorise.bitsybitshareswallet.viewmodels.MerchantsViewModel -class MerchantsFragment : androidx.fragment.app.Fragment() { +class MerchantsFragment : Fragment() { companion object { fun newInstance() = MerchantsFragment() diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt index be9d905..68f9083 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt @@ -10,7 +10,7 @@ import android.view.ViewGroup import cy.agorise.bitsybitshareswallet.R import cy.agorise.bitsybitshareswallet.viewmodels.TransactionsViewModel -class TransactionsFragment : androidx.fragment.app.Fragment() { +class TransactionsFragment : Fragment() { companion object { fun newInstance() = TransactionsFragment() diff --git a/graphenejlib b/graphenejlib index d66c8f0..0b1caeb 160000 --- a/graphenejlib +++ b/graphenejlib @@ -1 +1 @@ -Subproject commit d66c8f0ff840ac1bb445462885bb8af9c83b8bfa +Subproject commit 0b1caeb37274e0dfdd6ca2f5439fb7ff8df609b3