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%2FAccountSummaryAdapter.java;h=3778552503f3c833915779908432167bc4420f4d;hp=6f3e4f2b29b1948b226bea5d2a69f8ac8657d373;hb=83cac114e375728080194fb09758b49c50a8119b;hpb=b5ce02c84db901506139f9e0aaab3c56e394a6e3
diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryAdapter.java b/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryAdapter.java
index 6f3e4f2b..37785525 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryAdapter.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/account_summary/AccountSummaryAdapter.java
@@ -1,18 +1,18 @@
/*
* 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 .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.ui.account_summary;
@@ -20,23 +20,24 @@ package net.ktnx.mobileledger.ui.account_summary;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Typeface;
-import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CheckBox;
-import android.widget.LinearLayout;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
import android.widget.TextView;
import net.ktnx.mobileledger.R;
import net.ktnx.mobileledger.model.Data;
import net.ktnx.mobileledger.model.LedgerAccount;
-import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.RecyclerView;
-class AccountSummaryAdapter extends RecyclerView.Adapter {
+public class AccountSummaryAdapter
+ extends RecyclerView.Adapter {
private boolean selectionActive;
AccountSummaryAdapter() {
@@ -44,21 +45,25 @@ class AccountSummaryAdapter extends RecyclerView.Adapter accounts = Data.accounts.get();
- if (position < accounts.size()) {
- LedgerAccount acc = accounts.get(position);
+ if (position < Data.accounts.size()) {
+ LedgerAccount acc = Data.accounts.get(position);
Context ctx = holder.row.getContext();
Resources rm = ctx.getResources();
+ holder.row.setTag(acc);
holder.row.setVisibility(View.VISIBLE);
holder.vTrailer.setVisibility(View.GONE);
holder.tvAccountName.setText(acc.getShortName());
- holder.tvAccountName.setPadding(
- acc.getLevel() * rm.getDimensionPixelSize(R.dimen.activity_horizontal_margin) /
- 2, 0, 0, 0);
+ ConstraintLayout.LayoutParams lp =
+ (ConstraintLayout.LayoutParams) holder.tvAccountName.getLayoutParams();
+ lp.setMarginStart(
+ acc.getLevel() * rm.getDimensionPixelSize(R.dimen.thumb_row_height) / 2);
+ holder.expanderContainer
+ .setVisibility(acc.hasSubAccounts() ? View.VISIBLE : View.INVISIBLE);
+ holder.expanderContainer.setRotation(acc.isExpanded() ? 0 : 180);
holder.tvAccountAmounts.setText(acc.getAmountsString());
- if (acc.isHidden()) {
+ if (acc.isHiddenByStar()) {
holder.tvAccountName.setTypeface(null, Typeface.ITALIC);
holder.tvAccountAmounts.setTypeface(null, Typeface.ITALIC);
}
@@ -67,19 +72,8 @@ class AccountSummaryAdapter extends RecyclerView.Adapter= Build.VERSION_CODES.M) holder.row
- .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
- .setBackgroundColor(rm.getColor(R.color.drawer_background, ctx.getTheme()));
- else holder.row.setBackgroundColor(rm.getColor(R.color.drawer_background));
- }
-
holder.selectionCb.setVisibility(selectionActive ? View.VISIBLE : View.GONE);
- holder.selectionCb.setChecked(!acc.isHiddenToBe());
+ holder.selectionCb.setChecked(!acc.isHiddenByStarToBe());
holder.row.setTag(R.id.POS, position);
}
@@ -99,10 +93,13 @@ class AccountSummaryAdapter extends RecyclerView.Adapter {
+ int w = right - left;
+ int h = bottom - top;
+ if (h > w) {
+ int p = (h - w) / 2;
+ v.setPadding(0, p, 0, p);
+ }
+ else v.setPadding(0, 0, 0, 0);
+ });
}
}
}