diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
index 60439e2a6..6314b1b11 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
@@ -79,7 +79,6 @@ public class ShowConversationActivity extends AppCompatActivity implements OnRet
private SwipeRefreshLayout swipeRefreshLayout;
private ListView lv_status;
private boolean isRefreshed;
- private TextView title;
private ImageView pp_actionBar;
@Override
@@ -101,7 +100,7 @@ public class ShowConversationActivity extends AppCompatActivity implements OnRet
View view = inflater.inflate(R.layout.conversation_action_bar, null);
actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
- title = (TextView) actionBar.getCustomView().findViewById(R.id.toolbar_title);
+ TextView title = (TextView) actionBar.getCustomView().findViewById(R.id.toolbar_title);
pp_actionBar = (ImageView) actionBar.getCustomView().findViewById(R.id.pp_actionBar);
title.setText(R.string.conversation);
ImageView close_conversation = (ImageView) actionBar.getCustomView().findViewById(R.id.close_conversation);
@@ -163,15 +162,9 @@ public class ShowConversationActivity extends AppCompatActivity implements OnRet
swipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipeContainer);
new RetrieveFeedsAsyncTask(getApplicationContext(), RetrieveFeedsAsyncTask.Type.ONESTATUS, statusId,null, false,false, ShowConversationActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
- if( theme == Helper.THEME_LIGHT) {
- swipeRefreshLayout.setColorSchemeResources(R.color.colorAccent,
- R.color.colorPrimary,
- R.color.colorPrimaryDark);
- }else {
- swipeRefreshLayout.setColorSchemeResources(R.color.colorAccentD,
- R.color.colorPrimaryD,
- R.color.colorPrimaryDarkD);
- }
+ swipeRefreshLayout.setColorSchemeResources(R.color.mastodonC4,
+ R.color.mastodonC2,
+ R.color.mastodonC3);
swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
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 fe333450d..9ceb7274c 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
@@ -709,9 +709,9 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
}
}else {
if( position == ShowConversationActivity.position){
- holder.main_container.setBackgroundResource(R.color.mastodonC1_);
+ holder.main_container.setBackgroundResource(R.color.mastodonC1___);
}else {
- holder.main_container.setBackgroundResource(R.color.mastodonC1);
+ holder.main_container.setBackgroundResource(R.color.mastodonC1_);
}
}
}
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8f3940b7..eb81bf4bf 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -40,6 +40,7 @@
#585c67
+ #454b5b
#282c37
#313543
#9baec8
@@ -51,6 +52,17 @@
#1b80c9
+
+ #313543
+ #353947
+ #393f4f
+ #494f5f
+
+ #efefef
+ #ebf3fa
+ #d9e1e8
+ #c9d1d8
+
@color/mastodonC3__
@color/mastodonC1
@@ -65,18 +77,4 @@
@color/mastodonC3__
-
- #313543
- #353947
- #393f4f
- #494f5f
-
- #efefef
- #ebf3fa
- #d9e1e8
- #c9d1d8
-
-
-
-
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 89ce8277f..e92a2ebc7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,6 +13,7 @@