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=c2ee2c60bc614297b73ffd5bb500e069a201f7bd;hp=2ec658592a238f3a5e67b1501d1c0da12f1bba01;hb=e975cffd3885678f30f69d09fbc99905c3118588;hpb=e3872d583f324e225580a6fd05568d36e4ba0db0 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 2ec65859..c2ee2c60 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 @@ -1,68 +1,77 @@ /* * 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.activity; import android.content.Intent; -import android.content.SharedPreferences; import android.content.pm.PackageInfo; +import android.content.res.ColorStateList; +import android.graphics.Color; +import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.support.annotation.ColorInt; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.ViewPager; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.util.Log; -import android.view.ContextMenu; -import android.view.MenuItem; import android.view.View; +import android.view.ViewGroup; +import android.view.animation.Animation; +import android.view.animation.AnimationUtils; import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; +import android.widget.Toast; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; import net.ktnx.mobileledger.R; +import net.ktnx.mobileledger.async.RefreshDescriptionsTask; import net.ktnx.mobileledger.async.RetrieveTransactionsTask; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerAccount; import net.ktnx.mobileledger.model.MobileLedgerProfile; -import net.ktnx.mobileledger.ui.MobileLedgerListFragment; 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.utils.Colors; import net.ktnx.mobileledger.utils.MLDB; import java.lang.ref.WeakReference; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; +import java.text.DateFormat; import java.util.Date; import java.util.Observable; import java.util.Observer; -import java.util.UUID; -public class MainActivity extends AppCompatActivity { - public MobileLedgerListFragment currentFragment = null; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.widget.Toolbar; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.viewpager.widget.ViewPager; + +public class MainActivity extends ProfileThemedActivity { + private static final String STATE_CURRENT_PAGE = "current_page"; + private static final String BUNDLE_SAVED_STATE = "bundle_savedState"; DrawerLayout drawer; - private AccountSummaryFragment accountSummaryFragment; - private TransactionListFragment transactionListFragment; + private LinearLayout profileListContainer; + private View profileListHeadArrow, profileListHeadMore, profileListHeadCancel; private FragmentManager fragmentManager; private TextView tvLastUpdate; private RetrieveTransactionsTask retrieveTransactionsTask; @@ -71,6 +80,10 @@ public class MainActivity extends AppCompatActivity { private LinearLayout progressLayout; private SectionsPagerAdapter mSectionsPagerAdapter; private ViewPager mViewPager; + private FloatingActionButton fab; + private boolean profileModificationEnabled = false; + private boolean profileListExpanded = false; + private ProfilesRecyclerViewAdapter mProfileListAdapter; @Override protected void onStart() { @@ -91,54 +104,69 @@ public class MainActivity extends AppCompatActivity { } } @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem()); + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + 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); + drawer = findViewById(R.id.drawer_layout); + tvLastUpdate = findViewById(R.id.transactions_last_update); + bTransactionListCancelDownload = findViewById(R.id.transaction_list_cancel_download); + progressBar = findViewById(R.id.transaction_list_progress_bar); + progressLayout = findViewById(R.id.transaction_progress_layout); + fragmentManager = getSupportFragmentManager(); + mSectionsPagerAdapter = new SectionsPagerAdapter(fragmentManager); + mViewPager = findViewById(R.id.root_frame); + + Bundle extra = getIntent().getBundleExtra(BUNDLE_SAVED_STATE); + if (extra != null && savedInstanceState == null) savedInstanceState = extra; + + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - Data.profile.addObserver(new Observer() { - @Override - public void update(Observable o, Object arg) { - MobileLedgerProfile profile = Data.profile.get(); - runOnUiThread(() -> { - if (profile == null) toolbar.setSubtitle(""); - else toolbar.setSubtitle(profile.getName()); - }); - } - }); + Data.profile.addObserver((o, arg) -> { + MobileLedgerProfile profile = Data.profile.get(); + runOnUiThread(() -> { + if (profile == null) setTitle(R.string.app_name); + else setTitle(profile.getName()); + updateLastUpdateTextFromDB(); + if (profile.isPostingPermitted()) { + toolbar.setSubtitle(null); + fab.show(); + } + else { + toolbar.setSubtitle(R.string.profile_subitlte_read_only); + fab.hide(); + } - String profileUUID = MLDB.get_option_value(MLDB.OPT_PROFILE_UUID, null); - if (profileUUID == null) { - SharedPreferences backend = getSharedPreferences("backend", MODE_PRIVATE); - Log.d("profiles", "Migrating from preferences to profiles"); - // migration to multiple profiles - profileUUID = UUID.randomUUID().toString(); - MobileLedgerProfile profile = new MobileLedgerProfile(profileUUID, "default", - backend.getString("backend_url", ""), - backend.getBoolean("backend_use_http_auth", false), - backend.getString("backend_auth_user", null), - backend.getString("backend_auth_password", null)); - profile.storeInDB(); - SharedPreferences.Editor editor = backend.edit(); - editor.clear(); - editor.apply(); - Data.profile.set(profile); - MLDB.set_option_value(MLDB.OPT_PROFILE_UUID, profileUUID); - } - else { - MobileLedgerProfile profile = MobileLedgerProfile.loadUUIDFromDB(profileUUID); - Data.profile.set(profile); - } + int newProfileTheme = profile.getThemeId(); + if (newProfileTheme != Colors.profileThemeId) { + Log.d("profiles", String.format("profile theme %d → %d", Colors.profileThemeId, + newProfileTheme)); + profileThemeChanged(); + Colors.profileThemeId = newProfileTheme; + } + }); + }); - drawer = findViewById(R.id.drawer_layout); ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); drawer.addDrawerListener(toggle); toggle.syncState(); - android.widget.TextView ver = drawer.findViewById(R.id.drawer_version_text); + TextView ver = drawer.findViewById(R.id.drawer_version_text); try { PackageInfo pi = @@ -149,22 +177,15 @@ public class MainActivity extends AppCompatActivity { e.printStackTrace(); } - tvLastUpdate = findViewById(R.id.transactions_last_update); - - bTransactionListCancelDownload = findViewById(R.id.transaction_list_cancel_download); - progressBar = findViewById(R.id.transaction_list_progress_bar); if (progressBar == null) throw new RuntimeException("Can't get hold on the transaction value progress bar"); - progressLayout = findViewById(R.id.transaction_progress_layout); if (progressLayout == null) throw new RuntimeException( "Can't get hold on the transaction value progress bar layout"); - fragmentManager = getSupportFragmentManager(); - mSectionsPagerAdapter = new SectionsPagerAdapter(fragmentManager); + markDrawerItemCurrent(R.id.nav_account_summary); - mViewPager = findViewById(R.id.root_frame); mViewPager.setAdapter(mSectionsPagerAdapter); - mViewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener(){ + mViewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() { @Override public void onPageSelected(int position) { switch (position) { @@ -182,97 +203,148 @@ public class MainActivity extends AppCompatActivity { } }); - Data.lastUpdateDate.addObserver(new Observer() { + if (savedInstanceState != null) { + int currentPage = savedInstanceState.getInt(STATE_CURRENT_PAGE, -1); + if (currentPage != -1) { + mViewPager.setCurrentItem(currentPage, false); + } + } + + 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)); + } + }); + }); + + findViewById(R.id.btn_no_profiles_add) + .setOnClickListener(v -> startEditProfileActivity(null)); + + findViewById(R.id.btn_add_transaction).setOnClickListener(this::fabNewTransactionClicked); + + findViewById(R.id.nav_new_profile_button) + .setOnClickListener(v -> startEditProfileActivity(null)); + + RecyclerView root = findViewById(R.id.nav_profile_list); + if (root == null) + throw new RuntimeException("Can't get hold on the transaction value view"); + + mProfileListAdapter = new ProfilesRecyclerViewAdapter(); + root.setAdapter(mProfileListAdapter); + + mProfileListAdapter.addEditingProfilesObserver(new Observer() { @Override public void update(Observable o, Object arg) { - Log.d("main", "lastUpdateDate changed"); - runOnUiThread(() -> { - Date date = Data.lastUpdateDate.get(); - if (date == null) { - tvLastUpdate.setText(R.string.transaction_last_update_never); - } - else { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - tvLastUpdate.setText(date.toInstant().atZone(ZoneId.systemDefault()) - .format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)); - } - else { - tvLastUpdate.setText(date.toLocaleString()); - } - } - }); + if (mProfileListAdapter.isEditingProfiles()) { + profileListHeadArrow.clearAnimation(); + profileListHeadArrow.setVisibility(View.GONE); + profileListHeadMore.setVisibility(View.GONE); + profileListHeadCancel.setVisibility(View.VISIBLE); + } + else { + profileListHeadArrow.setRotation(180f); + profileListHeadArrow.setVisibility(View.VISIBLE); + profileListHeadCancel.setVisibility(View.GONE); + profileListHeadMore.setVisibility(View.GONE); + profileListHeadMore + .setVisibility(profileListExpanded ? View.VISIBLE : View.GONE); + } + } + }); + + LinearLayoutManager llm = new LinearLayoutManager(this); + + llm.setOrientation(RecyclerView.VERTICAL); + root.setLayoutManager(llm); + + profileListHeadMore.setOnClickListener((v) -> mProfileListAdapter.startEditingProfiles()); + profileListHeadCancel.setOnClickListener((v) -> mProfileListAdapter.stopEditingProfiles()); + + drawer.addDrawerListener(new DrawerLayout.SimpleDrawerListener() { + @Override + public void onDrawerClosed(View drawerView) { + super.onDrawerClosed(drawerView); + collapseProfileList(); } }); } - public void fab_new_transaction_clicked(View view) { - Intent intent = new Intent(this, NewTransactionActivity.class); - startActivity(intent); - overridePendingTransition(R.anim.slide_in_right, R.anim.dummy); - } + private void profileThemeChanged() { + setupProfileColors(); - public void nav_exit_clicked(View view) { - Log.w("app", "exiting"); + Bundle bundle = new Bundle(); + onSaveInstanceState(bundle); + // restart activity to reflect theme change finish(); + Intent intent = new Intent(this, this.getClass()); + 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(); + if (profile != null) { + int index = Data.getProfileIndex(profile); + if (index != -1) intent.putExtra(ProfileDetailFragment.ARG_ITEM_ID, index); + } + intent.putExtras(args); + startActivity(intent, args); } + private void setupProfile() { + String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null); + MobileLedgerProfile profile; + + profile = MobileLedgerProfile.loadAllFromDB(profileUUID); + + if (Data.profiles.getList().isEmpty()) { + findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE); + findViewById(R.id.pager_layout).setVisibility(View.GONE); + return; + } - public void nav_settings_clicked(View view) { + findViewById(R.id.pager_layout).setVisibility(View.VISIBLE); + findViewById(R.id.no_profiles_layout).setVisibility(View.GONE); + + if (profile == null) profile = Data.profiles.get(0); + + if (profile == null) throw new AssertionError("profile must have a value"); + + Data.setCurrentProfile(profile); + } + public void fabNewTransactionClicked(View view) { + Intent intent = new Intent(this, NewTransactionActivity.class); + startActivity(intent); + overridePendingTransition(R.anim.slide_in_right, R.anim.dummy); + } + public void navSettingsClicked(View view) { Intent intent = new Intent(this, SettingsActivity.class); startActivity(intent); + drawer.closeDrawers(); } public void markDrawerItemCurrent(int id) { TextView item = drawer.findViewById(id); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - item.setBackgroundColor(getResources().getColor(R.color.table_row_even_bg, getTheme())); - } - else { - item.setBackgroundColor(getResources().getColor(R.color.table_row_even_bg)); - } - - setTitle(item.getText()); - - @ColorInt int transparent = getResources().getColor(android.R.color.transparent); + item.setBackgroundColor(Colors.tableRowDarkBG); LinearLayout actions = drawer.findViewById(R.id.nav_actions); for (int i = 0; i < actions.getChildCount(); i++) { View view = actions.getChildAt(i); if (view.getId() != id) { - view.setBackgroundColor(transparent); + view.setBackgroundColor(Color.TRANSPARENT); } } } - public void onOptionsMenuClicked(MenuItem menuItem) { - ContextMenu.ContextMenuInfo info = menuItem.getMenuInfo(); - switch (menuItem.getItemId()) { - case R.id.menu_acc_summary_cancel_selection: - if (accountSummaryFragment != null) - accountSummaryFragment.onCancelAccSelection(menuItem); - break; - case R.id.menu_acc_summary_confirm_selection: - if (accountSummaryFragment != null) - accountSummaryFragment.onConfirmAccSelection(menuItem); - break; - case R.id.menu_acc_summary_only_starred: - if (accountSummaryFragment != null) - accountSummaryFragment.onShowOnlyStarredClicked(menuItem); - break; - case R.id.menu_transaction_list_filter: - if (transactionListFragment != null) - transactionListFragment.onShowFilterClick(menuItem); - break; - default: - Log.e("menu", String.format("Menu item %d not handled", menuItem.getItemId())); - } - } - public void onViewClicked(View view) { - switch (view.getId()) { - case R.id.clearAccountNameFilter: - if (transactionListFragment != null) - transactionListFragment.onClearAccountNameClick(view); - break; - default: - Log.e("click", String.format("View %d click not handled", view.getId())); - } - } public void onAccountSummaryClicked(View view) { drawer.closeDrawers(); @@ -280,6 +352,7 @@ public class MainActivity extends AppCompatActivity { } private void showAccountSummaryFragment() { mViewPager.setCurrentItem(0, true); + TransactionListFragment.accountFilter.set(null); // FragmentTransaction ft = fragmentManager.beginTransaction(); // accountSummaryFragment = new AccountSummaryFragment(); // ft.replace(R.id.root_frame, accountSummaryFragment); @@ -295,6 +368,7 @@ public class MainActivity extends AppCompatActivity { // fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE); } private void showTransactionsFragment(LedgerAccount account) { + if (account != null) TransactionListFragment.accountFilter.set(account.getName()); mViewPager.setCurrentItem(1, true); // FragmentTransaction ft = fragmentManager.beginTransaction(); // if (transactionListFragment == null) { @@ -332,7 +406,9 @@ public class MainActivity extends AppCompatActivity { } public void updateLastUpdateTextFromDB() { { - long last_update = MLDB.get_option_value(MLDB.OPT_TRANSACTION_LIST_STAMP, 0L); + final MobileLedgerProfile profile = Data.profile.get(); + long last_update = + (profile != null) ? profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L) : 0; Log.d("transactions", String.format("Last update = %d", last_update)); if (last_update == 0) { @@ -344,21 +420,31 @@ public class MainActivity extends AppCompatActivity { } } public void scheduleTransactionListRetrieval() { + if (Data.profile.get() == null) return; + retrieveTransactionsTask = new RetrieveTransactionsTask(new WeakReference<>(this)); retrieveTransactionsTask.execute(); - bTransactionListCancelDownload.setEnabled(true); } public void onStopTransactionRefreshClick(View view) { Log.d("interactive", "Cancelling transactions refresh"); if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false); bTransactionListCancelDownload.setEnabled(false); } - public void onRetrieveDone(boolean success) { + public void onRetrieveDone(String error) { progressLayout.setVisibility(View.GONE); - updateLastUpdateTextFromDB(); + + if (error == null) { + updateLastUpdateTextFromDB(); + + new RefreshDescriptionsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + } + else Toast.makeText(this, error, Toast.LENGTH_LONG).show(); } public void onRetrieveStart() { + bTransactionListCancelDownload.setEnabled(true); + progressBar.setIndeterminateTintList(ColorStateList.valueOf(Colors.primary)); + progressBar.setProgressTintList(ColorStateList.valueOf(Colors.primary)); progressBar.setIndeterminate(true); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) progressBar.setProgress(0, false); else progressBar.setProgress(0); @@ -382,6 +468,80 @@ public class MainActivity extends AppCompatActivity { progressBar.setIndeterminate(false); } } + public void fabShouldShow() { + MobileLedgerProfile profile = Data.profile.get(); + if ((profile != null) && profile.isPostingPermitted()) fab.show(); + } + public void navProfilesHeadClicked(View view) { + if (profileListExpanded) { + collapseProfileList(); + } + else { + expandProfileList(); + } + } + private void expandProfileList() { + profileListExpanded = true; + + + 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)); + } + private void collapseProfileList() { + profileListExpanded = false; + + final Animation animation = AnimationUtils.loadAnimation(this, R.anim.slide_up); + animation.setAnimationListener(new Animation.AnimationListener() { + @Override + public void onAnimationStart(Animation animation) { + + } + @Override + public void onAnimationEnd(Animation animation) { + profileListContainer.setVisibility(View.GONE); + } + @Override + public void onAnimationRepeat(Animation animation) { + + } + }); + mProfileListAdapter.stopEditingProfiles(); + + profileListContainer.startAnimation(animation); + profileListHeadArrow.setRotation(0f); + profileListHeadArrow + .startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180_back)); + profileListHeadMore.setVisibility(View.GONE); + } + public void onProfileRowClicked(View v) { + Data.setCurrentProfile((MobileLedgerProfile) v.getTag()); + } + public void enableProfileModifications() { + profileModificationEnabled = true; + ViewGroup profileList = findViewById(R.id.nav_profile_list); + for (int i = 0; i < profileList.getChildCount(); i++) { + View aRow = profileList.getChildAt(i); + aRow.findViewById(R.id.profile_list_edit_button).setVisibility(View.VISIBLE); + aRow.findViewById(R.id.profile_list_rearrange_handle).setVisibility(View.VISIBLE); + } + // FIXME enable rearranging + + } + public void disableProfileModifications() { + profileModificationEnabled = false; + ViewGroup profileList = findViewById(R.id.nav_profile_list); + 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); + } + // FIXME disable rearranging + + } + public class SectionsPagerAdapter extends FragmentPagerAdapter { public SectionsPagerAdapter(FragmentManager fm) { @@ -390,7 +550,7 @@ public class MainActivity extends AppCompatActivity { @Override public Fragment getItem(int position) { - Log.d("main", String.format("Switching to gragment %d", position)); + Log.d("main", String.format("Switching to fragment %d", position)); switch (position) { case 0: return new AccountSummaryFragment();