X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=5ca25061b277045987d0699a70ed9b51a99dd37c;hb=b7a79ded94e99d06567b6617c7caa926799dc90c;hp=55392876fd9f54882d98ca27ae46bb81ee1fd0f7;hpb=6e815a8613c191e76a4346f0e23b88bf50a8b02c;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java index 55392876..5ca25061 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java @@ -41,6 +41,8 @@ import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -51,11 +53,14 @@ import com.google.android.material.snackbar.Snackbar; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.async.RetrieveTransactionsTask; +import net.ktnx.mobileledger.async.TransactionAccumulator; import net.ktnx.mobileledger.databinding.ActivityMainBinding; import net.ktnx.mobileledger.db.DB; import net.ktnx.mobileledger.db.Option; import net.ktnx.mobileledger.db.Profile; +import net.ktnx.mobileledger.db.TransactionWithAccounts; import net.ktnx.mobileledger.model.Data; +import net.ktnx.mobileledger.model.LedgerTransaction; import net.ktnx.mobileledger.ui.FabManager; import net.ktnx.mobileledger.ui.MainModel; import net.ktnx.mobileledger.ui.account_summary.AccountSummaryFragment; @@ -66,6 +71,7 @@ import net.ktnx.mobileledger.ui.templates.TemplatesActivity; import net.ktnx.mobileledger.ui.transaction_list.TransactionListFragment; import net.ktnx.mobileledger.utils.Colors; import net.ktnx.mobileledger.utils.Logger; +import net.ktnx.mobileledger.utils.Misc; import org.jetbrains.annotations.NotNull; @@ -80,11 +86,13 @@ import java.util.Objects; * */ public class MainActivity extends ProfileThemedActivity implements FabManager.FabHandler { + public static final String TAG = "main-act"; public static final String STATE_CURRENT_PAGE = "current_page"; public static final String BUNDLE_SAVED_STATE = "bundle_savedState"; public static final String STATE_ACC_FILTER = "account_filter"; private static final boolean FAB_HIDDEN = false; private static final boolean FAB_SHOWN = true; + private ConverterThread converterThread = null; private SectionsPagerAdapter mSectionsPagerAdapter; private ProfilesRecyclerViewAdapter mProfileListAdapter; private int mCurrentPage; @@ -101,7 +109,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa protected void onStart() { super.onStart(); - Logger.debug("MainActivity", "onStart()"); + Logger.debug(TAG, "onStart()"); b.mainPager.setCurrentItem(mCurrentPage, false); } @@ -133,9 +141,9 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa } @Override protected void onCreate(Bundle savedInstanceState) { - Logger.debug("MainActivity", "onCreate()/entry"); + Logger.debug(TAG, "onCreate()/entry"); super.onCreate(savedInstanceState); - Logger.debug("MainActivity", "onCreate()/after super"); + Logger.debug(TAG, "onCreate()/after super"); b = ActivityMainBinding.inflate(getLayoutInflater()); setContentView(b.getRoot()); @@ -178,6 +186,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa markDrawerItemCurrent(R.id.nav_account_summary); b.mainPager.setAdapter(mSectionsPagerAdapter); + b.mainPager.setOffscreenPageLimit(1); if (pageChangeCallback == null) { pageChangeCallback = new ViewPager2.OnPageChangeCallback() { @@ -192,8 +201,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa markDrawerItemCurrent(R.id.nav_latest_transactions); break; default: - Log.e("MainActivity", - String.format("Unexpected page index %d", position)); + Log.e(TAG, String.format("Unexpected page index %d", position)); } super.onPageSelected(position); @@ -385,7 +393,16 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa createShortcuts(newList); Profile currentProfile = Data.getProfile(); - if (currentProfile == null || !newList.contains(currentProfile)) { + boolean currentProfilePresent = false; + if (currentProfile != null) { + for (Profile p : newList) { + if (p.getId() == currentProfile.getId()) { + currentProfilePresent = true; + break; + } + } + } + if (!currentProfilePresent) { Logger.debug(TAG, "Switching profile because the current is no longer available"); Data.setCurrentProfile(newList.get(0)); } @@ -455,14 +472,40 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa return; } - mainModel.stopTransactionsRetrieval(); + mainModel.getAccountFilter() + .observe(this, this::onAccountFilterChanged); + mainModel.stopTransactionsRetrieval(); mainModel.clearTransactions(); - - if (haveProfile) { - Logger.debug("transactions", "requesting list reload"); - mainModel.scheduleTransactionListReload(); + } + private void onAccountFilterChanged(String accFilter) { + Logger.debug(TAG, "account filter changed, reloading transactions"); +// mainModel.scheduleTransactionListReload(); + LiveData> transactions = + new MutableLiveData<>(new ArrayList()); + if (profile != null) { + if (accFilter == null || accFilter.isEmpty()) { + transactions = DB.get() + .getTransactionDAO() + .getAllWithAccounts(profile.getId()); + } + else { + transactions = DB.get() + .getTransactionDAO() + .getAllWithAccountsFiltered(profile.getId(), accFilter); + } } + + transactions.observe(this, list -> { + Logger.debug(TAG, + String.format(Locale.ROOT, "got transaction list from DB (%d transactions)", + list.size())); + + if (converterThread != null) + converterThread.interrupt(); + converterThread = new ConverterThread(mainModel, list, accFilter); + converterThread.start(); + }); } private void profileThemeChanged() { // un-hook all observed LiveData @@ -472,7 +515,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa Data.lastUpdateAccountCount.removeObservers(this); Data.lastUpdateDate.removeObservers(this); - Logger.debug("MainActivity", "profileThemeChanged(): recreating activity"); + Logger.debug(TAG, "profileThemeChanged(): recreating activity"); recreate(); } public void fabNewTransactionClicked(View view) { @@ -530,7 +573,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa mBackMeansToAccountList = false; } else { - Logger.debug("fragments", String.format(Locale.ENGLISH, "manager stack: %d", + Logger.debug(TAG, String.format(Locale.ENGLISH, "manager stack: %d", getSupportFragmentManager().getBackStackEntryCount())); super.onBackPressed(); @@ -592,7 +635,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa } } public void onStopTransactionRefreshClick(View view) { - Logger.debug("interactive", "Cancelling transactions refresh"); + Logger.debug(TAG, "Cancelling transactions refresh"); mainModel.stopTransactionsRetrieval(); b.transactionListCancelDownload.setEnabled(false); } @@ -619,7 +662,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa if (progress == null || progress.getState() == RetrieveTransactionsTask.ProgressState.FINISHED) { - Logger.debug("progress", "Done"); + Logger.debug(TAG, "progress: Done"); b.transactionProgressLayout.setVisibility(View.GONE); mainModel.transactionRetrievalDone(); @@ -632,7 +675,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setMessage(error); builder.setPositiveButton(R.string.btn_profile_options, (dialog, which) -> { - Logger.debug("error", "will start profile editor"); + Logger.debug(TAG, "will start profile editor"); ProfileDetailActivity.start(this, profile); }); builder.create() @@ -656,14 +699,15 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa if (progress.isIndeterminate() || (progress.getTotal() <= 0)) { b.transactionListProgressBar.setIndeterminate(true); - Logger.debug("progress", "indeterminate"); + Logger.debug(TAG, "progress: indeterminate"); } else { if (b.transactionListProgressBar.isIndeterminate()) { b.transactionListProgressBar.setIndeterminate(false); } -// Logger.debug("progress", -// String.format(Locale.US, "%d/%d", progress.getProgress(), progress.getTotal +// Logger.debug(TAG, +// String.format(Locale.US, "progress: %d/%d", progress.getProgress(), +// progress.getTotal // ())); b.transactionListProgressBar.setMax(progress.getTotal()); // for some reason animation doesn't work - no progress is shown (stick at 0) @@ -698,11 +742,10 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa @NotNull @Override public Fragment createFragment(int position) { - Logger.debug("main", - String.format(Locale.ENGLISH, "Switching to fragment %d", position)); + Logger.debug(TAG, String.format(Locale.ENGLISH, "Switching to fragment %d", position)); switch (position) { case 0: -// debug("flow", "Creating account summary fragment"); +// debug(TAG, "Creating account summary fragment"); return new AccountSummaryFragment(); case 1: return new TransactionListFragment(); @@ -717,4 +760,37 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa return 2; } } + + static private class ConverterThread extends Thread { + private final List list; + private final MainModel model; + private final String accFilter; + public ConverterThread(@NonNull MainModel model, + @NonNull List list, String accFilter) { + this.model = model; + this.list = list; + this.accFilter = accFilter; + } + @Override + public void run() { + TransactionAccumulator accumulator = new TransactionAccumulator(accFilter); + + for (TransactionWithAccounts tr : list) { + if (isInterrupted()) { + Logger.debug(TAG, "ConverterThread bailing out on interrupt"); + return; + } + accumulator.put(new LedgerTransaction(tr)); + } + + if (isInterrupted()) { + Logger.debug(TAG, "ConverterThread bailing out on interrupt"); + return; + } + + Logger.debug(TAG, "ConverterThread publishing results"); + + Misc.onMainThread(() -> accumulator.publishResults(model)); + } + } }