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=931f783582bd6b95ba1ab62965ab0640033b5dff;hp=c2ff5c27b1b3d3bbfe55da54bcc422e3f4c6a8ec;hb=94aa0aa57db3dce40f31fc0321c718998d9cb48b;hpb=1131c69ea15435760a7c126ae6cac961cd543665 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 c2ff5c27..931f7835 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 @@ -18,14 +18,16 @@ package net.ktnx.mobileledger.ui.activity; import android.content.Intent; +import android.content.SharedPreferences; import android.content.pm.PackageInfo; import android.os.Build; import android.os.Bundle; -import android.preference.PreferenceManager; import android.support.annotation.ColorInt; +import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; +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; @@ -42,6 +44,7 @@ import net.ktnx.mobileledger.R; 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.transaction_list.TransactionListFragment; @@ -65,7 +68,27 @@ public class MainActivity extends AppCompatActivity { private View bTransactionListCancelDownload; private ProgressBar progressBar; private LinearLayout progressLayout; + private SectionsPagerAdapter mSectionsPagerAdapter; + private ViewPager mViewPager; + @Override + protected void onStart() { + super.onStart(); + + Data.lastUpdateDate.set(null); + updateLastUpdateTextFromDB(); + Date lastUpdate = Data.lastUpdateDate.get(); + + 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(); + } + } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -73,6 +96,19 @@ public class MainActivity extends AppCompatActivity { 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()); + }); + } + }); + + setupProfile(); + drawer = findViewById(R.id.drawer_layout); ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, @@ -102,45 +138,96 @@ public class MainActivity extends AppCompatActivity { "Can't get hold on the transaction value progress bar layout"); fragmentManager = getSupportFragmentManager(); + mSectionsPagerAdapter = new SectionsPagerAdapter(fragmentManager); - onAccountSummaryClicked(null); + mViewPager = findViewById(R.id.root_frame); + mViewPager.setAdapter(mSectionsPagerAdapter); + mViewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() { + @Override + public void onPageSelected(int position) { + switch (position) { + case 0: + markDrawerItemCurrent(R.id.nav_account_summary); + break; + case 1: + markDrawerItemCurrent(R.id.nav_latest_transactions); + break; + default: + Log.e("MainActivity", String.format("Unexpected page index %d", position)); + } + + super.onPageSelected(position); + } + }); Data.lastUpdateDate.addObserver(new Observer() { @Override public void update(Observable o, Object arg) { Log.d("main", "lastUpdateDate changed"); - runOnUiThread(new Runnable() { - @Override - public void run() { - Date date = Data.lastUpdateDate.get(); - if (date == null) { - tvLastUpdate.setText(R.string.transaction_last_update_never); + 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 { - 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()); - } + tvLastUpdate.setText(date.toLocaleString()); } } }); } }); + } + private void setupProfile() { + Data.profiles.setList(MobileLedgerProfile.loadAllFromDB()); + MobileLedgerProfile profile = null; + + String profileUUID = MLDB.get_option_value(MLDB.OPT_PROFILE_UUID, null); + if (profileUUID == null) { + if (Data.profiles.isEmpty()) { + Data.profiles.setList(MobileLedgerProfile.createInitialProfileList()); + profile = Data.profiles.get(0); + + SharedPreferences backend = getSharedPreferences("backend", MODE_PRIVATE); + Log.d("profiles", "Migrating from preferences to profiles"); + // migration to multiple profiles + if (profile.getUrl().isEmpty()) { + // no legacy config + Intent intent = new Intent(this, ProfileListActivity.class); + startActivity(intent); + } + profile.setUrl(backend.getString("backend_url", "")); + profile.setAuthEnabled(backend.getBoolean("backend_use_http_auth", false)); + profile.setAuthUserName(backend.getString("backend_auth_user", null)); + profile.setAuthPassword(backend.getString("backend_auth_password", null)); + profile.storeInDB(); + SharedPreferences.Editor editor = backend.edit(); + editor.clear(); + editor.apply(); + } + } + else { + profile = MobileLedgerProfile.loadUUIDFromDB(profileUUID); + } - updateLastUpdateTextFromDB(); - Date lastUpdate = Data.lastUpdateDate.get(); + if (profile == null) profile = Data.profiles.get(0); - 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)); + if (profile == null) throw new AssertionError("profile must have a value"); - scheduleTransactionListRetrieval(); + Data.profile.set(profile); + MLDB.set_option_value(MLDB.OPT_PROFILE_UUID, profile.getUuid()); + + if (profile.getUrl().isEmpty()) { + Intent intent = new Intent(this, ProfileListActivity.class); + Bundle args = new Bundle(); + args.putInt(ProfileListActivity.ARG_ACTION, ProfileListActivity.ACTION_EDIT_PROFILE); + args.putInt(ProfileListActivity.ARG_PROFILE_INDEX, 0); + intent.putExtras(args); + startActivity(intent, args); } } public void fab_new_transaction_clicked(View view) { @@ -215,45 +302,43 @@ public class MainActivity extends AppCompatActivity { public void onAccountSummaryClicked(View view) { drawer.closeDrawers(); - resetFragmentBackStack(); - showAccountSummaryFragment(); } private void showAccountSummaryFragment() { - FragmentTransaction ft = fragmentManager.beginTransaction(); - accountSummaryFragment = new AccountSummaryFragment(); - ft.replace(R.id.root_frame, accountSummaryFragment); - ft.commit(); - currentFragment = accountSummaryFragment; + mViewPager.setCurrentItem(0, true); +// 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(); - resetFragmentBackStack(); - showTransactionsFragment(null); } private void resetFragmentBackStack() { // fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE); } private void showTransactionsFragment(LedgerAccount account) { - 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; + mViewPager.setCurrentItem(1, true); +// 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; } public void showAccountTransactions(LedgerAccount account) { showTransactionsFragment(account); @@ -273,7 +358,7 @@ public class MainActivity extends AppCompatActivity { } public void updateLastUpdateTextFromDB() { { - long last_update = MLDB.get_option_value(MLDB.OPT_TRANSACTION_LIST_STAMP, 0L); + long last_update = Data.profile.get().get_option_value(MLDB.OPT_LAST_SCRAPE, 0L); Log.d("transactions", String.format("Last update = %d", last_update)); if (last_update == 0) { @@ -287,10 +372,7 @@ public class MainActivity extends AppCompatActivity { public void scheduleTransactionListRetrieval() { retrieveTransactionsTask = new RetrieveTransactionsTask(new WeakReference<>(this)); - RetrieveTransactionsTask.Params params = new RetrieveTransactionsTask.Params( - PreferenceManager.getDefaultSharedPreferences(this)); - - retrieveTransactionsTask.execute(params); + retrieveTransactionsTask.execute(); bTransactionListCancelDownload.setEnabled(true); } public void onStopTransactionRefreshClick(View view) { @@ -326,5 +408,35 @@ public class MainActivity extends AppCompatActivity { progressBar.setIndeterminate(false); } } + public void nav_profiles_clicked(View view) { + drawer.closeDrawers(); + Intent intent = new Intent(this, ProfileListActivity.class); + startActivity(intent); + } + public class SectionsPagerAdapter extends FragmentPagerAdapter { + + public SectionsPagerAdapter(FragmentManager fm) { + super(fm); + } + + @Override + public Fragment getItem(int position) { + Log.d("main", String.format("Switching to gragment %d", position)); + switch (position) { + case 0: + return new AccountSummaryFragment(); + case 1: + return new TransactionListFragment(); + default: + throw new IllegalStateException( + String.format("Unexpected fragment index: " + "%d", position)); + } + } + + @Override + public int getCount() { + return 2; + } + } }