X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Faccount_summary%2FAccountSummaryViewModel.java;h=446df6a5cef700da2edb1108768841998a754ef9;hp=942a56850b57e20e605c949d8b2ce6b06cb37e06;hb=11c8dff16901782f69287854cb4788ddf8d932c2;hpb=0bbdc409d82da31324c031f36607510f17d992e6 diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryViewModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryViewModel.java index 942a5685..446df6a5 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryViewModel.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryViewModel.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018 Damyan Ivanov. + * Copyright © 2019 Damyan Ivanov. * This file is part of Mobile-Ledger. * Mobile-Ledger is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -17,15 +17,11 @@ package net.ktnx.mobileledger.ui.account_summary; -import android.app.Application; -import android.arch.lifecycle.AndroidViewModel; +import android.arch.lifecycle.ViewModel; import android.content.Context; import android.content.res.Resources; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; import android.graphics.Typeface; import android.os.Build; -import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.v7.widget.RecyclerView; import android.util.Log; @@ -37,97 +33,65 @@ import android.widget.LinearLayout; import android.widget.TextView; import net.ktnx.mobileledger.R; +import net.ktnx.mobileledger.async.CommitAccountsTask; +import net.ktnx.mobileledger.async.CommitAccountsTaskParams; +import net.ktnx.mobileledger.async.UpdateAccountsTask; +import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerAccount; -import net.ktnx.mobileledger.utils.MLDB; import java.util.ArrayList; -import java.util.List; -import static net.ktnx.mobileledger.ui.activity.SettingsActivity.PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS; - -class AccountSummaryViewModel extends AndroidViewModel { - private List accounts; - - public AccountSummaryViewModel(@NonNull Application application) { - super(application); +class AccountSummaryViewModel extends ViewModel { + static void commitSelections(Context context) { + CAT task = new CAT(); + task.execute( + new CommitAccountsTaskParams(Data.accounts.get(), Data.optShowOnlyStarred.get())); } + void scheduleAccountListReload() { + UAT task = new UAT(); + task.execute(); - List getAccounts(Context context) { - if (accounts == null) { - accounts = new ArrayList<>(); - reloadAccounts(context); - } - - return accounts; } - void reloadAccounts(Context context) { - accounts.clear(); - boolean showingOnlyStarred = - PreferenceManager.getDefaultSharedPreferences(getApplication()) - .getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false); - String sql = "SELECT name, hidden FROM accounts"; - if (showingOnlyStarred) sql += " WHERE hidden = 0"; - sql += " ORDER BY name"; - - try (SQLiteDatabase db = MLDB.getReadableDatabase(context)) { - try (Cursor cursor = db - .rawQuery(sql,null)) - { - while (cursor.moveToNext()) { - LedgerAccount acc = new LedgerAccount(cursor.getString(0)); - acc.setHidden(cursor.getInt(1) == 1); - try (Cursor c2 = db.rawQuery( - "SELECT value, currency FROM account_values " + "WHERE account = ?", - new String[]{acc.getName()})) - { - while (c2.moveToNext()) { - acc.addAmount(c2.getFloat(0), c2.getString(1)); - } - } - accounts.add(acc); - } + private static class UAT extends UpdateAccountsTask { + @Override + protected void onPostExecute(ArrayList list) { + super.onPostExecute(list); + if (list != null) { + Log.d("acc", "setting updated account list"); + Data.accounts.set(list); } } } - void commitSelections(Context context) { - try(SQLiteDatabase db = MLDB.getWritableDatabase(context)) { - db.beginTransaction(); - try { - for (LedgerAccount acc : accounts) { - Log.d("db", String.format("Setting %s to %s", acc.getName(), - acc.isHidden() ? "hidden" : "starred")); - db.execSQL("UPDATE accounts SET hidden=? WHERE name=?", - new Object[]{acc.isHiddenToBe() ? 1 : 0, acc.getName()}); - } - db.setTransactionSuccessful(); - for (LedgerAccount acc : accounts ) { acc.setHidden(acc.isHiddenToBe()); } + + private static class CAT extends CommitAccountsTask { + @Override + protected void onPostExecute(ArrayList list) { + super.onPostExecute(list); + if (list != null) { + Log.d("acc", "setting new account list"); + Data.accounts.set(list); } - finally { db.endTransaction(); } } } } -class AccountSummaryAdapter extends RecyclerView.Adapter { - private List accounts; +class AccountSummaryAdapter extends RecyclerView.Adapter { private boolean selectionActive; - AccountSummaryAdapter(List accounts) { - this.accounts = accounts; + AccountSummaryAdapter() { this.selectionActive = false; } public void onBindViewHolder(@NonNull LedgerRowHolder holder, int position) { - LedgerAccount acc = accounts.get(position); + LedgerAccount acc = Data.accounts.get().get(position); Context ctx = holder.row.getContext(); Resources rm = ctx.getResources(); holder.tvAccountName.setText(acc.getShortName()); holder.tvAccountName.setPadding( acc.getLevel() * rm.getDimensionPixelSize(R.dimen.activity_horizontal_margin) / 2, - 0, 0, - 0); + 0, 0, 0); holder.tvAccountAmounts.setText(acc.getAmountsString()); if (acc.isHidden()) { @@ -141,8 +105,8 @@ class AccountSummaryAdapter extends RecyclerView.Adapter= Build.VERSION_CODES.M) holder.row - .setBackgroundColor(rm.getColor(R.color.table_row_even_bg, ctx.getTheme())); - else holder.row.setBackgroundColor(rm.getColor(R.color.table_row_even_bg)); + .setBackgroundColor(rm.getColor(R.color.table_row_dark_bg, ctx.getTheme())); + else holder.row.setBackgroundColor(rm.getColor(R.color.table_row_dark_bg)); } else { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) holder.row @@ -150,7 +114,7 @@ class AccountSummaryAdapter extends RecyclerView.Adapter