X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2FAccountSummary.java;h=d653ced44ed798f4984bafbd59b0668d76226477;hp=25ba031733ddfad25c1374504a76c7cdc4c5671d;hb=186501062053c09d275f3127f7d3aa53bfd661cd;hpb=840a4c9631b560d200eac182d22f2e253cdd6147 diff --git a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java index 25ba0317..d653ced4 100644 --- a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java +++ b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java @@ -25,8 +25,6 @@ import android.view.ViewGroup; import android.widget.EditText; import android.widget.LinearLayout; import android.widget.ProgressBar; -import android.widget.TableLayout; -import android.widget.TableRow; import android.widget.TextView; import android.widget.Toast; @@ -43,7 +41,7 @@ public class AccountSummary extends AppCompatActivity { private static long account_list_last_updated; private static boolean account_list_needs_update = true; - private TableRow clickedAccountRow; + private LinearLayout clickedAccountRow; public static void preferences_changed() { account_list_needs_update = true; @@ -77,9 +75,34 @@ public class AccountSummary extends AppCompatActivity { update_accounts(false); } + @Override + protected void onStart() { + super.onStart(); + LinearLayout grp = drawer.findViewById(R.id.nav_actions); + for (int i = 0; i < grp.getChildCount(); i++) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + grp.getChildAt(i).setBackgroundColor( + getResources().getColor(R.color.drawer_background, getTheme())); + } + else { + grp.getChildAt(i) + .setBackgroundColor(getResources().getColor(R.color.drawer_background)); + } + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + drawer.findViewById(R.id.nav_account_summary).setBackgroundColor( + getResources().getColor(R.color.table_row_even_bg, getTheme())); + } + else { + drawer.findViewById(R.id.nav_account_summary) + .setBackgroundColor(getResources().getColor(R.color.table_row_even_bg)); + } + } + 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); } public void nav_exit_clicked(View view) { @@ -107,7 +130,7 @@ public class AccountSummary extends AppCompatActivity { // Inflate the menu; this adds items to the action bar if it is present. getMenuInflater().inflate(R.menu.account_summary, menu); mRefresh = menu.findItem(R.id.menu_acc_summary_refresh); - assert mRefresh != null; + if (mRefresh == null) throw new AssertionError(); return true; } @@ -116,7 +139,7 @@ public class AccountSummary extends AppCompatActivity { // Handle action bar item clicks here. The action bar will // automatically handle clicks on the Home/Up button, so long // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); +// int id = item.getItemId(); //noinspection SimplifiableIfStatement //if (id == R.id.action_settings) { @@ -135,11 +158,10 @@ public class AccountSummary extends AppCompatActivity { MobileLedgerDB.setDb_filename(this.getApplicationInfo().deviceProtectedDataDir + "/" + MobileLedgerDB.DATABASE_NAME); } else { - MobileLedgerDB.setDb_filename(MobileLedgerDB.DATABASE_NAME); + MobileLedgerDB.setDb_filename( + this.getApplicationInfo().dataDir + "/" + MobileLedgerDB.DATABASE_NAME); } - MobileLedgerDB.initDB(); - - MobileLedgerDB.applyRevisions(getResources(), getPackageName()); + MobileLedgerDB.initDB(getResources(), getPackageName()); account_list_last_updated = MobileLedgerDB.get_option_value("last_refresh", (long) 0); @@ -154,7 +176,7 @@ public class AccountSummary extends AppCompatActivity { } private void update_accounts() { - mRefresh.setVisible(false); + if (mRefresh != null) mRefresh.setVisible(false); Resources rm = getResources(); ProgressBar pb = findViewById(R.id.progressBar); @@ -176,7 +198,7 @@ public class AccountSummary extends AppCompatActivity { protected void onPostExecute(Void result) { pb.setVisibility(GONE); pt.setVisibility(GONE); - mRefresh.setVisible(true); + if (mRefresh != null) mRefresh.setVisible(true); if (this.error != 0) { String err_text = rm.getString(this.error); Log.d("visual", String.format("showing snackbar: %s", err_text)); @@ -227,30 +249,45 @@ public class AccountSummary extends AppCompatActivity { View.OnCreateContextMenuListener ccml = new View.OnCreateContextMenuListener() { @Override public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) { - clickedAccountRow = (TableRow) v; + clickedAccountRow = (LinearLayout) v; getMenuInflater().inflate(R.menu.account_summary_account_menu, menu); } }; + int actionBarHeight = + getTheme().obtainStyledAttributes(new int[]{android.R.attr.actionBarSize}) + .getDimensionPixelSize(0, dp2px(56)); + try (Cursor cursor = db.rawQuery("SELECT name FROM accounts ORDER BY name;", null)) { boolean even = false; while (cursor.moveToNext()) { String acc_name = cursor.getString(0); - TableLayout t = new TableLayout(this); - TableRow r = new TableRow(this); - r.setLayoutParams(new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); + LinearLayout r = new LinearLayout(this); + r.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); r.setGravity(Gravity.CENTER_VERTICAL); r.setPadding(getResources().getDimensionPixelSize(R.dimen.activity_horizontal_margin), dp2px(3), getResources().getDimensionPixelSize(R.dimen.activity_horizontal_margin), dp2px(4)); - if (even) - r.setBackgroundColor(getResources().getColor(R.color.table_row_even_bg, getTheme())); + r.setMinimumHeight(actionBarHeight); + + if (even) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + r.setBackgroundColor( + getResources().getColor(R.color.table_row_even_bg, getTheme())); + } + else { + r.setBackgroundColor(getResources().getColor(R.color.table_row_even_bg)); + } + } even = !even; - r.setContextClickable(true); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + r.setContextClickable(true); + } r.setOnCreateContextMenuListener(ccml); TextView acc_tv = new TextView(this, null, R.style.account_summary_account_name); - acc_tv.setLayoutParams(new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 9f)); + acc_tv.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT, 5f)); + acc_tv.setGravity(Gravity.CENTER_VERTICAL); int[] indent_level = new int[]{0}; String short_acc_name = strip_higher_accounts(acc_name, indent_level); acc_tv.setPadding(indent_level[0] * getResources().getDimensionPixelSize(R.dimen.activity_horizontal_margin) / 2, 0, 0, 0); @@ -258,10 +295,11 @@ public class AccountSummary extends AppCompatActivity { r.addView(acc_tv); TextView amt_tv = new TextView(this, null, R.style.account_summary_amounts); - amt_tv.setLayoutParams(new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 1f)); + amt_tv.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT, 1f)); amt_tv.setTextAlignment(EditText.TEXT_ALIGNMENT_VIEW_END); - amt_tv.setGravity(Gravity.CENTER); - amt_tv.setMinWidth(dp2px(40f)); + amt_tv.setGravity(Gravity.CENTER_VERTICAL); +// amt_tv.setGravity(Gravity.CENTER); + amt_tv.setMinWidth(dp2px(60f)); StringBuilder amt_text = new StringBuilder(); try (Cursor cAmounts = db.rawQuery("SELECT currency, value FROM account_values WHERE account = ?", new String[]{acc_name})) { while (cAmounts.moveToNext()) { @@ -275,9 +313,7 @@ public class AccountSummary extends AppCompatActivity { r.addView(amt_tv); - t.addView(r); - - root.addView(t); + root.addView(r); } } }