Compare commits

...

3 Commits

Author SHA1 Message Date
caa64fda6f Fix crash when looking for details on an iconless asset 2018-11-21 14:28:54 +01:00
6a1c2f032b Revert Graddle version 2018-11-19 21:39:47 +01:00
ac7db53812
Merge pull request #9 from TanguyHerbron/master
Update Master's hot fixes
2018-11-19 16:59:36 +01:00
4 changed files with 19 additions and 15 deletions

Binary file not shown.

View File

@ -135,22 +135,25 @@ public class CurrencyDetailsActivity extends AppCompatActivity {
Objects.requireNonNull(getSupportActionBar()).setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME |
ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_USE_LOGO);
Bitmap result = Bitmap.createBitmap(150, 150, currency.getIcon().getConfig());
if(currency.getIcon() != null)
{
Bitmap result = Bitmap.createBitmap(150, 150, currency.getIcon().getConfig());
Paint paint = new Paint();
paint.setStyle(Paint.Style.FILL);
paint.setColor(ContextCompat.getColor(this, R.color.white));
Paint paint = new Paint();
paint.setStyle(Paint.Style.FILL);
paint.setColor(ContextCompat.getColor(this, R.color.white));
Canvas canvas = new Canvas(result);
canvas.drawCircle(result.getHeight()/2, result.getWidth()/2, 75, paint);
canvas.drawBitmap(Bitmap.createScaledBitmap(currency.getIcon(), 100, 100, false), result.getHeight()/2 - 50, result.getWidth()/2 - 50, null);
Canvas canvas = new Canvas(result);
canvas.drawCircle(result.getHeight()/2, result.getWidth()/2, 75, paint);
canvas.drawBitmap(Bitmap.createScaledBitmap(currency.getIcon(), 100, 100, false), result.getHeight()/2 - 50, result.getWidth()/2 - 50, null);
getSupportActionBar()
.setIcon(new BitmapDrawable(getResources(),
Bitmap.createScaledBitmap(result
, (int) MoodlBox.convertDpToPx(25, getResources())
, (int) MoodlBox.convertDpToPx(25, getResources())
, false)));
getSupportActionBar()
.setIcon(new BitmapDrawable(getResources(),
Bitmap.createScaledBitmap(result
, (int) MoodlBox.convertDpToPx(25, getResources())
, (int) MoodlBox.convertDpToPx(25, getResources())
, false)));
}
}
}
/*for(int i = 0; i < dataChartList.size(); i++)

View File

@ -82,7 +82,8 @@ public class DataCrypter {
} catch(NoSuchPaddingException | NoSuchAlgorithmException
| InvalidKeyException | UnsupportedEncodingException
| InvalidAlgorithmParameterException e) {
| InvalidAlgorithmParameterException | BadPaddingException
| IllegalBlockSizeException e) {
e.printStackTrace();
}

View File

@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.android.tools.build:gradle:3.1.4'
// NOTE: Do not place your application dependencies here; they belong