package net.ktnx.mobileledger.ui.activity;
import android.content.Intent;
+import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.ShortcutInfo;
import android.content.pm.ShortcutManager;
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;
import android.widget.ProgressBar;
import android.widget.TextView;
-import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+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;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
import net.ktnx.mobileledger.R;
import net.ktnx.mobileledger.async.DbOpQueue;
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.GetOptCallback;
import net.ktnx.mobileledger.utils.LockHolder;
import net.ktnx.mobileledger.utils.MLDB;
import org.jetbrains.annotations.NotNull;
-import java.lang.ref.WeakReference;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Observer;
+import java.util.Locale;
-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;
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
+/*
+ * TODO: reports
+ * */
public class MainActivity extends ProfileThemedActivity {
public static final String STATE_CURRENT_PAGE = "current_page";
public static final String BUNDLE_SAVED_STATE = "bundle_savedState";
public static final String STATE_ACC_FILTER = "account_filter";
+ private static final String PREF_THEME_ID = "themeId";
public AccountSummaryFragment mAccountSummaryFragment;
DrawerLayout drawer;
- private LinearLayout profileListContainer;
- private View profileListHeadArrow, profileListHeadMore, profileListHeadCancel;
- private LinearLayout profileListHeadMoreAndCancel;
- private FragmentManager fragmentManager;
- private TextView tvLastUpdate;
- private RetrieveTransactionsTask retrieveTransactionsTask;
+ private View profileListHeadMore, profileListHeadCancel, profileListHeadAddProfile;
private View bTransactionListCancelDownload;
- private ProgressBar progressBar;
- private LinearLayout progressLayout;
private SectionsPagerAdapter mSectionsPagerAdapter;
private ViewPager mViewPager;
private FloatingActionButton fab;
- private boolean profileModificationEnabled = false;
- private boolean profileListExpanded = false;
private ProfilesRecyclerViewAdapter mProfileListAdapter;
private int mCurrentPage;
- private String mAccountFilter;
private boolean mBackMeansToAccountList = false;
- private Observer profileObserver;
- private Observer profilesObserver;
private Toolbar mToolbar;
private DrawerLayout.SimpleDrawerListener drawerListener;
private ActionBarDrawerToggle barDrawerToggle;
private ViewPager.SimpleOnPageChangeListener pageChangeListener;
- private Observer editingProfilesObserver;
+ private MobileLedgerProfile profile;
@Override
protected void onStart() {
super.onStart();
- Log.d("flow", "MainActivity.onStart()");
mViewPager.setCurrentItem(mCurrentPage, false);
- if (mAccountFilter != null) showTransactionsFragment(mAccountFilter);
- else Data.accountFilter.setValue(null);
-
}
@Override
- protected void onSaveInstanceState(Bundle outState) {
+ protected void onSaveInstanceState(@NotNull Bundle outState) {
super.onSaveInstanceState(outState);
outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem());
- if (mAccountFilter != null)
- outState.putString(STATE_ACC_FILTER, mAccountFilter);
+ if (Data.accountFilter.getValue() != null)
+ outState.putString(STATE_ACC_FILTER, Data.accountFilter.getValue());
}
@Override
protected void onDestroy() {
mSectionsPagerAdapter = null;
- Data.profile.deleteObserver(profileObserver);
- profileObserver = null;
- Data.profiles.deleteObserver(profilesObserver);
- profilesObserver = null;
RecyclerView root = findViewById(R.id.nav_profile_list);
- if (root != null) root.setAdapter(null);
- if (drawer != null) drawer.removeDrawerListener(drawerListener);
+ if (root != null)
+ root.setAdapter(null);
+ if (drawer != null)
+ drawer.removeDrawerListener(drawerListener);
drawerListener = null;
- if (drawer != null) drawer.removeDrawerListener(barDrawerToggle);
+ if (drawer != null)
+ drawer.removeDrawerListener(barDrawerToggle);
barDrawerToggle = null;
- if (mViewPager != null) mViewPager.removeOnPageChangeListener(pageChangeListener);
+ if (mViewPager != null)
+ mViewPager.removeOnPageChangeListener(pageChangeListener);
pageChangeListener = null;
- if (mProfileListAdapter != null)
- mProfileListAdapter.deleteEditingProfilesObserver(editingProfilesObserver);
- editingProfilesObserver = null;
super.onDestroy();
}
@Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- Log.d("flow", "MainActivity.onCreate()");
- int profileColor = Data.retrieveCurrentThemeIdFromDb();
+ protected void setupProfileColors() {
+ SharedPreferences prefs = getPreferences(MODE_PRIVATE);
+ int profileColor = prefs.getInt(PREF_THEME_ID, -2);
+ if (profileColor == -2)
+ profileColor = Data.retrieveCurrentThemeIdFromDb();
Colors.setupTheme(this, profileColor);
Colors.profileThemeId = profileColor;
+ storeThemeIdInPrefs(profileColor);
+ }
+ @Override
+ protected void onResume() {
+ super.onResume();
+ fabShouldShow();
+ }
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ debug("flow", "MainActivity.onCreate()");
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);
- profileListHeadMoreAndCancel = findViewById(R.id.nav_profile_list_head_buttons);
+ LinearLayout profileListHeadMoreAndCancel =
+ findViewById(R.id.nav_profile_list_head_buttons);
+ profileListHeadAddProfile = findViewById(R.id.nav_new_profile_button);
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);
+ mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
mViewPager = findViewById(R.id.root_frame);
Bundle extra = getIntent().getBundleExtra(BUNDLE_SAVED_STATE);
- if (extra != null && savedInstanceState == null) savedInstanceState = extra;
+ if (extra != null && savedInstanceState == null)
+ savedInstanceState = extra;
mToolbar = findViewById(R.id.toolbar);
setSupportActionBar(mToolbar);
- if (profileObserver == null) {
- profileObserver = (o, arg) -> onProfileChanged(arg);
- Data.profile.addObserver(profileObserver);
- }
+ Data.profile.observe(this, this::onProfileChanged);
- if (profilesObserver == null) {
- profilesObserver = (o, arg) -> onProfileListChanged(arg);
- Data.profiles.addObserver(profilesObserver);
- }
+ Data.profiles.observe(this, this::onProfileListChanged);
if (barDrawerToggle == null) {
barDrawerToggle = new ActionBarDrawerToggle(this, drawer, mToolbar,
drawer.addDrawerListener(barDrawerToggle);
}
barDrawerToggle.syncState();
+ drawer.addDrawerListener(new DrawerLayout.DrawerListener() {
+ @Override
+ public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
+ if (slideOffset > 0.2)
+ fabHide();
+ }
+ @Override
+ public void onDrawerOpened(@NonNull View drawerView) {
+ fabHide();
+ }
+ @Override
+ public void onDrawerClosed(@NonNull View drawerView) {
+ fabShouldShow();
+ }
+ @Override
+ public void onDrawerStateChanged(int newState) {}
+ });
- TextView ver = drawer.findViewById(R.id.drawer_version_text);
try {
- PackageInfo pi =
- getApplicationContext().getPackageManager().getPackageInfo(getPackageName(), 0);
- ver.setText(pi.versionName);
+ PackageInfo pi = getApplicationContext().getPackageManager()
+ .getPackageInfo(getPackageName(), 0);
+ ((TextView) findViewById(R.id.nav_upper).findViewById(
+ R.id.drawer_version_text)).setText(pi.versionName);
+ ((TextView) findViewById(R.id.no_profiles_layout).findViewById(
+ R.id.drawer_version_text)).setText(pi.versionName);
}
catch (Exception e) {
e.printStackTrace();
}
- if (progressBar == null)
- throw new RuntimeException("Can't get hold on the transaction value progress bar");
- if (progressLayout == null) throw new RuntimeException(
- "Can't get hold on the transaction value progress bar layout");
-
markDrawerItemCurrent(R.id.nav_account_summary);
mViewPager.setAdapter(mSectionsPagerAdapter);
pageChangeListener = new ViewPager.SimpleOnPageChangeListener() {
@Override
public void onPageSelected(int position) {
+ mCurrentPage = position;
switch (position) {
case 0:
markDrawerItemCurrent(R.id.nav_account_summary);
if (currentPage != -1) {
mCurrentPage = currentPage;
}
- mAccountFilter = savedInstanceState.getString(STATE_ACC_FILTER, null);
+ Data.accountFilter.setValue(savedInstanceState.getString(STATE_ACC_FILTER, null));
}
- else mAccountFilter = null;
Data.lastUpdateDate.observe(this, this::updateLastUpdateDisplay);
- findViewById(R.id.btn_no_profiles_add)
- .setOnClickListener(v -> startEditProfileActivity(null));
+ 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));
+ 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");
- if (mProfileListAdapter == null) mProfileListAdapter = new ProfilesRecyclerViewAdapter();
+ if (mProfileListAdapter == null)
+ mProfileListAdapter = new ProfilesRecyclerViewAdapter();
root.setAdapter(mProfileListAdapter);
- if (editingProfilesObserver == null) {
- editingProfilesObserver = (o, arg) -> {
- if (mProfileListAdapter.isEditingProfiles()) {
- profileListHeadArrow.clearAnimation();
- profileListHeadArrow.setVisibility(View.GONE);
- profileListHeadMore.setVisibility(View.GONE);
- profileListHeadCancel.setVisibility(View.VISIBLE);
+ mProfileListAdapter.editingProfiles.observe(this, newValue -> {
+ if (newValue) {
+ profileListHeadMore.setVisibility(View.GONE);
+ profileListHeadCancel.setVisibility(View.VISIBLE);
+ profileListHeadAddProfile.setVisibility(View.VISIBLE);
+ if (drawer.isDrawerOpen(GravityCompat.START)) {
+ profileListHeadMore.startAnimation(
+ AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_out));
+ profileListHeadCancel.startAnimation(
+ AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_in));
+ profileListHeadAddProfile.startAnimation(
+ AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_in));
}
- else {
- profileListHeadArrow.setRotation(180f);
- profileListHeadArrow.setVisibility(View.VISIBLE);
- profileListHeadCancel.setVisibility(View.GONE);
- profileListHeadMore.setVisibility(View.GONE);
- profileListHeadMore
- .setVisibility(profileListExpanded ? View.VISIBLE : View.GONE);
+ }
+ else {
+ profileListHeadCancel.setVisibility(View.GONE);
+ profileListHeadMore.setVisibility(View.VISIBLE);
+ profileListHeadAddProfile.setVisibility(View.GONE);
+ if (drawer.isDrawerOpen(GravityCompat.START)) {
+ profileListHeadCancel.startAnimation(
+ AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_out));
+ profileListHeadMore.startAnimation(
+ AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_in));
+ profileListHeadAddProfile.startAnimation(
+ AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_out));
}
- };
- mProfileListAdapter.addEditingProfilesObserver(editingProfilesObserver);
- }
+ }
+
+ mProfileListAdapter.notifyDataSetChanged();
+ });
LinearLayoutManager llm = new LinearLayoutManager(this);
profileListHeadMore.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles());
profileListHeadCancel.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles());
- profileListHeadMoreAndCancel
- .setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles());
-
+ profileListHeadMoreAndCancel.setOnClickListener(
+ (v) -> mProfileListAdapter.flipEditingProfiles());
if (drawerListener == null) {
drawerListener = new DrawerLayout.SimpleDrawerListener() {
@Override
public void onDrawerClosed(View drawerView) {
super.onDrawerClosed(drawerView);
- collapseProfileList();
+ mProfileListAdapter.setAnimationsEnabled(false);
+ mProfileListAdapter.editingProfiles.setValue(false);
+ }
+ @Override
+ public void onDrawerOpened(View drawerView) {
+ super.onDrawerOpened(drawerView);
+ mProfileListAdapter.setAnimationsEnabled(true);
}
};
drawer.addDrawerListener(drawerListener);
}
-
- findViewById(R.id.nav_profile_list_head_layout)
- .setOnClickListener(this::navProfilesHeadClicked);
- findViewById(R.id.nav_profiles_label).setOnClickListener(this::navProfilesHeadClicked);
- setupProfile();
- onProfileChanged(null);
-
- updateLastUpdateTextFromDB();
}
private void scheduleDataRetrievalIfStale(Date lastUpdate) {
long now = new Date().getTime();
if ((lastUpdate == null) || (now > (lastUpdate.getTime() + (24 * 3600 * 1000)))) {
- if (lastUpdate == null) Log.d("db::", "WEB data never fetched. scheduling a fetch");
- else Log.d("db",
- String.format("WEB data last fetched at %1.3f and now is %1.3f. re-fetching",
- lastUpdate.getTime() / 1000f, now / 1000f));
-
- scheduleTransactionListRetrieval();
+ if (lastUpdate == null)
+ debug("db::", "WEB data never fetched. scheduling a fetch");
+ else
+ debug("db", String.format(Locale.ENGLISH,
+ "WEB data last fetched at %1.3f and now is %1.3f. re-fetching",
+ lastUpdate.getTime() / 1000f, now / 1000f));
+
+ Data.scheduleTransactionListRetrieval(this);
}
}
- private void createShortcuts() {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return;
+ private void createShortcuts(List<MobileLedgerProfile> list) {
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1)
+ return;
+ ShortcutManager sm = getSystemService(ShortcutManager.class);
List<ShortcutInfo> shortcuts = new ArrayList<>();
- try (LockHolder lh = Data.profiles.lockForReading()) {
- for (int i = 0; i < Data.profiles.size(); i++) {
- MobileLedgerProfile p = Data.profiles.get(i);
- if (!p.isPostingPermitted()) continue;
-
- ShortcutInfo si = new ShortcutInfo.Builder(this, "new_transaction_" + p.getUuid())
- .setShortLabel(p.getName())
- .setIcon(Icon.createWithResource(this, R.drawable.svg_thick_plus_white))
- .setIntent(new Intent(Intent.ACTION_VIEW, null, this,
- NewTransactionActivity.class).putExtra("profile_uuid", p.getUuid()))
- .setRank(i).build();
- shortcuts.add(si);
- }
+ int i = 0;
+ for (MobileLedgerProfile p : list) {
+ if (shortcuts.size() >= sm.getMaxShortcutCountPerActivity())
+ break;
+
+ if (!p.isPostingPermitted())
+ continue;
+
+ ShortcutInfo si =
+ new ShortcutInfo.Builder(this, "new_transaction_" + p.getUuid()).setShortLabel(
+ p.getName())
+ .setIcon(
+ Icon.createWithResource(
+ this,
+ R.drawable.svg_thick_plus_white))
+ .setIntent(
+ new Intent(
+ Intent.ACTION_VIEW,
+ null,
+ this,
+ NewTransactionActivity.class).putExtra(
+ "profile_uuid",
+ p.getUuid()))
+ .setRank(i)
+ .build();
+ shortcuts.add(si);
+ i++;
}
- ShortcutManager sm = getSystemService(ShortcutManager.class);
sm.setDynamicShortcuts(shortcuts);
}
- private void onProfileListChanged(Object arg) {
- findViewById(R.id.nav_profile_list).setMinimumHeight(
- (int) (getResources().getDimension(R.dimen.thumb_row_height) *
- Data.profiles.size()));
+ private void onProfileListChanged(List<MobileLedgerProfile> newList) {
+ if (newList == null) {
+ // profiles not yet loaded from DB
+ findViewById(R.id.loading_layout).setVisibility(View.VISIBLE);
+ findViewById(R.id.no_profiles_layout).setVisibility(View.GONE);
+ findViewById(R.id.main_app_layout).setVisibility(View.GONE);
+ return;
+ }
- Log.d("profiles", "profile list changed");
- if (arg == null) mProfileListAdapter.notifyDataSetChanged();
- else mProfileListAdapter.notifyItemChanged((int) arg);
+ if (newList.isEmpty()) {
+ findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE);
+ findViewById(R.id.main_app_layout).setVisibility(View.GONE);
+ findViewById(R.id.loading_layout).setVisibility(View.GONE);
+ return;
+ }
- createShortcuts();
- }
- private void onProfileChanged(Object arg) {
- MobileLedgerProfile profile = Data.profile.get();
- MainActivity.this.runOnUiThread(() -> {
+ findViewById(R.id.main_app_layout).setVisibility(View.VISIBLE);
+ findViewById(R.id.no_profiles_layout).setVisibility(View.GONE);
+ findViewById(R.id.loading_layout).setVisibility(View.GONE);
- boolean haveProfile = profile != null;
- findViewById(R.id.no_profiles_layout)
- .setVisibility(haveProfile ? View.GONE : View.VISIBLE);
- findViewById(R.id.pager_layout)
- .setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE);
+ findViewById(R.id.nav_profile_list).setMinimumHeight(
+ (int) (getResources().getDimension(R.dimen.thumb_row_height) * newList.size()));
+
+ debug("profiles", "profile list changed");
+ mProfileListAdapter.notifyDataSetChanged();
+
+ createShortcuts(newList);
+ }
+ /**
+ * called when the current profile has changed
+ */
+ private void onProfileChanged(MobileLedgerProfile profile) {
+ boolean haveProfile = profile != null;
+
+ if (haveProfile)
+ setTitle(profile.getName());
+ else
+ setTitle(R.string.app_name);
+
+ this.profile = profile;
+
+ int newProfileTheme = haveProfile ? profile.getThemeHue() : -1;
+ if (newProfileTheme != Colors.profileThemeId) {
+ debug("profiles",
+ String.format(Locale.ENGLISH, "profile theme %d → %d", Colors.profileThemeId,
+ newProfileTheme));
+ Colors.profileThemeId = newProfileTheme;
+ profileThemeChanged();
+ // profileThemeChanged would restart the activity, so no need to reload the
+ // data sets below
+ return;
+ }
- Data.transactions.clear();
- Log.d("transactions", "requesting list reload");
- TransactionListViewModel.scheduleTransactionListReload();
+ findViewById(R.id.no_profiles_layout).setVisibility(haveProfile ? View.GONE : View.VISIBLE);
+ findViewById(R.id.pager_layout).setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE);
- Data.accounts.clear();
- AccountSummaryViewModel.scheduleAccountListReload();
-
- if (profile == null) MainActivity.this.setTitle(R.string.app_name);
- else MainActivity.this.setTitle(profile.getName());
- MainActivity.this.updateLastUpdateTextFromDB();
- int old_index = -1;
- int new_index = -1;
- if (arg != null) {
- MobileLedgerProfile old = (MobileLedgerProfile) arg;
- old_index = Data.getProfileIndex(old);
- new_index = Data.getProfileIndex(profile);
- }
+ mProfileListAdapter.notifyDataSetChanged();
- if ((old_index != -1) && (new_index != -1)) {
- mProfileListAdapter.notifyItemChanged(old_index);
- mProfileListAdapter.notifyItemChanged(new_index);
- }
- else mProfileListAdapter.notifyDataSetChanged();
-
- MainActivity.this.collapseProfileList();
-
- int newProfileTheme = (profile == null) ? -1 : profile.getThemeId();
- if (newProfileTheme != Colors.profileThemeId) {
- Log.d("profiles", String.format("profile theme %d → %d", Colors.profileThemeId,
- newProfileTheme));
- MainActivity.this.profileThemeChanged();
- Colors.profileThemeId = newProfileTheme;
- // profileThemeChanged would restart the activity, so no need to reload the
- // data sets below
- return;
- }
- drawer.closeDrawers();
+ drawer.closeDrawers();
+
+ Data.transactions.clear();
+ debug("transactions", "requesting list reload");
+ TransactionListViewModel.scheduleTransactionListReload();
+
+ Data.accounts.clear();
+ AccountSummaryViewModel.scheduleAccountListReload();
- if (profile == null) {
+ if (haveProfile) {
+ if (profile.isPostingPermitted()) {
mToolbar.setSubtitle(null);
- fab.hide();
+ fab.show();
}
else {
- if (profile.isPostingPermitted()) {
- mToolbar.setSubtitle(null);
- fab.show();
- }
- else {
- mToolbar.setSubtitle(R.string.profile_subitlte_read_only);
- fab.hide();
- }
+ mToolbar.setSubtitle(R.string.profile_subtitle_read_only);
+ fab.hide();
}
+ }
+ else {
+ mToolbar.setSubtitle(null);
+ fab.hide();
+ }
- updateLastUpdateTextFromDB();
- });
+ updateLastUpdateTextFromDB();
}
private void updateLastUpdateDisplay(Date newValue) {
LinearLayout l = findViewById(R.id.transactions_last_update_layout);
TextView v = findViewById(R.id.transactions_last_update);
if (newValue == null) {
l.setVisibility(View.INVISIBLE);
- Log.d("main", "no last update date :(");
+ debug("main", "no last update date :(");
}
else {
- final String text = DateFormat.getDateTimeInstance().format(newValue);
+ final String text = DateFormat.getDateTimeInstance()
+ .format(newValue);
v.setText(text);
l.setVisibility(View.VISIBLE);
- Log.d("main", String.format("Date formatted: %s", text));
+ debug("main", String.format("Date formatted: %s", text));
}
scheduleDataRetrievalIfStale(newValue);
}
- @Override
- public void finish() {
- if (profilesObserver != null) {
- Data.profiles.deleteObserver(profilesObserver);
- profilesObserver = null;
- }
+ private void profileThemeChanged() {
+ storeThemeIdInPrefs(profile.getThemeHue());
- if (profileObserver != null) {
- Data.profile.deleteObserver(profileObserver);
- profileObserver = null;
- }
+ // un-hook all observed LiveData
+ Data.profile.removeObservers(this);
+ Data.profiles.removeObservers(this);
+ Data.lastUpdateDate.removeObservers(this);
- super.finish();
+ recreate();
}
- private void profileThemeChanged() {
- setupProfileColors();
-
- 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);
+ private void storeThemeIdInPrefs(int themeId) {
+ // store the new theme id in the preferences
+ SharedPreferences prefs = getPreferences(MODE_PRIVATE);
+ SharedPreferences.Editor e = prefs.edit();
+ e.putInt(PREF_THEME_ID, themeId);
+ e.apply();
}
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);
+ 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 = Data.getProfile(profileUUID);
-
- if (Data.profiles.isEmpty()) {
- findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE);
- findViewById(R.id.pager_layout).setVisibility(View.GONE);
- return;
- }
-
- 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");
+ MLDB.getOption(MLDB.OPT_PROFILE_UUID, null, new GetOptCallback() {
+ @Override
+ protected void onResult(String profileUUID) {
+ MobileLedgerProfile startupProfile;
- Data.setCurrentProfile(profile);
+ startupProfile = Data.getProfile(profileUUID);
+ Data.setCurrentProfile(startupProfile);
+ }
+ });
}
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();
+ overridePendingTransition(R.anim.slide_in_up, R.anim.dummy);
}
public void markDrawerItemCurrent(int id) {
TextView item = drawer.findViewById(id);
private void showAccountSummaryFragment() {
mViewPager.setCurrentItem(0, true);
Data.accountFilter.setValue(null);
-// FragmentTransaction ft = fragmentManager.beginTransaction();
-// accountSummaryFragment = new AccountSummaryFragment();
-// ft.replace(R.id.root_frame, accountSummaryFragment);
-// ft.commit();
-// currentFragment = accountSummaryFragment;
}
public void onLatestTransactionsClicked(View view) {
drawer.closeDrawers();
showTransactionsFragment((String) null);
}
- private void resetFragmentBackStack() {
-// fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE);
- }
private void showTransactionsFragment(String accName) {
Data.accountFilter.setValue(accName);
mViewPager.setCurrentItem(1, true);
}
private void showTransactionsFragment(LedgerAccount account) {
- showTransactionsFragment((account == null) ? (String) null : account.getName());
-// FragmentTransaction ft = fragmentManager.beginTransaction();
-// if (transactionListFragment == null) {
-// Log.d("flow", "MainActivity creating TransactionListFragment");
-// transactionListFragment = new TransactionListFragment();
-// }
-// Bundle bundle = new Bundle();
-// if (account != null) {
-// bundle.putString(TransactionListFragment.BUNDLE_KEY_FILTER_ACCOUNT_NAME,
-// account.getName());
-// }
-// transactionListFragment.setArguments(bundle);
-// ft.replace(R.id.root_frame, transactionListFragment);
-// if (account != null)
-// ft.addToBackStack(getResources().getString(R.string.title_activity_transaction_list));
-// ft.commit();
-//
-// currentFragment = transactionListFragment;
+ showTransactionsFragment((account == null) ? null : account.getName());
}
public void showAccountTransactions(LedgerAccount account) {
mBackMeansToAccountList = true;
mBackMeansToAccountList = false;
}
else {
- Log.d("fragments", String.format("manager stack: %d",
- fragmentManager.getBackStackEntryCount()));
+ debug("fragments", String.format(Locale.ENGLISH, "manager stack: %d",
+ getSupportFragmentManager().getBackStackEntryCount()));
super.onBackPressed();
}
}
}
public void updateLastUpdateTextFromDB() {
- final MobileLedgerProfile profile = Data.profile.get();
- long last_update = (profile != null) ? profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L) : 0;
+ if (profile == null)
+ return;
- Log.d("transactions", String.format("Last update = %d", last_update));
+ long last_update = profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L);
+
+ debug("transactions", String.format(Locale.ENGLISH, "Last update = %d", last_update));
if (last_update == 0) {
Data.lastUpdateDate.postValue(null);
}
Data.lastUpdateDate.postValue(new Date(last_update));
}
}
- public void scheduleTransactionListRetrieval() {
- if (Data.profile.get() == null) return;
-
- retrieveTransactionsTask = new RetrieveTransactionsTask(new WeakReference<>(this));
-
- retrieveTransactionsTask.execute();
- }
public void onStopTransactionRefreshClick(View view) {
- Log.d("interactive", "Cancelling transactions refresh");
- if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false);
+ debug("interactive", "Cancelling transactions refresh");
+ Data.stopTransactionsRetrieval();
bTransactionListCancelDownload.setEnabled(false);
}
public void onRetrieveDone(String error) {
- progressLayout.setVisibility(View.GONE);
+ Data.transactionRetrievalDone();
+ findViewById(R.id.transaction_progress_layout).setVisibility(View.GONE);
if (error == null) {
updateLastUpdateTextFromDB();
new RefreshDescriptionsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
TransactionListViewModel.scheduleTransactionListReload();
}
- else Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+ else
+ Snackbar.make(mViewPager, error, Snackbar.LENGTH_LONG)
+ .show();
}
public void onRetrieveStart() {
+ ProgressBar progressBar = findViewById(R.id.transaction_list_progress_bar);
bTransactionListCancelDownload.setEnabled(true);
- progressBar.setIndeterminateTintList(ColorStateList.valueOf(Colors.primary));
- progressBar.setProgressTintList(ColorStateList.valueOf(Colors.primary));
+ ColorStateList csl = Colors.getColorStateList();
+ progressBar.setIndeterminateTintList(csl);
+ progressBar.setProgressTintList(csl);
progressBar.setIndeterminate(true);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) progressBar.setProgress(0, false);
- else progressBar.setProgress(0);
- progressLayout.setVisibility(View.VISIBLE);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+ progressBar.setProgress(0, false);
+ else
+ progressBar.setProgress(0);
+ findViewById(R.id.transaction_progress_layout).setVisibility(View.VISIBLE);
}
public void onRetrieveProgress(RetrieveTransactionsTask.Progress progress) {
+ ProgressBar progressBar = findViewById(R.id.transaction_list_progress_bar);
if ((progress.getTotal() == RetrieveTransactionsTask.Progress.INDETERMINATE) ||
(progress.getTotal() == 0))
{
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
progressBar.setProgress(progress.getProgress(), true);
}
- else progressBar.setProgress(progress.getProgress());
+ else
+ progressBar.setProgress(progress.getProgress());
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();
- }
+ if ((profile != null) && profile.isPostingPermitted() && !drawer.isOpen())
+ fab.show();
+ else
+ fabHide();
}
- 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));
- findViewById(R.id.nav_profile_list).setMinimumHeight(
- (int) (getResources().getDimension(R.dimen.thumb_row_height) *
- Data.profiles.size()));
- }
- 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 fabHide() {
+ fab.hide();
}
public void onAccountSummaryRowViewClicked(View view) {
ViewGroup row;
- if (view.getId() == R.id.account_expander) row = (ViewGroup) view.getParent().getParent();
- else row = (ViewGroup) view.getParent();
+ if (view.getId() == R.id.account_expander)
+ row = (ViewGroup) view.getParent()
+ .getParent();
+ else
+ row = (ViewGroup) view.getParent();
LedgerAccount acc = (LedgerAccount) row.getTag();
switch (view.getId()) {
case R.id.account_row_acc_name:
case R.id.account_expander:
case R.id.account_expander_container:
- Log.d("accounts", "Account expander clicked");
- if (!acc.hasSubAccounts()) return;
+ debug("accounts", "Account expander clicked");
+ if (!acc.hasSubAccounts())
+ return;
boolean wasExpanded = acc.isExpanded();
acc.toggleExpanded();
DbOpQueue.add("update accounts set expanded=? where name=? and profile=?",
- new Object[]{acc.isExpanded(), acc.getName(), Data.profile.get().getUuid()
+ new Object[]{acc.isExpanded(), acc.getName(), profile.getUuid()
});
if (wasExpanded) {
- Log.d("accounts", String.format("Collapsing account '%s'", acc.getName()));
+ debug("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;
- try (LockHolder lh = Data.accounts.lockForWriting()) {
+ try (LockHolder ignored = Data.accounts.lockForWriting()) {
for (int i = 0; i < Data.accounts.size(); i++) {
if (acc.isParentOf(Data.accounts.get(i))) {
-// Log.d("accounts", String.format("Found a child '%s' at position %d",
+// debug("accounts", String.format("Found a child '%s' at position
+// %d",
// Data.accounts.get(i).getName(), i));
if (start == -1) {
start = i;
}
else {
if (start != -1) {
-// Log.d("accounts",
+// debug("accounts",
// String.format("Found a non-child '%s' at position %d",
// Data.accounts.get(i).getName(), i));
break;
if (start != -1) {
for (int j = 0; j < count; j++) {
-// Log.d("accounts", String.format("Removing item %d: %s", start + j,
+// debug("accounts", String.format("Removing item %d: %s", start + j,
// Data.accounts.get(start).getName()));
Data.accounts.removeQuietly(start);
}
- mAccountSummaryFragment.modelAdapter
- .notifyItemRangeRemoved(start, count);
+ mAccountSummaryFragment.modelAdapter.notifyItemRangeRemoved(start,
+ count);
}
}
}
else {
- Log.d("accounts", String.format("Expanding account '%s'", acc.getName()));
+ debug("accounts", String.format("Expanding account '%s'", acc.getName()));
arrow.setRotation(180);
animator.rotationBy(-180);
- List<LedgerAccount> children =
- Data.profile.get().loadVisibleChildAccountsOf(acc);
- try (LockHolder lh = Data.accounts.lockForWriting()) {
+ List<LedgerAccount> children = profile.loadVisibleChildAccountsOf(acc);
+ try (LockHolder ignored = Data.accounts.lockForWriting()) {
int parentPos = Data.accounts.indexOf(acc);
if (parentPos != -1) {
// may have disappeared in a concurrent refresh operation
Data.accounts.addAllQuietly(parentPos + 1, children);
- mAccountSummaryFragment.modelAdapter
- .notifyItemRangeInserted(parentPos + 1, children.size());
+ mAccountSummaryFragment.modelAdapter.notifyItemRangeInserted(
+ parentPos + 1, children.size());
}
}
}
case R.id.account_row_acc_amounts:
if (acc.getAmountCount() > AccountSummaryAdapter.AMOUNT_LIMIT) {
acc.toggleAmountsExpanded();
- DbOpQueue
- .add("update accounts set amounts_expanded=? where name=? and profile=?",
- new Object[]{acc.amountsExpanded(), acc.getName(),
- Data.profile.get().getUuid()
- });
+ DbOpQueue.add(
+ "update accounts set amounts_expanded=? where name=? and profile=?",
+ new Object[]{acc.amountsExpanded(), acc.getName(), profile.getUuid()
+ });
Data.accounts.triggerItemChangedNotification(acc);
}
break;
public class SectionsPagerAdapter extends FragmentPagerAdapter {
- public SectionsPagerAdapter(FragmentManager fm) {
- super(fm);
+ SectionsPagerAdapter(FragmentManager fm) {
+ super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
@NotNull
@Override
public Fragment getItem(int position) {
- Log.d("main", String.format("Switching to fragment %d", position));
+ debug("main", String.format(Locale.ENGLISH, "Switching to fragment %d", position));
switch (position) {
case 0:
-// Log.d("flow", "Creating account summary fragment");
+// debug("flow", "Creating account summary fragment");
return mAccountSummaryFragment = new AccountSummaryFragment();
case 1:
return new TransactionListFragment();
projects / mobile-ledger.git / blobdiff