From eee60f107a21940dbd927f6e0e5dc22bef8335da Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Sat, 9 Feb 2019 08:42:30 +0100
Subject: [PATCH] Some improvements

---
 .../etalab/mastodon/activities/BaseMainActivity.java |  8 ++++----
 .../mastodon/activities/OpencollectiveActivity.java  |  2 +-
 app/src/main/res/layout/activity_opencollective.xml  | 12 +++++++++++-
 app/src/main/res/values/strings.xml                  |  1 +
 4 files changed, 17 insertions(+), 6 deletions(-)

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 5b9929edc..fc250ba83 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
@@ -2098,6 +2098,10 @@ public abstract class BaseMainActivity extends BaseActivity
             Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
             startActivity(intent);
             return false;
+        }else if (id == R.id.nav_opencollective) {
+            Intent intent = new Intent(getApplicationContext(), OpencollectiveActivity.class);
+            startActivity(intent);
+            return false;
         } else if( id == R.id.nav_upload) {
             Intent intent = new Intent(getApplicationContext(), PeertubeUploadActivity.class);
             startActivity(intent);
@@ -2217,10 +2221,6 @@ public abstract class BaseMainActivity extends BaseActivity
             fragmentTag = "HOW_TO_VIDEOS";
             fragmentManager.beginTransaction()
                     .replace(R.id.main_app_container, displayHowToFragment, fragmentTag).commit();
-        }else if (id == R.id.nav_opencollective) {
-            Intent intent = new Intent(getApplicationContext(), OpencollectiveActivity.class);
-            startActivity(intent);
-            return false;
         }else if (id == R.id.nav_muted || id == R.id.nav_pixelfed_muted) {
             toot.hide();
             accountsFragment = new DisplayAccountsFragment();
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/OpencollectiveActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/OpencollectiveActivity.java
index d648b76e0..7935279af 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/OpencollectiveActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/OpencollectiveActivity.java
@@ -98,7 +98,7 @@ public class OpencollectiveActivity extends BaseActivity implements OnRetrieveRe
                     finish();
                 }
             });
-            toolbar_title.setText(R.string.action_about);
+            toolbar_title.setText("Open Collective");
             if (theme == THEME_LIGHT){
                 Toolbar toolbar = actionBar.getCustomView().findViewById(R.id.toolbar);
                 Helper.colorizeToolbar(toolbar, R.color.black, OpencollectiveActivity.this);
diff --git a/app/src/main/res/layout/activity_opencollective.xml b/app/src/main/res/layout/activity_opencollective.xml
index 53685c0e3..db15f5d42 100644
--- a/app/src/main/res/layout/activity_opencollective.xml
+++ b/app/src/main/res/layout/activity_opencollective.xml
@@ -24,9 +24,11 @@
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_margin="@dimen/fab_margin"
         android:orientation="vertical"
         >
 
+
         <!-- About OpenCollective -->
         <LinearLayout
             android:layout_width="match_parent"
@@ -35,6 +37,9 @@
             android:padding="5dp">
 
             <TextView
+                android:drawableStart="@drawable/ic_opencollective"
+                android:drawableLeft="@drawable/ic_opencollective"
+                android:drawablePadding="5dp"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -52,7 +57,12 @@
                 tools:ignore="HardcodedText" />
         </LinearLayout>
 
-
+        <TextView
+            android:text="@string/more_about_opencollective"
+            android:layout_width="match_parent"
+            android:textSize="16sp"
+            android:gravity="center"
+            android:layout_height="wrap_content" />
 
         <!-- About developer -->
         <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 279b7818c..2a2acb1f3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -870,6 +870,7 @@
     <string name="set_optimize_loading">Optimize loading time</string>
     <string name="all">All</string>
     <string name="about_opencollective">Support the app</string>
+    <string name="more_about_opencollective">Open Collective enables groups to quickly set up a collective, raise funds and manage them transparently.</string>
     <!-- end languages -->