From 47e122e46c0d3991da550375c08d41ab062df2c9 Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Fri, 14 Dec 2018 14:20:16 -0600 Subject: [PATCH] - Add the required libraries to fetch the merchants data from the web service. - Create methods to redraw the Balances and NetWorth fragments each time they appear to the user, to temporarily avoid them not displaying correctly after returing from another screen or when changing the theme. --- app/build.gradle | 17 ++++++++++------- .../fragments/BalancesFragment.kt | 14 +++++++------- .../fragments/MerchantsFragment.kt | 1 - .../fragments/NetWorthFragment.kt | 14 +++++++------- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3b2ac74..326fae5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,30 +42,33 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':graphenejlib:graphenej') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - + // AndroidX implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' - + // Google implementation 'com.google.zxing:core:3.3.1' + implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.google.android.material:material:1.0.0' implementation 'com.google.android.gms:play-services-maps:16.0.0' - + // AAC Lifecycle implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version" - + // AAC Room implementation "androidx.room:room-runtime:$room_version" kapt "androidx.room:room-compiler:$room_version" implementation "androidx.room:room-rxjava2:$room_version" // RxJava support for Room - + // AAC Navigation implementation "android.arch.navigation:navigation-fragment-ktx:$nav_version" implementation "android.arch.navigation:navigation-ui-ktx:$nav_version" - + // Retrofit + implementation 'com.squareup.retrofit2:retrofit:2.5.0' + implementation 'com.squareup.retrofit2:converter-gson:2.5.0' + // Others implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1' implementation 'org.bitcoinj:bitcoinj-core:0.14.3' implementation 'com.moldedbits.r2d2:r2d2:1.0.1' implementation 'me.dm7.barcodescanner:zxing:1.9.8' implementation 'com.afollestad.material-dialogs:core:2.0.0-rc3' - // Android Debug Database debugImplementation 'com.amitshekhar.android:debug-db:1.0.4' 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 3985ea2..0f0ecd6 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt @@ -45,11 +45,11 @@ class BalancesFragment: Fragment() { }) } -// override fun setUserVisibleHint(isVisibleToUser: Boolean) { -// super.setUserVisibleHint(isVisibleToUser) -// if (isVisibleToUser) { -// // TODO find a better way to recreate the fragment, that does it only when the theme has been changed -// fragmentManager!!.beginTransaction().detach(this).attach(this).commit() -// } -// } + override fun setUserVisibleHint(isVisibleToUser: Boolean) { + super.setUserVisibleHint(isVisibleToUser) + if (isVisibleToUser) { + // TODO find a better way to recreate the fragment, that does it only when the theme has been changed + fragmentManager!!.beginTransaction().detach(this).attach(this).commit() + } + } } \ No newline at end of file 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 e05d833..4a37961 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/MerchantsFragment.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/MerchantsFragment.kt @@ -13,7 +13,6 @@ import com.google.android.gms.maps.model.LatLng import com.google.android.gms.maps.model.MarkerOptions import cy.agorise.bitsybitshareswallet.R -import kotlinx.android.synthetic.main.fragment_merchants.* class MerchantsFragment : Fragment(), OnMapReadyCallback { diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/NetWorthFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/NetWorthFragment.kt index 2a387f4..114d84a 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/NetWorthFragment.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/NetWorthFragment.kt @@ -18,11 +18,11 @@ class NetWorthFragment: Fragment() { return inflater.inflate(R.layout.fragment_net_worth, container, false) } -// override fun setUserVisibleHint(isVisibleToUser: Boolean) { -// super.setUserVisibleHint(isVisibleToUser) -// if (isVisibleToUser) { -// // TODO find a better way to recreate the fragment, that does it only when the theme has been changed -// fragmentManager!!.beginTransaction().detach(this).attach(this).commit() -// } -// } + override fun setUserVisibleHint(isVisibleToUser: Boolean) { + super.setUserVisibleHint(isVisibleToUser) + if (isVisibleToUser) { + // TODO find a better way to recreate the fragment, that does it only when the theme has been changed + fragmentManager!!.beginTransaction().detach(this).attach(this).commit() + } + } } \ No newline at end of file