agorise
/
bitsy-wallet
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issues with migration to AdroidX and update graphenej library.

master
Severiano Jaramillo 2018-10-31 09:46:30 -06:00
parent cb3178f642
commit a816098be8
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt
View File

@ -3,10 +3,10 @@ package cy.agorise.bitsybitshareswallet.activities
import android.content.Intent import android.content.Intent
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentPagerAdapter import androidx.fragment.app.FragmentPagerAdapter
import android.os.Bundle import android.os.Bundle
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
import cy.agorise.bitsybitshareswallet.BuildConfig import cy.agorise.bitsybitshareswallet.BuildConfig
import cy.agorise.bitsybitshareswallet.R import cy.agorise.bitsybitshareswallet.R
import cy.agorise.bitsybitshareswallet.fragments.BalancesFragment import cy.agorise.bitsybitshareswallet.fragments.BalancesFragment
@ -18,12 +18,12 @@ import kotlinx.android.synthetic.main.activity_main.*
class MainActivity : AppCompatActivity() { 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 * fragments for each of the sections. We use a
* {@link FragmentPagerAdapter} derivative, which will keep every * {@link FragmentPagerAdapter} derivative, which will keep every
* loaded fragment in memory. If this becomes too memory intensive, it * loaded fragment in memory. If this becomes too memory intensive, it
* may be best to switch to a * may be best to switch to a
* [android.support.v4.app.FragmentStatePagerAdapter]. * [androidx.fragment.app.FragmentStatePagerAdapter].
*/ */
private var mSectionsPagerAdapter: SectionsPagerAdapter? = null private var mSectionsPagerAdapter: SectionsPagerAdapter? = null
@ -64,9 +64,9 @@ class MainActivity : AppCompatActivity() {
* A [FragmentPagerAdapter] that returns a fragment corresponding to * A [FragmentPagerAdapter] that returns a fragment corresponding to
* one of the sections/tabs/pages. * 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) { return when (position) {
0 -> BalancesFragment() 0 -> BalancesFragment()
1 -> TransactionsFragment() 1 -> TransactionsFragment()

2
app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt
View File

@ -14,7 +14,7 @@ import cy.agorise.bitsybitshareswallet.activities.SendTransactionActivity
import cy.agorise.bitsybitshareswallet.viewmodels.BalancesViewModel import cy.agorise.bitsybitshareswallet.viewmodels.BalancesViewModel
import kotlinx.android.synthetic.main.fragment_balances.* import kotlinx.android.synthetic.main.fragment_balances.*
class BalancesFragment : androidx.fragment.app.Fragment() { class BalancesFragment : Fragment() {
companion object { companion object {
fun newInstance() = BalancesFragment() fun newInstance() = BalancesFragment()

2
app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/MerchantsFragment.kt
View File

@ -10,7 +10,7 @@ import android.view.ViewGroup
import cy.agorise.bitsybitshareswallet.R import cy.agorise.bitsybitshareswallet.R
import cy.agorise.bitsybitshareswallet.viewmodels.MerchantsViewModel import cy.agorise.bitsybitshareswallet.viewmodels.MerchantsViewModel
class MerchantsFragment : androidx.fragment.app.Fragment() { class MerchantsFragment : Fragment() {
companion object { companion object {
fun newInstance() = MerchantsFragment() fun newInstance() = MerchantsFragment()

2
app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt
View File

@ -10,7 +10,7 @@ import android.view.ViewGroup
import cy.agorise.bitsybitshareswallet.R import cy.agorise.bitsybitshareswallet.R
import cy.agorise.bitsybitshareswallet.viewmodels.TransactionsViewModel import cy.agorise.bitsybitshareswallet.viewmodels.TransactionsViewModel
class TransactionsFragment : androidx.fragment.app.Fragment() { class TransactionsFragment : Fragment() {
companion object { companion object {
fun newInstance() = TransactionsFragment() fun newInstance() = TransactionsFragment()

2
graphenejlib

@ -1 +1 @@
Subproject commit d66c8f0ff840ac1bb445462885bb8af9c83b8bfa Subproject commit 0b1caeb37274e0dfdd6ca2f5439fb7ff8df609b3