diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
index fe68cdecd..476880e4a 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
@@ -195,28 +195,28 @@ public abstract class BaseMainActivity extends AppCompatActivity
@SuppressWarnings("ConstantConditions") @SuppressLint("CutPasteId")
ImageView iconHome = tabHome.getCustomView().findViewById(R.id.tab_icon);
iconHome.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_text), PorterDuff.Mode.SRC_IN);
- iconHome.setImageResource(R.drawable.ic_action_home_tl);
+ iconHome.setImageResource(R.drawable.ic_home);
@SuppressWarnings("ConstantConditions") @SuppressLint("CutPasteId")
ImageView iconNotif = tabNotif.getCustomView().findViewById(R.id.tab_icon);
iconNotif.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_text), PorterDuff.Mode.SRC_IN);
- iconNotif.setImageResource(R.drawable.ic_notifications_tl);
+ iconNotif.setImageResource(R.drawable.ic_notifications);
@SuppressWarnings("ConstantConditions") @SuppressLint("CutPasteId")
ImageView iconLocal = tabLocal.getCustomView().findViewById(R.id.tab_icon);
iconLocal.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_text), PorterDuff.Mode.SRC_IN);
- iconLocal.setImageResource(R.drawable.ic_action_users_tl);
+ iconLocal.setImageResource(R.drawable.ic_people);
@SuppressWarnings("ConstantConditions") @SuppressLint("CutPasteId")
ImageView iconGlobal = tabPublic.getCustomView().findViewById(R.id.tab_icon);
iconGlobal.setColorFilter(ContextCompat.getColor(getApplicationContext(), R.color.dark_text), PorterDuff.Mode.SRC_IN);
- iconGlobal.setImageResource(R.drawable.ic_action_globe_tl);
+ iconGlobal.setImageResource(R.drawable.ic_public);
- changeDrawableColor(getApplicationContext(), R.drawable.ic_action_home_tl,R.color.dark_text);
- changeDrawableColor(getApplicationContext(), R.drawable.ic_notifications_tl,R.color.dark_text);
- changeDrawableColor(getApplicationContext(), R.drawable.ic_action_users_tl,R.color.dark_text);
- changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe_tl,R.color.dark_text);
+ changeDrawableColor(getApplicationContext(), R.drawable.ic_home,R.color.dark_text);
+ changeDrawableColor(getApplicationContext(), R.drawable.ic_notifications,R.color.dark_text);
+ changeDrawableColor(getApplicationContext(), R.drawable.ic_people,R.color.dark_text);
+ changeDrawableColor(getApplicationContext(), R.drawable.ic_public,R.color.dark_text);
tabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
tabLayout.setTabMode(TabLayout.MODE_FIXED);
@@ -982,9 +982,9 @@ public abstract class BaseMainActivity extends AppCompatActivity
if( theme == Helper.THEME_DARK){
changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.dark_icon);
- changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe,R.color.dark_icon);
+ changeDrawableColor(getApplicationContext(), R.drawable.ic_public,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_open,R.color.dark_icon);
- changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_closed,R.color.dark_icon);
+ changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_outline,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_favorite_border,R.color.dark_icon);
@@ -994,9 +994,9 @@ public abstract class BaseMainActivity extends AppCompatActivity
}else {
changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.black);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.black);
- changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe,R.color.black);
+ changeDrawableColor(getApplicationContext(), R.drawable.ic_public,R.color.black);
changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_open,R.color.black);
- changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_closed,R.color.black);
+ changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_outline,R.color.black);
changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.black);
changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet,R.color.black);
changeDrawableColor(getApplicationContext(), R.drawable.ic_favorite_border,R.color.black);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
index 36b5c5788..89b26516b 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
@@ -401,9 +401,9 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
if( theme == Helper.THEME_DARK){
- changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_closed,R.color.mastodonC4);
+ changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_outline,R.color.mastodonC4);
}else {
- changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_closed,R.color.mastodonC4);
+ changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_outline,R.color.mastodonC4);
}
String urlHeader = account.getHeader();
if (urlHeader.startsWith("/")) {
@@ -439,7 +439,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
//Redraws icon for locked accounts
final float scale = getResources().getDisplayMetrics().density;
if(account.isLocked()){
- Drawable img = ContextCompat.getDrawable(getApplicationContext(), R.drawable.ic_action_lock_closed);
+ Drawable img = ContextCompat.getDrawable(getApplicationContext(), R.drawable.ic_lock_outline);
img.setBounds(0,0,(int) (20 * scale + 0.5f),(int) (20 * scale + 0.5f));
account_dn.setCompoundDrawables( img, null, null, null);
}else{
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
index 049446e79..ed361586a 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
@@ -213,7 +213,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
pp_progress = actionBar.getCustomView().findViewById(R.id.pp_progress);
}
-
+ changeColor();
//By default the toot is not restored so the id -1 is defined
currentToId = -1;
boolean restoredScheduled = false;
@@ -429,13 +429,13 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
if(isAccountPrivate){
if( tootReply == null) {
visibility = "private";
- toot_visibility.setImageResource(R.drawable.ic_action_lock_closed);
+ toot_visibility.setImageResource(R.drawable.ic_lock_outline);
}else {
if( visibility.equals("direct") ){
toot_visibility.setImageResource(R.drawable.ic_mail_outline);
}else{
visibility = "private";
- toot_visibility.setImageResource(R.drawable.ic_action_lock_closed);
+ toot_visibility.setImageResource(R.drawable.ic_lock_outline);
}
}
}else {
@@ -443,13 +443,13 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
visibility = sharedpreferences.getString(Helper.SET_TOOT_VISIBILITY + "@" + account.getAcct() + "@" + account.getInstance(), "public");
switch (visibility) {
case "public":
- toot_visibility.setImageResource(R.drawable.ic_action_globe);
+ toot_visibility.setImageResource(R.drawable.ic_public);
break;
case "unlisted":
toot_visibility.setImageResource(R.drawable.ic_action_lock_open);
break;
case "private":
- toot_visibility.setImageResource(R.drawable.ic_action_lock_closed);
+ toot_visibility.setImageResource(R.drawable.ic_lock_outline);
break;
case "direct":
toot_visibility.setImageResource(R.drawable.ic_mail_outline);
@@ -626,7 +626,6 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
if( restored != -1 ){
restoreToot(restored);
}
- changeColor();
if( theme == Helper.THEME_LIGHT) {
toot_it.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
}
@@ -940,7 +939,6 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
}
}
});
- changeColor();
alertDialog.show();
return true;
default:
@@ -1160,7 +1158,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
switch (position){
case 0:
visibility = "public";
- toot_visibility.setImageResource(R.drawable.ic_action_globe);
+ toot_visibility.setImageResource(R.drawable.ic_public);
break;
case 1:
visibility = "unlisted";
@@ -1168,14 +1166,14 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
break;
case 2:
visibility = "private";
- toot_visibility.setImageResource(R.drawable.ic_action_lock_closed);
+ toot_visibility.setImageResource(R.drawable.ic_lock_outline);
break;
case 3:
visibility = "direct";
toot_visibility.setImageResource(R.drawable.ic_mail_outline);
break;
}
- changeColor();
+
dialog.dismiss();
}
});
@@ -1428,7 +1426,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
switch (status.getVisibility()){
case "public":
visibility = "public";
- toot_visibility.setImageResource(R.drawable.ic_action_globe);
+ toot_visibility.setImageResource(R.drawable.ic_public);
break;
case "unlisted":
visibility = "unlisted";
@@ -1436,14 +1434,14 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
break;
case "private":
visibility = "private";
- toot_visibility.setImageResource(R.drawable.ic_action_lock_closed);
+ toot_visibility.setImageResource(R.drawable.ic_lock_outline);
break;
case "direct":
visibility = "direct";
toot_visibility.setImageResource(R.drawable.ic_mail_outline);
break;
}
- changeColor();
+
//The current id is set to the draft
currentToId = draft.getId();
tootReply = draft.getStatusReply();
@@ -1477,7 +1475,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
switch (tootReply.getVisibility()){
case "public":
visibility = "public";
- toot_visibility.setImageResource(R.drawable.ic_action_globe);
+ toot_visibility.setImageResource(R.drawable.ic_public);
break;
case "unlisted":
visibility = "unlisted";
@@ -1485,14 +1483,13 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
break;
case "private":
visibility = "private";
- toot_visibility.setImageResource(R.drawable.ic_action_lock_closed);
+ toot_visibility.setImageResource(R.drawable.ic_lock_outline);
break;
case "direct":
visibility = "direct";
toot_visibility.setImageResource(R.drawable.ic_mail_outline);
break;
}
- changeColor();
//If toot is not restored
if( restored == -1 ){
//Retrieves mentioned accounts + OP and adds them at the beginin of the toot
@@ -1565,18 +1562,18 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
if( theme == Helper.THEME_DARK) {
- changeDrawableColor(TootActivity.this, R.drawable.ic_action_globe, R.color.dark_text);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_public, R.color.dark_text);
changeDrawableColor(TootActivity.this, R.drawable.ic_action_lock_open, R.color.dark_text);
- changeDrawableColor(TootActivity.this, R.drawable.ic_action_lock_closed, R.color.dark_text);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_lock_outline, R.color.dark_text);
changeDrawableColor(TootActivity.this, R.drawable.ic_mail_outline, R.color.dark_text);
changeDrawableColor(TootActivity.this, R.drawable.ic_insert_photo, R.color.dark_text);
changeDrawableColor(TootActivity.this, R.drawable.ic_skip_previous, R.color.dark_text);
changeDrawableColor(TootActivity.this, R.drawable.ic_skip_next, R.color.dark_text);
changeDrawableColor(TootActivity.this, R.drawable.ic_check, R.color.dark_text);
}else {
- changeDrawableColor(TootActivity.this, R.drawable.ic_action_globe, R.color.white);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_public, R.color.white);
changeDrawableColor(TootActivity.this, R.drawable.ic_action_lock_open, R.color.white);
- changeDrawableColor(TootActivity.this, R.drawable.ic_action_lock_closed, R.color.white);
+ changeDrawableColor(TootActivity.this, R.drawable.ic_lock_outline, R.color.white);
changeDrawableColor(TootActivity.this, R.drawable.ic_mail_outline, R.color.white);
changeDrawableColor(TootActivity.this, R.drawable.ic_insert_photo, R.color.white);
changeDrawableColor(TootActivity.this, R.drawable.ic_skip_previous, R.color.white);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchDevAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchDevAdapter.java
index 41d1e7fc4..8d57ff25d 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchDevAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchDevAdapter.java
@@ -123,7 +123,7 @@ public class AccountSearchDevAdapter extends BaseAdapter implements OnPostAction
//Redraws icon for locked accounts
final float scale = context.getResources().getDisplayMetrics().density;
if( account != null && account.isLocked()){
- Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_action_lock_closed);
+ Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_lock_outline);
img.setBounds(0,0,(int) (20 * scale + 0.5f),(int) (20 * scale + 0.5f));
holder.account_dn.setCompoundDrawables( null, null, img, null);
}else{
@@ -138,7 +138,7 @@ public class AccountSearchDevAdapter extends BaseAdapter implements OnPostAction
holder.account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name(), true));
holder.account_un.setText(String.format("@%s",account.getAcct()));
}
- changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.mastodonC4);
+ changeDrawableColor(context, R.drawable.ic_lock_outline,R.color.mastodonC4);
//Profile picture
imageLoader.displayImage(account.getAvatar(), holder.account_pp, options);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
index 587f0a3a1..30683b2bc 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
@@ -217,9 +217,9 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
if( theme == Helper.THEME_DARK){
changeDrawableColor(context, R.drawable.ic_reply,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_action_more,R.color.dark_icon);
- changeDrawableColor(context, R.drawable.ic_action_globe,R.color.dark_icon);
+ changeDrawableColor(context, R.drawable.ic_public,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.dark_icon);
- changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.dark_icon);
+ changeDrawableColor(context, R.drawable.ic_lock_outline,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_retweet,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_icon);
@@ -229,9 +229,9 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
}else {
changeDrawableColor(context, R.drawable.ic_reply,R.color.black);
changeDrawableColor(context, R.drawable.ic_action_more,R.color.black);
- changeDrawableColor(context, R.drawable.ic_action_globe,R.color.black);
+ changeDrawableColor(context, R.drawable.ic_public,R.color.black);
changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.black);
- changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.black);
+ changeDrawableColor(context, R.drawable.ic_lock_outline,R.color.black);
changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.black);
changeDrawableColor(context, R.drawable.ic_retweet,R.color.black);
changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.black);
@@ -384,13 +384,13 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
}
switch (status.getVisibility()){
case "public":
- holder.status_privacy.setImageResource(R.drawable.ic_action_globe);
+ holder.status_privacy.setImageResource(R.drawable.ic_public);
break;
case "unlisted":
holder.status_privacy.setImageResource(R.drawable.ic_action_lock_open);
break;
case "private":
- holder.status_privacy.setImageResource(R.drawable.ic_action_lock_closed);
+ holder.status_privacy.setImageResource(R.drawable.ic_lock_outline);
break;
case "direct":
holder.status_privacy.setImageResource(R.drawable.ic_mail_outline);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java
index a77ed528c..d7deb3610 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java
@@ -119,15 +119,15 @@ public class ScheduledTootsListAdapter extends BaseAdapter {
final int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
if( theme == Helper.THEME_DARK){
changeDrawableColor(context, R.drawable.ic_cancel,R.color.dark_text);
- changeDrawableColor(context, R.drawable.ic_action_globe,R.color.dark_text);
+ changeDrawableColor(context, R.drawable.ic_public,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.dark_text);
- changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.dark_text);
+ changeDrawableColor(context, R.drawable.ic_lock_outline,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.dark_text);
}else {
changeDrawableColor(context, R.drawable.ic_cancel,R.color.black);
- changeDrawableColor(context, R.drawable.ic_action_globe,R.color.black);
+ changeDrawableColor(context, R.drawable.ic_public,R.color.black);
changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.black);
- changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.black);
+ changeDrawableColor(context, R.drawable.ic_lock_outline,R.color.black);
changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.black);
}
@@ -135,13 +135,13 @@ public class ScheduledTootsListAdapter extends BaseAdapter {
switch (status.getVisibility()) {
case "public":
- holder.scheduled_toot_privacy.setImageResource(R.drawable.ic_action_globe);
+ holder.scheduled_toot_privacy.setImageResource(R.drawable.ic_public);
break;
case "unlisted":
holder.scheduled_toot_privacy.setImageResource(R.drawable.ic_action_lock_open);
break;
case "private":
- holder.scheduled_toot_privacy.setImageResource(R.drawable.ic_action_lock_closed);
+ holder.scheduled_toot_privacy.setImageResource(R.drawable.ic_lock_outline);
break;
case "direct":
holder.scheduled_toot_privacy.setImageResource(R.drawable.ic_mail_outline);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index 24b9e8679..b2afbfc5b 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -409,9 +409,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
if( theme == Helper.THEME_DARK){
changeDrawableColor(context, R.drawable.ic_reply,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_action_more,R.color.dark_icon);
- changeDrawableColor(context, R.drawable.ic_action_globe,R.color.dark_icon);
+ changeDrawableColor(context, R.drawable.ic_public,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.dark_icon);
- changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.dark_icon);
+ changeDrawableColor(context, R.drawable.ic_lock_outline,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_icon);
changeDrawableColor(context, R.drawable.ic_boost_header,R.color.dark_icon);
@@ -423,9 +423,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}else {
changeDrawableColor(context, R.drawable.ic_reply,R.color.black);
changeDrawableColor(context, R.drawable.ic_action_more,R.color.black);
- changeDrawableColor(context, R.drawable.ic_action_globe,R.color.black);
+ changeDrawableColor(context, R.drawable.ic_public,R.color.black);
changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.black);
- changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.black);
+ changeDrawableColor(context, R.drawable.ic_lock_outline,R.color.black);
changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.black);
changeDrawableColor(context, R.drawable.ic_boost_border,R.color.black);
changeDrawableColor(context, R.drawable.ic_boost_header,R.color.black);
@@ -672,13 +672,13 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
switch (status.getVisibility()){
case "public":
- holder.status_privacy.setImageResource(R.drawable.ic_action_globe);
+ holder.status_privacy.setImageResource(R.drawable.ic_public);
break;
case "unlisted":
holder.status_privacy.setImageResource(R.drawable.ic_action_lock_open);
break;
case "private":
- holder.status_privacy.setImageResource(R.drawable.ic_action_lock_closed);
+ holder.status_privacy.setImageResource(R.drawable.ic_lock_outline);
break;
case "direct":
holder.status_privacy.setImageResource(R.drawable.ic_mail_outline);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
index d29af7787..b58cd751e 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
@@ -363,13 +363,13 @@ public class SettingsFragment extends Fragment {
String tootVisibility = sharedpreferences.getString(Helper.SET_TOOT_VISIBILITY + "@" + account.getAcct() + "@" + account.getInstance(), "public");
switch (tootVisibility) {
case "public":
- set_toot_visibility.setImageResource(R.drawable.ic_action_globe);
+ set_toot_visibility.setImageResource(R.drawable.ic_public);
break;
case "unlisted":
set_toot_visibility.setImageResource(R.drawable.ic_action_lock_open);
break;
case "private":
- set_toot_visibility.setImageResource(R.drawable.ic_action_lock_closed);
+ set_toot_visibility.setImageResource(R.drawable.ic_lock_outline);
break;
case "direct":
set_toot_visibility.setImageResource(R.drawable.ic_mail_outline);
@@ -402,7 +402,7 @@ public class SettingsFragment extends Fragment {
switch (position){
case 0:
visibility = "public";
- set_toot_visibility.setImageResource(R.drawable.ic_action_globe);
+ set_toot_visibility.setImageResource(R.drawable.ic_public);
break;
case 1:
visibility = "unlisted";
@@ -410,7 +410,7 @@ public class SettingsFragment extends Fragment {
break;
case 2:
visibility = "private";
- set_toot_visibility.setImageResource(R.drawable.ic_action_lock_closed);
+ set_toot_visibility.setImageResource(R.drawable.ic_lock_outline);
break;
case 3:
visibility = "direct";
@@ -478,14 +478,14 @@ public class SettingsFragment extends Fragment {
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
if( theme == Helper.THEME_DARK){
- changeDrawableColor(context, R.drawable.ic_action_globe,R.color.dark_text);
+ changeDrawableColor(context, R.drawable.ic_public,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.dark_text);
- changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.dark_text);
+ changeDrawableColor(context, R.drawable.ic_lock_outline,R.color.dark_text);
changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.dark_text);
}else {
- changeDrawableColor(context, R.drawable.ic_action_globe,R.color.white);
+ changeDrawableColor(context, R.drawable.ic_public,R.color.white);
changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.white);
- changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.white);
+ changeDrawableColor(context, R.drawable.ic_lock_outline,R.color.white);
changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.white);
}
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 c57764ba8..897296639 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
@@ -25,6 +25,7 @@ import android.graphics.PorterDuffXfermode;
import android.graphics.Rect;
import android.graphics.RectF;
import android.support.annotation.RequiresApi;
+import android.support.v4.graphics.drawable.DrawableCompat;
import android.support.v7.app.AlertDialog;
import android.app.DownloadManager;
import android.app.PendingIntent;
@@ -732,7 +733,7 @@ public class Helper {
@Override
public void onLoadingFailed(java.lang.String imageUri, android.view.View view, FailReason failReason){
notify_user(context, intent, notificationIdTmp, BitmapFactory.decodeResource(context.getResources(),
- R.drawable.ic_save), context.getString(R.string.save_over), context.getString(R.string.download_from, fileName));
+ R.drawable.ic_save_white), context.getString(R.string.save_over), context.getString(R.string.download_from, fileName));
Toast.makeText(context, R.string.toast_saved,Toast.LENGTH_LONG).show();
}});
} catch (Exception e) {
@@ -1439,9 +1440,8 @@ public class Helper {
* @param hexaColor example 0xffff00
*/
public static Drawable changeDrawableColor(Context context, int drawable, int hexaColor){
- int color = Color.parseColor(context.getString(hexaColor));
Drawable mDrawable = ContextCompat.getDrawable(context, drawable);
- mDrawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+ DrawableCompat.setTint(mDrawable, ContextCompat.getColor(context, hexaColor));
return mDrawable;
}
diff --git a/app/src/main/res/drawable-anydpi/ic_report.xml b/app/src/main/res/drawable-anydpi/ic_add.xml
similarity index 53%
rename from app/src/main/res/drawable-anydpi/ic_report.xml
rename to app/src/main/res/drawable-anydpi/ic_add.xml
index e20d8899c..0258249cc 100644
--- a/app/src/main/res/drawable-anydpi/ic_report.xml
+++ b/app/src/main/res/drawable-anydpi/ic_add.xml
@@ -5,5 +5,5 @@
android:viewportHeight="24.0">
+ android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
diff --git a/app/src/main/res/drawable-anydpi/ic_file_download.xml b/app/src/main/res/drawable-anydpi/ic_file_download.xml
new file mode 100644
index 000000000..492b41d34
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_file_download.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable-anydpi/ic_home.xml b/app/src/main/res/drawable-anydpi/ic_home.xml
new file mode 100644
index 000000000..70fb2910c
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_home.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable-anydpi/ic_lock_outline.xml b/app/src/main/res/drawable-anydpi/ic_lock_outline.xml
new file mode 100644
index 000000000..9a14b68f8
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_lock_outline.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable-anydpi/ic_notifications.xml b/app/src/main/res/drawable-anydpi/ic_notifications.xml
new file mode 100644
index 000000000..7009a6763
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_notifications.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable-anydpi/ic_open_with.xml b/app/src/main/res/drawable-anydpi/ic_open_with.xml
new file mode 100644
index 000000000..e1ea78347
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_open_with.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable-anydpi/ic_people.xml b/app/src/main/res/drawable-anydpi/ic_people.xml
new file mode 100644
index 000000000..4cfd86960
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_people.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable-anydpi/ic_public.xml b/app/src/main/res/drawable-anydpi/ic_public.xml
new file mode 100644
index 000000000..d976b4244
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_public.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable-anydpi/ic_save_white.xml b/app/src/main/res/drawable-anydpi/ic_save_white.xml
new file mode 100644
index 000000000..a7a81a25d
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_save_white.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable-anydpi/ic_schedule.xml b/app/src/main/res/drawable-anydpi/ic_schedule.xml
new file mode 100644
index 000000000..fdcce49cb
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_schedule.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable-anydpi/ic_visibility.xml b/app/src/main/res/drawable-anydpi/ic_visibility.xml
new file mode 100644
index 000000000..6c95a5d29
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_visibility.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable-hdpi/ic_action_clock.png b/app/src/main/res/drawable-hdpi/ic_action_clock.png
deleted file mode 100644
index 917b4aad3..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_clock.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_download.png b/app/src/main/res/drawable-hdpi/ic_action_download.png
deleted file mode 100644
index f08b33565..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_eye_open.png b/app/src/main/res/drawable-hdpi/ic_action_eye_open.png
deleted file mode 100644
index 5822f5f97..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_eye_open.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_globe.png b/app/src/main/res/drawable-hdpi/ic_action_globe.png
deleted file mode 100644
index d7badddd7..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_globe.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_globe_menu.png b/app/src/main/res/drawable-hdpi/ic_action_globe_menu.png
deleted file mode 100644
index d7badddd7..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_globe_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_globe_tl.png b/app/src/main/res/drawable-hdpi/ic_action_globe_tl.png
deleted file mode 100644
index d7badddd7..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_globe_tl.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_goright.png b/app/src/main/res/drawable-hdpi/ic_action_goright.png
deleted file mode 100644
index 60bfa25ed..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_goright.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_home.png b/app/src/main/res/drawable-hdpi/ic_action_home.png
deleted file mode 100644
index d2906dd25..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_home.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_home_tl.png b/app/src/main/res/drawable-hdpi/ic_action_home_tl.png
deleted file mode 100644
index d2906dd25..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_home_tl.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_increase_menu.png b/app/src/main/res/drawable-hdpi/ic_action_increase_menu.png
deleted file mode 100644
index 7800ba33d..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_increase_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_lock_closed.png b/app/src/main/res/drawable-hdpi/ic_action_lock_closed.png
deleted file mode 100644
index 28a3bfa9d..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_lock_closed.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_users.png b/app/src/main/res/drawable-hdpi/ic_action_users.png
deleted file mode 100644
index 2eef401fd..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_users.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_notifications.png b/app/src/main/res/drawable-hdpi/ic_notifications.png
deleted file mode 100644
index b1a6e580d..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_notifications.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_save.png b/app/src/main/res/drawable-hdpi/ic_save.png
deleted file mode 100644
index fe33819e9..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_save.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_clock.png b/app/src/main/res/drawable-ldpi/ic_action_clock.png
deleted file mode 100644
index ca0d37d02..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_action_clock.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_download.png b/app/src/main/res/drawable-ldpi/ic_action_download.png
deleted file mode 100644
index a7d01ca58..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_action_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_eye_open.png b/app/src/main/res/drawable-ldpi/ic_action_eye_open.png
deleted file mode 100644
index e441b7854..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_action_eye_open.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_globe.png b/app/src/main/res/drawable-ldpi/ic_action_globe.png
deleted file mode 100644
index 4f5279f70..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_action_globe.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_globe_menu.png b/app/src/main/res/drawable-ldpi/ic_action_globe_menu.png
deleted file mode 100644
index 4f5279f70..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_action_globe_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_globe_tl.png b/app/src/main/res/drawable-ldpi/ic_action_globe_tl.png
deleted file mode 100644
index 4f5279f70..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_action_globe_tl.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_goright.png b/app/src/main/res/drawable-ldpi/ic_action_goright.png
deleted file mode 100644
index 70abf490b..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_action_goright.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_home.png b/app/src/main/res/drawable-ldpi/ic_action_home.png
deleted file mode 100644
index 08ef5944f..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_action_home.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_home_tl.png b/app/src/main/res/drawable-ldpi/ic_action_home_tl.png
deleted file mode 100644
index 08ef5944f..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_action_home_tl.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_increase_menu.png b/app/src/main/res/drawable-ldpi/ic_action_increase_menu.png
deleted file mode 100644
index 1a39b71f8..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_action_increase_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_lock_closed.png b/app/src/main/res/drawable-ldpi/ic_action_lock_closed.png
deleted file mode 100644
index 180f84c2e..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_action_lock_closed.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_users.png b/app/src/main/res/drawable-ldpi/ic_action_users.png
deleted file mode 100644
index a673f0f29..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_action_users.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_notifications.png b/app/src/main/res/drawable-ldpi/ic_notifications.png
deleted file mode 100644
index 3b3d3dc64..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_notifications.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_save.png b/app/src/main/res/drawable-ldpi/ic_save.png
deleted file mode 100644
index 3d796d269..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_save.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_clock.png b/app/src/main/res/drawable-mdpi/ic_action_clock.png
deleted file mode 100644
index dda182055..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_clock.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_download.png b/app/src/main/res/drawable-mdpi/ic_action_download.png
deleted file mode 100644
index 76e1c9b63..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_eye_open.png b/app/src/main/res/drawable-mdpi/ic_action_eye_open.png
deleted file mode 100644
index 53a32c497..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_eye_open.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_globe.png b/app/src/main/res/drawable-mdpi/ic_action_globe.png
deleted file mode 100644
index 5535b73da..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_globe.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_globe_menu.png b/app/src/main/res/drawable-mdpi/ic_action_globe_menu.png
deleted file mode 100644
index 5535b73da..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_globe_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_globe_tl.png b/app/src/main/res/drawable-mdpi/ic_action_globe_tl.png
deleted file mode 100644
index 5535b73da..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_globe_tl.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_goright.png b/app/src/main/res/drawable-mdpi/ic_action_goright.png
deleted file mode 100644
index e5b64b33d..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_goright.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_home.png b/app/src/main/res/drawable-mdpi/ic_action_home.png
deleted file mode 100644
index cf00e9f67..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_home.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_home_tl.png b/app/src/main/res/drawable-mdpi/ic_action_home_tl.png
deleted file mode 100644
index cf00e9f67..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_home_tl.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_increase_menu.png b/app/src/main/res/drawable-mdpi/ic_action_increase_menu.png
deleted file mode 100644
index ed40b2b21..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_increase_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_lock_closed.png b/app/src/main/res/drawable-mdpi/ic_action_lock_closed.png
deleted file mode 100644
index fc0335682..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_lock_closed.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_users.png b/app/src/main/res/drawable-mdpi/ic_action_users.png
deleted file mode 100644
index f96ff97c4..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_users.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_notifications.png b/app/src/main/res/drawable-mdpi/ic_notifications.png
deleted file mode 100644
index 81d09aef7..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_notifications.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_save.png b/app/src/main/res/drawable-mdpi/ic_save.png
deleted file mode 100644
index 59037c47c..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_save.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_clock.png b/app/src/main/res/drawable-xhdpi/ic_action_clock.png
deleted file mode 100644
index 25e61f527..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_clock.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_download.png b/app/src/main/res/drawable-xhdpi/ic_action_download.png
deleted file mode 100644
index 46501ca9b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_eye_open.png b/app/src/main/res/drawable-xhdpi/ic_action_eye_open.png
deleted file mode 100644
index 97dcfee5f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_eye_open.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_globe.png b/app/src/main/res/drawable-xhdpi/ic_action_globe.png
deleted file mode 100644
index eba4fdc85..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_globe.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_globe_menu.png b/app/src/main/res/drawable-xhdpi/ic_action_globe_menu.png
deleted file mode 100644
index eba4fdc85..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_globe_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_globe_tl.png b/app/src/main/res/drawable-xhdpi/ic_action_globe_tl.png
deleted file mode 100644
index eba4fdc85..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_globe_tl.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_goright.png b/app/src/main/res/drawable-xhdpi/ic_action_goright.png
deleted file mode 100644
index feb471b2b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_goright.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_home.png b/app/src/main/res/drawable-xhdpi/ic_action_home.png
deleted file mode 100644
index e5a7bfc69..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_home.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_home_tl.png b/app/src/main/res/drawable-xhdpi/ic_action_home_tl.png
deleted file mode 100644
index e5a7bfc69..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_home_tl.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_increase_menu.png b/app/src/main/res/drawable-xhdpi/ic_action_increase_menu.png
deleted file mode 100644
index 185be8a76..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_increase_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_lock_closed.png b/app/src/main/res/drawable-xhdpi/ic_action_lock_closed.png
deleted file mode 100644
index 3da02a68e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_lock_closed.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_users.png b/app/src/main/res/drawable-xhdpi/ic_action_users.png
deleted file mode 100644
index 3c31252a0..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_users.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_notifications.png b/app/src/main/res/drawable-xhdpi/ic_notifications.png
deleted file mode 100644
index 0c22d4926..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_notifications.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_save.png b/app/src/main/res/drawable-xhdpi/ic_save.png
deleted file mode 100644
index d71055b9e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_save.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_clock.png b/app/src/main/res/drawable-xxhdpi/ic_action_clock.png
deleted file mode 100644
index 1fd1c45c4..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_clock.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_download.png b/app/src/main/res/drawable-xxhdpi/ic_action_download.png
deleted file mode 100644
index 80a236521..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_eye_open.png b/app/src/main/res/drawable-xxhdpi/ic_action_eye_open.png
deleted file mode 100644
index 333a69377..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_eye_open.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_globe.png b/app/src/main/res/drawable-xxhdpi/ic_action_globe.png
deleted file mode 100644
index cb5d6e156..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_globe.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_globe_menu.png b/app/src/main/res/drawable-xxhdpi/ic_action_globe_menu.png
deleted file mode 100644
index cb5d6e156..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_globe_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_globe_tl.png b/app/src/main/res/drawable-xxhdpi/ic_action_globe_tl.png
deleted file mode 100644
index cb5d6e156..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_globe_tl.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_goright.png b/app/src/main/res/drawable-xxhdpi/ic_action_goright.png
deleted file mode 100644
index 8937a7d7e..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_goright.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_home.png b/app/src/main/res/drawable-xxhdpi/ic_action_home.png
deleted file mode 100644
index d16cf3ea4..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_home.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_home_tl.png b/app/src/main/res/drawable-xxhdpi/ic_action_home_tl.png
deleted file mode 100644
index d16cf3ea4..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_home_tl.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_increase_menu.png b/app/src/main/res/drawable-xxhdpi/ic_action_increase_menu.png
deleted file mode 100644
index 2ab780a89..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_increase_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_lock_closed.png b/app/src/main/res/drawable-xxhdpi/ic_action_lock_closed.png
deleted file mode 100644
index aa6098f76..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_lock_closed.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_users.png b/app/src/main/res/drawable-xxhdpi/ic_action_users.png
deleted file mode 100644
index 178fb0f9f..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_users.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notifications.png b/app/src/main/res/drawable-xxhdpi/ic_notifications.png
deleted file mode 100644
index bb99098c8..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_notifications.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_save.png b/app/src/main/res/drawable-xxhdpi/ic_save.png
deleted file mode 100644
index 272e2b67b..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_save.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_clock.png b/app/src/main/res/drawable-xxxhdpi/ic_action_clock.png
deleted file mode 100644
index e641049d7..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_clock.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_download.png b/app/src/main/res/drawable-xxxhdpi/ic_action_download.png
deleted file mode 100644
index a017260aa..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_download.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_eye_open.png b/app/src/main/res/drawable-xxxhdpi/ic_action_eye_open.png
deleted file mode 100644
index dc6087386..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_eye_open.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_globe.png b/app/src/main/res/drawable-xxxhdpi/ic_action_globe.png
deleted file mode 100644
index c100d399a..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_globe.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_globe_menu.png b/app/src/main/res/drawable-xxxhdpi/ic_action_globe_menu.png
deleted file mode 100644
index c100d399a..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_globe_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_globe_tl.png b/app/src/main/res/drawable-xxxhdpi/ic_action_globe_tl.png
deleted file mode 100644
index c100d399a..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_globe_tl.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_goright.png b/app/src/main/res/drawable-xxxhdpi/ic_action_goright.png
deleted file mode 100644
index f73b8bd72..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_goright.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_home.png b/app/src/main/res/drawable-xxxhdpi/ic_action_home.png
deleted file mode 100644
index b38dc4f34..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_home.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_home_tl.png b/app/src/main/res/drawable-xxxhdpi/ic_action_home_tl.png
deleted file mode 100644
index b38dc4f34..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_home_tl.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_increase_menu.png b/app/src/main/res/drawable-xxxhdpi/ic_action_increase_menu.png
deleted file mode 100644
index e6ca376b3..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_increase_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_lock_closed.png b/app/src/main/res/drawable-xxxhdpi/ic_action_lock_closed.png
deleted file mode 100644
index 85882e671..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_lock_closed.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_users.png b/app/src/main/res/drawable-xxxhdpi/ic_action_users.png
deleted file mode 100644
index 911c4b526..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_users.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_notifications.png b/app/src/main/res/drawable-xxxhdpi/ic_notifications.png
deleted file mode 100644
index e498a2f21..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_notifications.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_save.png b/app/src/main/res/drawable-xxxhdpi/ic_save.png
deleted file mode 100644
index efe6b14f7..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_save.png and /dev/null differ
diff --git a/app/src/main/res/layout-sw600dp/activity_toot.xml b/app/src/main/res/layout-sw600dp/activity_toot.xml
index 442241a44..d338b0b0c 100644
--- a/app/src/main/res/layout-sw600dp/activity_toot.xml
+++ b/app/src/main/res/layout-sw600dp/activity_toot.xml
@@ -95,7 +95,7 @@
android:layout_width="50dp"
android:layout_height="wrap_content"
style="@style/Base.Widget.AppCompat.Button.Colored"
- android:src="@drawable/ic_action_globe"
+ android:src="@drawable/ic_public"
tools:ignore="ContentDescription" />
diff --git a/app/src/main/res/layout/activity_toot.xml b/app/src/main/res/layout/activity_toot.xml
index f677c55da..926d64811 100644
--- a/app/src/main/res/layout/activity_toot.xml
+++ b/app/src/main/res/layout/activity_toot.xml
@@ -95,7 +95,7 @@
android:layout_width="50dp"
android:layout_height="wrap_content"
style="@style/Base.Widget.AppCompat.Button.Colored"
- android:src="@drawable/ic_action_globe"
+ android:src="@drawable/ic_public"
tools:ignore="ContentDescription" />
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 6b95eeab1..6bafb1510 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -17,7 +17,7 @@
android:title="@string/scheduled_toots" />
diff --git a/app/src/main/res/menu/main_toot.xml b/app/src/main/res/menu/main_toot.xml
index 24e948e29..4081f2790 100644
--- a/app/src/main/res/menu/main_toot.xml
+++ b/app/src/main/res/menu/main_toot.xml
@@ -4,7 +4,7 @@