Skip to content

Commit 511f889

Browse files
JeanGarfJeanGarf
committed
codinguser#876 - Code formatting
1 parent 1f41df3 commit 511f889

File tree

2 files changed

+55
-26
lines changed

2 files changed

+55
-26
lines changed

‎app/src/main/java/org/gnucash/android/db/adapter/DatabaseAdapter.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -531,12 +531,15 @@ public int deleteAllRecords(){
531531
* @throws IllegalArgumentException if the GUID does not exist in the database
532532
*/
533533
public long getID(@NonNull String uid){
534+
534535
Cursor cursor = mDb.query(mTableName,
535-
new String[] {DatabaseSchema.CommonColumns._ID},
536-
DatabaseSchema.CommonColumns.COLUMN_UID + " = ?",
537-
new String[]{uid},
538-
null, null, null);
536+
new String[]{DatabaseSchema.CommonColumns._ID},
537+
DatabaseSchema.CommonColumns.COLUMN_UID + " = ?",
538+
new String[]{uid},
539+
null, null, null);
540+
539541
long result = -1;
542+
540543
try{
541544
if (cursor.moveToFirst()) {
542545
result = cursor.getLong(cursor.getColumnIndexOrThrow(DatabaseSchema.CommonColumns._ID));

‎app/src/main/java/org/gnucash/android/ui/account/AccountsListFragment.java

Lines changed: 48 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import android.support.v4.view.MenuItemCompat;
3333
import android.support.v7.app.ActionBar;
3434
import android.support.v7.app.AppCompatActivity;
35-
import android.support.v7.preference.PreferenceManager;
3635
import android.support.v7.widget.GridLayoutManager;
3736
import android.support.v7.widget.LinearLayoutManager;
3837
import android.support.v7.widget.PopupMenu;
@@ -484,27 +483,39 @@ public AccountViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
484483

485484
@Override
486485
public void onBindViewHolderCursor(final AccountViewHolder holder, final Cursor cursor) {
486+
487487
final String accountUID = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseSchema.AccountEntry.COLUMN_UID));
488+
488489
mAccountsDbAdapter = AccountsDbAdapter.getInstance();
489-
holder.accoundId = mAccountsDbAdapter.getID(accountUID);
490490

491+
holder.accoundId = mAccountsDbAdapter.getID(accountUID);
491492
holder.accountName.setText(cursor.getString(cursor.getColumnIndexOrThrow(DatabaseSchema.AccountEntry.COLUMN_NAME)));
493+
492494
int subAccountCount = mAccountsDbAdapter.getSubAccountCount(accountUID);
495+
493496
if (subAccountCount > 0) {
494497
holder.description.setVisibility(View.VISIBLE);
495-
String text = getResources().getQuantityString(R.plurals.label_sub_accounts, subAccountCount, subAccountCount);
498+
String text = getResources().getQuantityString(R.plurals.label_sub_accounts,
499+
subAccountCount,
500+
subAccountCount);
496501
holder.description.setText(text);
497-
} else
502+
503+
} else {
498504
holder.description.setVisibility(View.GONE);
505+
}
499506

500507
// add a summary of transactions to the account view
501508

502-
// Make sure the balance task is truly multithread
509+
// Make sure the balance task is truly multithread
503510
new AccountBalanceTask(holder.accountBalance).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
504-
accountUID);
511+
accountUID);
505512

506513
String accountColor = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseSchema.AccountEntry.COLUMN_COLOR_CODE));
507-
int colorCode = accountColor == null ? Color.TRANSPARENT : Color.parseColor(accountColor);
514+
515+
int colorCode = accountColor == null
516+
? Color.TRANSPARENT
517+
: Color.parseColor(accountColor);
518+
508519
holder.colorStripView.setBackgroundColor(colorCode);
509520

510521
boolean isPlaceholderAccount = mAccountsDbAdapter.isPlaceholderAccount(accountUID);
@@ -515,21 +526,30 @@ public void onBindViewHolderCursor(final AccountViewHolder holder, final Cursor
515526

516527
@Override
517528
public void onClick(View v) {
518-
Intent intent = new Intent(getActivity(), FormActivity.class);
529+
530+
Intent intent = new Intent(getActivity(),
531+
FormActivity.class);
519532
intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
520-
intent.putExtra(UxArgument.SELECTED_ACCOUNT_UID, accountUID);
521-
intent.putExtra(UxArgument.FORM_TYPE, FormActivity.FormType.TRANSACTION.name());
533+
intent.putExtra(UxArgument.SELECTED_ACCOUNT_UID,
534+
accountUID);
535+
intent.putExtra(UxArgument.FORM_TYPE,
536+
FormActivity.FormType.TRANSACTION.name());
522537
getActivity().startActivity(intent);
523538
}
524539
});
525540
}
526541

527-
List<Budget> budgets = BudgetsDbAdapter.getInstance().getAccountBudgets(accountUID);
542+
List<Budget> budgets = BudgetsDbAdapter.getInstance()
543+
.getAccountBudgets(accountUID);
528544
//TODO: include fetch only active budgets
529-
if (budgets.size() == 1){
530-
Budget budget = budgets.get(0);
531-
Money balance = mAccountsDbAdapter.getAccountBalance(accountUID, budget.getStartofCurrentPeriod(), budget.getEndOfCurrentPeriod());
532-
double budgetProgress = balance.divide(budget.getAmount(accountUID)).asBigDecimal().doubleValue() * 100;
545+
if (budgets.size() == 1) {
546+
Budget budget = budgets.get(0);
547+
Money balance = mAccountsDbAdapter.getAccountBalance(accountUID,
548+
budget.getStartofCurrentPeriod(),
549+
budget.getEndOfCurrentPeriod());
550+
double budgetProgress = balance.divide(budget.getAmount(accountUID))
551+
.asBigDecimal()
552+
.doubleValue() * 100;
533553

534554
holder.budgetIndicator.setVisibility(View.VISIBLE);
535555
holder.budgetIndicator.setProgress((int) budgetProgress);
@@ -538,7 +558,7 @@ public void onClick(View v) {
538558
}
539559

540560

541-
if (mAccountsDbAdapter.isFavoriteAccount(accountUID)){
561+
if (mAccountsDbAdapter.isFavoriteAccount(accountUID)) {
542562
holder.favoriteStatus.setImageResource(R.drawable.ic_star_black_24dp);
543563
} else {
544564
holder.favoriteStatus.setImageResource(R.drawable.ic_star_border_black_24dp);
@@ -547,23 +567,29 @@ public void onClick(View v) {
547567
holder.favoriteStatus.setOnClickListener(new View.OnClickListener() {
548568
@Override
549569
public void onClick(View v) {
570+
550571
boolean isFavoriteAccount = mAccountsDbAdapter.isFavoriteAccount(accountUID);
551572

552573
ContentValues contentValues = new ContentValues();
553-
contentValues.put(DatabaseSchema.AccountEntry.COLUMN_FAVORITE, !isFavoriteAccount);
554-
mAccountsDbAdapter.updateRecord(accountUID, contentValues);
555-
556-
int drawableResource = !isFavoriteAccount ?
557-
R.drawable.ic_star_black_24dp : R.drawable.ic_star_border_black_24dp;
574+
contentValues.put(DatabaseSchema.AccountEntry.COLUMN_FAVORITE,
575+
!isFavoriteAccount);
576+
mAccountsDbAdapter.updateRecord(accountUID,
577+
contentValues);
578+
579+
int drawableResource = !isFavoriteAccount
580+
? R.drawable.ic_star_black_24dp
581+
: R.drawable.ic_star_border_black_24dp;
558582
holder.favoriteStatus.setImageResource(drawableResource);
559-
if (mDisplayMode == DisplayMode.FAVORITES)
583+
if (mDisplayMode == DisplayMode.FAVORITES) {
560584
refresh();
585+
}
561586
}
562587
});
563588

564589
holder.itemView.setOnClickListener(new View.OnClickListener() {
565590
@Override
566591
public void onClick(View v) {
592+
567593
onListItemClick(accountUID);
568594
}
569595
});

0 commit comments

Comments
 (0)