/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see <https://www.gnu.org/licenses/>.
+ * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
*/
package net.ktnx.mobileledger.ui.transaction_list;
import android.database.sqlite.SQLiteDatabase;
import android.graphics.Typeface;
import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.AppCompatTextView;
-import android.support.v7.widget.RecyclerView;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.style.StyleSpan;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.recyclerview.widget.RecyclerView;
+
+import net.ktnx.mobileledger.App;
import net.ktnx.mobileledger.R;
+import net.ktnx.mobileledger.model.Data;
import net.ktnx.mobileledger.model.LedgerTransaction;
import net.ktnx.mobileledger.model.LedgerTransactionAccount;
import net.ktnx.mobileledger.model.TransactionListItem;
+import net.ktnx.mobileledger.utils.Colors;
import net.ktnx.mobileledger.utils.Globals;
-import net.ktnx.mobileledger.utils.MLDB;
import java.text.DateFormat;
import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
import static net.ktnx.mobileledger.utils.DimensionUtils.dp2px;
public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowHolder> {
- private String boldAccountName;
public void onBindViewHolder(@NonNull TransactionRowHolder holder, int position) {
TransactionListItem item = TransactionListViewModel.getTransactionListItem(position);
case TRANSACTION:
holder.vTransaction.setVisibility(View.VISIBLE);
holder.vDelimiter.setVisibility(View.GONE);
- holder.vTrailer.setVisibility(View.GONE);
LedgerTransaction tr = item.getTransaction();
- // Log.d("transactions", String.format("Filling position %d with %d accounts", position,
+ // debug("transactions", String.format("Filling position %d with %d accounts", position,
// tr.getAccounts().size()));
TransactionLoader loader = new TransactionLoader();
- loader.execute(new TransactionLoaderParams(tr, holder, position, boldAccountName,
- item.isOdd()));
+ loader.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
+ new TransactionLoaderParams(tr, holder, position, Data.accountFilter.getValue(),
+ item.isOdd()));
// WORKAROUND what seems to be a bug in CardHolder somewhere
// when a view that was previously holding a delimiter is re-purposed
case DELIMITER:
Date date = item.getDate();
holder.vTransaction.setVisibility(View.GONE);
- holder.vTrailer.setVisibility(View.GONE);
holder.vDelimiter.setVisibility(View.VISIBLE);
holder.tvDelimiterDate.setText(DateFormat.getDateInstance().format(date));
if (item.isMonthShown()) {
- holder.tvDelimiterMonth.setText(Globals.monthNames[date.getMonth()]);
+ GregorianCalendar cal = new GregorianCalendar(TimeZone.getDefault());
+ cal.setTime(date);
+ holder.tvDelimiterMonth
+ .setText(Globals.monthNames[cal.get(GregorianCalendar.MONTH)]);
holder.tvDelimiterMonth.setVisibility(View.VISIBLE);
// holder.vDelimiterLine.setBackgroundResource(R.drawable.dashed_border_8dp);
holder.vDelimiterLine.setVisibility(View.GONE);
holder.vDelimiterLine.setVisibility(View.VISIBLE);
holder.vDelimiterThick.setVisibility(View.GONE);
}
- break;
- case TRAILER:
- holder.vTransaction.setVisibility(View.GONE);
- holder.vTrailer.setVisibility(View.VISIBLE);
- holder.vDelimiter.setVisibility(View.GONE);
-
break;
}
}
@NonNull
@Override
public TransactionRowHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-// Log.d("perf", "onCreateViewHolder called");
+// debug("perf", "onCreateViewHolder called");
View row = LayoutInflater.from(parent.getContext())
.inflate(R.layout.transaction_list_row, parent, false);
return new TransactionRowHolder(row);
@Override
public int getItemCount() {
- return TransactionListViewModel.getTransactionCount() + 1;
+ return Data.transactions.size();
}
- public void setBoldAccountName(String boldAccountName) {
- this.boldAccountName = boldAccountName;
- }
- public void resetBoldAccountName() {
- this.boldAccountName = null;
- }
-
enum LoaderStep {HEAD, ACCOUNTS, DONE}
-
private static class TransactionLoader
extends AsyncTask<TransactionLoaderParams, TransactionLoaderStep, Void> {
@Override
LedgerTransaction tr = p[0].transaction;
boolean odd = p[0].odd;
- SQLiteDatabase db = MLDB.getReadableDatabase();
+ SQLiteDatabase db = App.getDatabase();
tr.loadData(db);
publishProgress(new TransactionLoaderStep(p[0].holder, p[0].position, tr, odd));
int rowIndex = 0;
+ // FIXME ConcurrentModificationException in ArrayList$ltr.next (ArrayList.java:831)
for (LedgerTransactionAccount acc : tr.getAccounts()) {
-// Log.d(c.getAccountName(), acc.getAmount()));
+// debug(c.getAccountName(), acc.getAmount()));
publishProgress(new TransactionLoaderStep(p[0].holder, acc, rowIndex++,
p[0].boldAccountName));
}
case HEAD:
holder.tvDescription.setText(step.getTransaction().getDescription());
- if (step.isOdd()) holder.row.setBackgroundColor(Globals.tableRowDarkBG);
- else holder.row.setBackgroundColor(Globals.tableRowLightBG);
+ if (step.isOdd()) holder.row.setBackgroundColor(Colors.tableRowDarkBG);
+ else holder.row.setBackgroundColor(Colors.tableRowLightBG);
break;
case ACCOUNTS:
LedgerTransactionAccount acc = step.getAccount();
-// Log.d("tmp", String.format("showing acc row %d: %s %1.2f", rowIndex,
+// debug("tmp", String.format("showing acc row %d: %s %1.2f", rowIndex,
// acc.getAccountName(), acc.getAmount()));
String boldAccountName = step.getBoldAccountName();
if ((boldAccountName != null) &&
acc.getAccountName().startsWith(boldAccountName))
{
- accName.setTextColor(Globals.primaryDark);
- accAmount.setTextColor(Globals.primaryDark);
+ accName.setTextColor(Colors.accent);
+ accAmount.setTextColor(Colors.accent);
SpannableString ss = new SpannableString(acc.getAccountName());
ss.setSpan(new StyleSpan(Typeface.BOLD), 0, boldAccountName.length(),
accName.setText(ss);
}
else {
- accName.setTextColor(Globals.defaultTextColor);
- accAmount.setTextColor(Globals.defaultTextColor);
+ accName.setTextColor(Colors.defaultTextColor);
+ accAmount.setTextColor(Colors.defaultTextColor);
accName.setText(acc.getAccountName());
}
accAmount.setText(acc.toString());
holder.tableAccounts.getChildCount() - accCount);
}
-// Log.d("transactions",
+// debug("transactions",
// String.format("Position %d fill done", step.getPosition()));
}
}
projects / mobile-ledger.git / blobdiff