X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=e079399eb641e80f9a8bd149f662974d9fa6a5f2;hb=11c8dff16901782f69287854cb4788ddf8d932c2;hp=a59ec036bf579dfc90ff3d248e481e03ebc475c4;hpb=86d517b05c6f7e20dca42c332ab6f395e425f732;p=mobile-ledger.git 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 a59ec036..e079399e 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 @@ -172,7 +172,7 @@ public class MainActivity extends AppCompatActivity { Data.profiles.setList(MobileLedgerProfile.loadAllFromDB()); MobileLedgerProfile profile = null; - String profileUUID = MLDB.get_option_value(MLDB.OPT_PROFILE_UUID, null); + String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null); if (profileUUID == null) { if (Data.profiles.isEmpty()) { Data.profiles.setList(MobileLedgerProfile.createInitialProfileList()); @@ -215,18 +215,18 @@ public class MainActivity extends AppCompatActivity { startActivity(intent, args); } } - public void fab_new_transaction_clicked(View view) { + 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 nav_exit_clicked(View view) { + public void navExitClicked(View view) { Log.w("app", "exiting"); finish(); } - public void nav_settings_clicked(View view) { + public void navSettingsClicked(View view) { Intent intent = new Intent(this, SettingsActivity.class); startActivity(intent); drawer.closeDrawers(); @@ -234,10 +234,10 @@ public class MainActivity extends AppCompatActivity { 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())); + item.setBackgroundColor(getResources().getColor(R.color.table_row_dark_bg, getTheme())); } else { - item.setBackgroundColor(getResources().getColor(R.color.table_row_even_bg)); + item.setBackgroundColor(getResources().getColor(R.color.table_row_dark_bg)); } @ColorInt int transparent = getResources().getColor(android.R.color.transparent); @@ -311,7 +311,7 @@ public class MainActivity extends AppCompatActivity { } public void updateLastUpdateTextFromDB() { { - long last_update = Data.profile.get().get_option_value(MLDB.OPT_LAST_SCRAPE, 0L); + long last_update = Data.profile.get().getLongOption(MLDB.OPT_LAST_SCRAPE, 0L); Log.d("transactions", String.format("Last update = %d", last_update)); if (last_update == 0) { @@ -363,7 +363,7 @@ public class MainActivity extends AppCompatActivity { progressBar.setIndeterminate(false); } } - public void nav_profiles_clicked(View view) { + public void navProfilesClicked(View view) { drawer.closeDrawers(); Intent intent = new Intent(this, ProfileListActivity.class); startActivity(intent);