diff --git a/zcash-android-wallet-app/app/libs/zcash-android-wallet-sdk-1.6.0.aar b/zcash-android-wallet-app/app/libs/zcash-android-wallet-sdk-1.6.0.aar index cc84715..28ec3c6 100644 Binary files a/zcash-android-wallet-app/app/libs/zcash-android-wallet-sdk-1.6.0.aar and b/zcash-android-wallet-app/app/libs/zcash-android-wallet-sdk-1.6.0.aar differ diff --git a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/di/module/SynchronizerModule.kt b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/di/module/SynchronizerModule.kt index b472f08..d0ef543 100644 --- a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/di/module/SynchronizerModule.kt +++ b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/di/module/SynchronizerModule.kt @@ -97,10 +97,10 @@ internal object SynchronizerModule { object Properties { val COMPACT_BLOCK_SERVER = Servers.EMULATOR.host const val COMPACT_BLOCK_PORT = 9067 - const val CACHE_DB_NAME = "wallet_cache421.db" - const val DATA_DB_NAME = "wallet_data421.db" - val SEED_PROVIDER = SampleImportedSeedProvider("295761fce7fdc89fa1095259f5be6375c4a36f7a214767d668f9ef6e17aa6314") - val SPENDING_KEY_PROVIDER = SampleSpendingKeyProvider2("dummyseed") + const val CACHE_DB_NAME = "wallet_cache4821.db" + const val DATA_DB_NAME = "wallet_data4821.db" + val SEED_PROVIDER = SampleSeedProvider("dummyseed") + val SPENDING_KEY_PROVIDER = SampleSpendingKeyProvider("dummyseed") } enum class Servers(val host: String) { diff --git a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/HistoryFragment.kt b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/HistoryFragment.kt index cc7ebbc..b367ea4 100644 --- a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/HistoryFragment.kt +++ b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/HistoryFragment.kt @@ -1,10 +1,48 @@ package cash.z.android.wallet.ui.fragment +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import cash.z.android.wallet.R +import android.view.ViewGroup +import androidx.databinding.DataBindingUtil +import cash.z.android.wallet.ui.presenter.HistoryPresenter import dagger.Module import dagger.android.ContributesAndroidInjector +import kotlinx.coroutines.launch +import cash.z.android.wallet.databinding.FragmentHistoryBinding +import cash.z.wallet.sdk.dao.WalletTransaction -class HistoryFragment : PlaceholderFragment() +class HistoryFragment : BaseFragment(), HistoryPresenter.HistoryView { + + + override val titleResId: Int get() = R.string.destination_title_history + lateinit var historyPresenter: HistoryPresenter + lateinit var binding: FragmentHistoryBinding + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + return DataBindingUtil + .inflate(inflater, R.layout.fragment_history, container, false) + .also { binding = it } + .root + } + + override fun onResume() { + super.onResume() + launch { + historyPresenter.start() + } + } + + override fun onPause() { + super.onPause() + historyPresenter.stop() + } + + override fun setTransactions(transactions: List) { + } +} @Module abstract class HistoryFragmentModule {