Merge branch 'improves_toots' into develop

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.mastodonC4,
-            swipeRefreshLayout.setColorSchemeResources(R.color.colorAccent,
+                R.color.mastodonC2,
-                    R.color.colorPrimary,
+                R.color.mastodonC3);
-                    R.color.colorPrimaryDark);
-        }else {
-            swipeRefreshLayout.setColorSchemeResources(R.color.colorAccentD,
-                    R.color.colorPrimaryD,
-                    R.color.colorPrimaryDarkD);
-        }
         swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {

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_);
                     }
                 }
             }

app/src/main/res/values/colors.xml

@@ -40,6 +40,7 @@
 
     <!-- Mastodon color scheme -->
     <color name="mastodonC1__">#585c67</color>
+    <color name="mastodonC1___">#454b5b</color>
     <color name="mastodonC1">#282c37</color>
     <color name="mastodonC1_">#313543</color>
     <color name="mastodonC2">#9baec8</color>
@@ -51,6 +52,17 @@
     <color name="mastodonC4_">#1b80c9</color>
 
 
+    <!-- Primary & accent colors -->
+    <color name="notif_dark_1">#313543</color>
+    <color name="notif_dark_2">#353947</color>
+    <color name="notif_dark_3">#393f4f</color>
+    <color name="notif_dark_4">#494f5f</color>
+
+    <color name="notif_light_1">#efefef</color>
+    <color name="notif_light_2">#ebf3fa</color>
+    <color name="notif_light_3">#d9e1e8</color>
+    <color name="notif_light_4">#c9d1d8</color>
+
     <color name="foreground_material_dark" >@color/mastodonC3__</color>
     <color name="foreground_material_light">@color/mastodonC1</color>
 
@@ -65,18 +77,4 @@
     <color name="primary_dark_material_light">@color/mastodonC3__</color>
 
 
-    <!-- Primary & accent colors -->
-    <color name="notif_dark_1">#313543</color>
-    <color name="notif_dark_2">#353947</color>
-    <color name="notif_dark_3">#393f4f</color>
-    <color name="notif_dark_4">#494f5f</color>
-
-    <color name="notif_light_1">#efefef</color>
-    <color name="notif_light_2">#ebf3fa</color>
-    <color name="notif_light_3">#d9e1e8</color>
-    <color name="notif_light_4">#c9d1d8</color>
-
-    <eat-comment />
-
-
 </resources>

app/src/main/res/values/styles.xml

@@ -13,6 +13,7 @@
     <!-- Light theme -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
+        <item name="android:textColor">@color/black</item>
         <item name="colorPrimary">@color/mastodonC1</item>
         <item name="colorPrimaryDark">@color/mastodonC2</item>
         <item name="colorAccent">@color/mastodonC4</item>
@@ -35,6 +36,7 @@
     </style>
 
     <style name="AppTheme_NoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:textColor">@color/black</item>
         <item name="colorPrimary">@color/mastodonC1</item>
         <item name="colorPrimaryDark">@color/mastodonC2</item>
         <item name="colorAccent">@color/mastodonC4</item>