| Chunk |
|---|
| Conflicting content |
|---|
ImageView money;
Animation moneyFall;
<<<<<<< HEAD
Toast.makeText(this, name + " pa la hucha! Total: " + MovementsManager.getTotalAmount(this), Toast.LENGTH_SHORT).show();
ImageView spaceshipImage = (ImageView) findViewById(R.id.img1cent);
Animation hyperspaceJumpAnimation = AnimationUtils.loadAnimation(this, R.anim.money_fall);
spaceshipImage.startAnimation(hyperspaceJumpAnimation);
=======
// srcBmp = ((BitmapDrawable) ((ImageView) v).getDrawable()).getBitmap();
// dstBmp = srcBmp.copy(srcBmp.getConfig(), true);
money = (ImageView) findViewById(R.id.imgMoneyFall);
// dst.setImageBitmap(dstBmp);
money.setImageDrawable(src.getDrawable());
moneyFall = AnimationUtils.loadAnimation(this, R.anim.money_fall);
money.setVisibility(View.VISIBLE);
money.startAnimation(moneyFall);
money.setVisibility(View.INVISIBLE);
}
/**
* Update all the totals
*/
private void updateTotals () {
// Global
TextView total;
total = (TextView) findViewById(R.id.txtTotal);
total.setText(String.format("%.2f", MovementsManager.getTotalAmount(this)));
>>>>>>> 3a193b08c67ad055657d4dadd554b3e831dcb1c8
}
}
|
| Solution content |
|---|
ImageView money;
Animation moneyFall;
// srcBmp = ((BitmapDrawable) ((ImageView) v).getDrawable()).getBitmap();
// dstBmp = srcBmp.copy(srcBmp.getConfig(), true);
money = (ImageView) findViewById(R.id.imgMoneyFall);
// dst.setImageBitmap(dstBmp);
money.setImageDrawable(src.getDrawable());
moneyFall = AnimationUtils.loadAnimation(this, R.anim.money_fall);
money.setVisibility(View.VISIBLE);
money.startAnimation(moneyFall);
money.setVisibility(View.INVISIBLE);
}
/**
* Update all the totals
*/
private void updateTotals () {
// Global
TextView total;
total = (TextView) findViewById(R.id.txtTotal);
total.setText(String.format("%.2f", MovementsManager.getTotalAmount(this)));
}
}
|
| File |
|---|
| MoneyboxActivity.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Cast expression |
| Comment |
| Method invocation |
| Method signature |
| Variable |