diff options
| author | stom79 <tschneider.ac@gmail.com> | 2019-01-05 11:22:14 +0100 |
|---|---|---|
| committer | stom79 <tschneider.ac@gmail.com> | 2019-01-05 11:22:14 +0100 |
| commit | 7c298dcec0251af45df6fd028390816f5167d857 (patch) | |
| tree | 7891a4db07589d9d1681ccb42a806feea5ca39e8 /app/src/main/java/fr/gouv/etalab/mastodon | |
| parent | 33ed6296ff74f218f02d959fcd1f94bfd1c72838 (diff) | |
Add different border for Mastodon and Peertube in accounts picker #698
Diffstat (limited to 'app/src/main/java/fr/gouv/etalab/mastodon')
| -rw-r--r-- | app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index 636f0dfbf..aae6cbf70 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -1516,7 +1516,7 @@ public class Helper { if( accounts != null && accounts.size() > 1) { - FloatingActionButton.LayoutParams layoutparmansAcc = new FloatingActionButton.LayoutParams((int) Helper.convertDpToPixel(35, activity), (int) Helper.convertDpToPixel(35, activity)); + FloatingActionButton.LayoutParams layoutparmansAcc = new FloatingActionButton.LayoutParams((int) Helper.convertDpToPixel(37, activity), (int) Helper.convertDpToPixel(37, activity)); FloatingActionButton.LayoutParams layoutparmanImgAcc = new FloatingActionButton.LayoutParams((int) Helper.convertDpToPixel(35, activity), (int) Helper.convertDpToPixel(35, activity)); MenuFloating actionButtonAcc = null; SharedPreferences mSharedPreferences = activity.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); @@ -1601,15 +1601,11 @@ public class Helper { }); if( accounts.size() > 2 ) { - SubActionButton.Builder subActionButtonAccBuilder = itemBuilderAcc; - if (theme == THEME_LIGHT) { - subActionButtonAccBuilder.setBackgroundDrawable(activity.getResources().getDrawable(R.drawable.circular)); - } else if (theme == THEME_DARK) { - subActionButtonAccBuilder.setBackgroundDrawable(activity.getResources().getDrawable(R.drawable.circular_dark)); - } else if (theme == THEME_BLACK) { - subActionButtonAccBuilder.setBackgroundDrawable(activity.getResources().getDrawable(R.drawable.circular_black)); - } - SubActionButton subActionButtonAcc = subActionButtonAccBuilder.setContentView(itemIconAcc, layoutparmanImgAcc) + if(accountChoice.getSocial() != null && accountChoice.getSocial().equals("PEERTUBE")) + itemBuilderAcc.setBackgroundDrawable(activity.getResources().getDrawable(R.drawable.circular_peertube)); + else + itemBuilderAcc.setBackgroundDrawable(activity.getResources().getDrawable(R.drawable.circular_mastodon)); + SubActionButton subActionButtonAcc = itemBuilderAcc.setContentView(itemIconAcc, layoutparmanImgAcc) .setLayoutParams(layoutparmansAcc) .build(); @@ -1621,7 +1617,10 @@ public class Helper { editor.putString(Helper.PREF_KEY_ID, accountChoice.getId()); editor.putString(Helper.PREF_INSTANCE, accountChoice.getInstance().trim()); editor.commit(); - Toasty.info(activity, activity.getString(R.string.toast_account_changed, "@" + accountChoice.getAcct() + "@" + accountChoice.getInstance()), Toast.LENGTH_LONG).show(); + if(accountChoice.getSocial() != null && accountChoice.getSocial().equals("PEERTUBE")) + Toasty.info(activity, activity.getString(R.string.toast_account_changed, "@" + accountChoice.getAcct()), Toast.LENGTH_LONG).show(); + else + Toasty.info(activity, activity.getString(R.string.toast_account_changed, "@" + accountChoice.getAcct() + "@" + accountChoice.getInstance()), Toast.LENGTH_LONG).show(); Intent changeAccount = new Intent(activity, MainActivity.class); changeAccount.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); activity.finish(); |