X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=cfceb7ca7f1786d9a9470dd6c0934dbaf5e9b8c6;hp=47dc798cbd5a796b4308ab402ef4d87b1d049364;hb=b1b663239741e95fc1087de186a10e5e762135db;hpb=4ccb6fc377a998a39283e45d207cb488c624f34a 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 47dc798c..cfceb7ca 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 @@ -27,6 +27,7 @@ import android.os.Bundle; import android.util.Log; import android.view.View; import android.view.ViewGroup; +import android.view.ViewPropertyAnimator; import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.widget.LinearLayout; @@ -37,6 +38,7 @@ import android.widget.Toast; import com.google.android.material.floatingactionbutton.FloatingActionButton; import net.ktnx.mobileledger.R; +import net.ktnx.mobileledger.async.DbOpQueue; import net.ktnx.mobileledger.async.RefreshDescriptionsTask; import net.ktnx.mobileledger.async.RetrieveTransactionsTask; import net.ktnx.mobileledger.model.Data; @@ -46,12 +48,15 @@ import net.ktnx.mobileledger.ui.account_summary.AccountSummaryFragment; import net.ktnx.mobileledger.ui.profiles.ProfileDetailFragment; import net.ktnx.mobileledger.ui.profiles.ProfilesRecyclerViewAdapter; import net.ktnx.mobileledger.ui.transaction_list.TransactionListFragment; +import net.ktnx.mobileledger.ui.transaction_list.TransactionListViewModel; import net.ktnx.mobileledger.utils.Colors; import net.ktnx.mobileledger.utils.MLDB; import java.lang.ref.WeakReference; import java.text.DateFormat; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import java.util.Observable; import java.util.Observer; @@ -66,12 +71,14 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.ViewPager; -public class MainActivity extends CrashReportingActivity { +public class MainActivity extends ProfileThemedActivity { private static final String STATE_CURRENT_PAGE = "current_page"; private static final String BUNDLE_SAVED_STATE = "bundle_savedState"; + public AccountSummaryFragment mAccountSummaryFragment; DrawerLayout drawer; private LinearLayout profileListContainer; - private View profileListHeadArrow; + private View profileListHeadArrow, profileListHeadMore, profileListHeadCancel; + private LinearLayout profileListHeadMoreAndCancel; private FragmentManager fragmentManager; private TextView tvLastUpdate; private RetrieveTransactionsTask retrieveTransactionsTask; @@ -84,12 +91,12 @@ public class MainActivity extends CrashReportingActivity { private boolean profileModificationEnabled = false; private boolean profileListExpanded = false; private ProfilesRecyclerViewAdapter mProfileListAdapter; - @Override protected void onStart() { super.onStart(); - Data.lastUpdateDate.set(null); + setupProfile(); + updateLastUpdateTextFromDB(); Date lastUpdate = Data.lastUpdateDate.get(); @@ -117,6 +124,9 @@ public class MainActivity extends CrashReportingActivity { fab = findViewById(R.id.btn_add_transaction); profileListContainer = findViewById(R.id.nav_profile_list_container); profileListHeadArrow = findViewById(R.id.nav_profiles_arrow); + profileListHeadMore = findViewById(R.id.nav_profiles_start_edit); + profileListHeadCancel = findViewById(R.id.nav_profiles_cancel_edit); + profileListHeadMoreAndCancel = findViewById(R.id.nav_profile_list_head_buttons); drawer = findViewById(R.id.drawer_layout); tvLastUpdate = findViewById(R.id.transactions_last_update); bTransactionListCancelDownload = findViewById(R.id.transaction_list_cancel_download); @@ -157,6 +167,12 @@ public class MainActivity extends CrashReportingActivity { } }); }); + Data.profiles.addObserver((o, arg) -> { + findViewById(R.id.nav_profile_list).setMinimumHeight( + (int) (getResources().getDimension(R.dimen.thumb_row_height) * + Data.profiles.size())); + mProfileListAdapter.notifyDataSetChanged(); + }); ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, @@ -210,19 +226,11 @@ public class MainActivity extends CrashReportingActivity { Data.lastUpdateDate.addObserver((o, arg) -> { Log.d("main", "lastUpdateDate changed"); - runOnUiThread(() -> { - Date date = Data.lastUpdateDate.get(); - if (date == null) { - tvLastUpdate.setText(R.string.transaction_last_update_never); - } - else { - final String text = DateFormat.getDateTimeInstance().format(date); - tvLastUpdate.setText(text); - Log.d("despair", String.format("Date formatted: %s", text)); - } - }); + runOnUiThread(this::updateLastUpdateDisplay); }); + updateLastUpdateDisplay(); + findViewById(R.id.btn_no_profiles_add) .setOnClickListener(v -> startEditProfileActivity(null)); @@ -244,24 +252,50 @@ public class MainActivity extends CrashReportingActivity { if (mProfileListAdapter.isEditingProfiles()) { profileListHeadArrow.clearAnimation(); profileListHeadArrow.setVisibility(View.GONE); -// findViewById(R.id.nav_profiles_arrow).setAlpha(0f); - findViewById(R.id.nav_profiles_cancel_edit).setVisibility(View.VISIBLE); + profileListHeadMore.setVisibility(View.GONE); + profileListHeadCancel.setVisibility(View.VISIBLE); } else { + profileListHeadArrow.setRotation(180f); profileListHeadArrow.setVisibility(View.VISIBLE); -// findViewById(R.id.nav_profiles_arrow).setAlpha(1f); - findViewById(R.id.nav_profiles_cancel_edit).setVisibility(View.GONE); + profileListHeadCancel.setVisibility(View.GONE); + profileListHeadMore.setVisibility(View.GONE); + profileListHeadMore + .setVisibility(profileListExpanded ? View.VISIBLE : View.GONE); } } }); - findViewById(R.id.nav_profiles_cancel_edit).setOnClickListener((v) -> { - mProfileListAdapter.stopEditingProfiles(); - }); LinearLayoutManager llm = new LinearLayoutManager(this); llm.setOrientation(RecyclerView.VERTICAL); root.setLayoutManager(llm); + + profileListHeadMore.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); + profileListHeadCancel.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); + profileListHeadMoreAndCancel + .setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); + + drawer.addDrawerListener(new DrawerLayout.SimpleDrawerListener() { + @Override + public void onDrawerClosed(View drawerView) { + super.onDrawerClosed(drawerView); + collapseProfileList(); + } + }); + } + private void updateLastUpdateDisplay() { + TextView v = findViewById(R.id.transactions_last_update); + Date date = Data.lastUpdateDate.get(); + if (date == null) { + v.setText(R.string.transaction_last_update_never); + Log.d("main", "no last update date :("); + } + else { + final String text = DateFormat.getDateTimeInstance().format(date); + v.setText(text); + Log.d("main", String.format("Date formatted: %s", text)); + } } private void profileThemeChanged() { setupProfileColors(); @@ -274,11 +308,6 @@ public class MainActivity extends CrashReportingActivity { intent.putExtra(BUNDLE_SAVED_STATE, bundle); startActivity(intent); } - @Override - protected void onResume() { - super.onResume(); - setupProfile(); - } public void startEditProfileActivity(MobileLedgerProfile profile) { Intent intent = new Intent(this, ProfileDetailActivity.class); Bundle args = new Bundle(); @@ -425,6 +454,7 @@ public class MainActivity extends CrashReportingActivity { updateLastUpdateTextFromDB(); new RefreshDescriptionsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + TransactionListViewModel.scheduleTransactionListReload(); } else Toast.makeText(this, error, Toast.LENGTH_LONG).show(); } @@ -474,6 +504,11 @@ public class MainActivity extends CrashReportingActivity { profileListContainer.setVisibility(View.VISIBLE); profileListContainer.startAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_down)); profileListHeadArrow.startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180)); + profileListHeadMore.setVisibility(View.VISIBLE); + profileListHeadMore.startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in)); + findViewById(R.id.nav_profile_list).setMinimumHeight( + (int) (getResources().getDimension(R.dimen.thumb_row_height) * + Data.profiles.size())); } private void collapseProfileList() { profileListExpanded = false; @@ -493,11 +528,13 @@ public class MainActivity extends CrashReportingActivity { } }); + mProfileListAdapter.stopEditingProfiles(); + profileListContainer.startAnimation(animation); + profileListHeadArrow.setRotation(0f); profileListHeadArrow .startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180_back)); - - mProfileListAdapter.stopEditingProfiles(); + profileListHeadMore.setVisibility(View.GONE); } public void onProfileRowClicked(View v) { Data.setCurrentProfile((MobileLedgerProfile) v.getTag()); @@ -519,11 +556,84 @@ public class MainActivity extends CrashReportingActivity { for (int i = 0; i < profileList.getChildCount(); i++) { View aRow = profileList.getChildAt(i); aRow.findViewById(R.id.profile_list_edit_button).setVisibility(View.GONE); - aRow.findViewById(R.id.profile_list_rearrange_handle).setVisibility(View.GONE); + aRow.findViewById(R.id.profile_list_rearrange_handle).setVisibility(View.INVISIBLE); } // FIXME disable rearranging } + public void onAccountSummaryRowViewClicked(View view) { + ViewGroup row = (ViewGroup) view.getParent(); + LedgerAccount acc = (LedgerAccount) row.getTag(); + switch (view.getId()) { + case R.id.account_row_acc_name: + case R.id.account_expander_container: + Log.d("accounts", "Account expander clicked"); + if (!acc.hasSubAccounts()) return; + + boolean wasExpanded = acc.isExpanded(); + + View arrow = row.findViewById(R.id.account_expander_container); + + arrow.clearAnimation(); + ViewPropertyAnimator animator = arrow.animate(); + + acc.toggleExpanded(); + Data.profile.get().storeAccount(MLDB.getDatabase(), acc); + + if (wasExpanded) { + Log.d("accounts", String.format("Collapsing account '%s'", acc.getName())); + arrow.setRotation(0); + animator.rotationBy(180); + + // removing all child accounts from the view + int start = -1, count = 0; + int i = 0; + final ArrayList accountList = Data.accounts.get(); + for (LedgerAccount a : accountList) { + if (acc.isParentOf(a)) { + if (start == -1) { + start = i; + } + count++; + } + else { + if (start != -1) { + break; + } + } + i++; + } + + if (start != -1) { + for (int j = 0; j < count; j++) { + Log.d("accounts", String.format("Removing item %d: %s", start + j, + accountList.get(start).getName())); + accountList.remove(start); + } + + mAccountSummaryFragment.modelAdapter.notifyItemRangeRemoved(start, count); + } + } + else { + Log.d("accounts", String.format("Expanding account '%s'", acc.getName())); + arrow.setRotation(180); + animator.rotationBy(-180); + ArrayList accounts = Data.accounts.get(); + List children = + Data.profile.get().loadVisibleChildAccountsOf(acc); + int parentPos = accounts.indexOf(acc); + if (parentPos == -1) throw new RuntimeException( + "Can't find index of clicked account " + acc.getName()); + accounts.addAll(parentPos + 1, children); + mAccountSummaryFragment.modelAdapter + .notifyItemRangeInserted(parentPos + 1, children.size()); + } + break; + case R.id.account_row_acc_amounts: + showAccountTransactions(acc); + break; + } + } public class SectionsPagerAdapter extends FragmentPagerAdapter { @@ -536,7 +646,8 @@ public class MainActivity extends CrashReportingActivity { Log.d("main", String.format("Switching to fragment %d", position)); switch (position) { case 0: - return new AccountSummaryFragment(); +// Log.d("flow", "Creating account summary fragment"); + return mAccountSummaryFragment = new AccountSummaryFragment(); case 1: return new TransactionListFragment(); default: @@ -550,5 +661,4 @@ public class MainActivity extends CrashReportingActivity { return 2; } } - }