From ef8176b32427b2785bd0e54edde6f754de08e5c0 Mon Sep 17 00:00:00 2001
From: Shinokuni <shinokuni@openserver.fr>
Date: Fri, 12 Jul 2019 15:42:42 +0200
Subject: [PATCH] Add titles to activites

---
 app/src/main/AndroidManifest.xml                         | 7 ++++++-
 .../readrops/app/activities/AccountSettingsActivity.java | 2 ++
 .../main/java/com/readrops/app/utils/DrawerManager.java  | 1 -
 app/src/main/res/drawable/cell_separator.xml             | 6 ++++++
 app/src/main/res/layout/activity_account_settings.xml    | 9 ++++++++-
 app/src/main/res/values-fr-rFR/strings.xml               | 3 ++-
 app/src/main/res/values/strings.xml                      | 3 ++-
 7 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/drawable/cell_separator.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 58453e85..6dad453e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,12 +29,16 @@
             </intent-filter>
         </activity>
         <activity android:name=".activities.AccountTypeListActivity" />
-        <activity android:name=".activities.AddAccountActivity" />
+        <activity
+            android:name=".activities.AddAccountActivity"
+            android:label="@string/add_account" />
         <activity
             android:name=".activities.ManageFeedsActivity"
+            android:label="@string/manage_feeds_folders"
             android:parentActivityName=".activities.MainActivity" />
         <activity
             android:name=".activities.MainActivity"
+            android:label="@string/articles"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.ItemActivity"
@@ -42,6 +46,7 @@
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.AddFeedActivity"
+            android:label="@string/add_feed_title"
             android:parentActivityName=".activities.MainActivity" />
     </application>
 
diff --git a/app/src/main/java/com/readrops/app/activities/AccountSettingsActivity.java b/app/src/main/java/com/readrops/app/activities/AccountSettingsActivity.java
index 8e37d8c0..b6d17df3 100644
--- a/app/src/main/java/com/readrops/app/activities/AccountSettingsActivity.java
+++ b/app/src/main/java/com/readrops/app/activities/AccountSettingsActivity.java
@@ -24,6 +24,8 @@ public class AccountSettingsActivity extends AppCompatActivity {
         binding = DataBindingUtil.setContentView(this, R.layout.activity_account_settings);
         Account account = getIntent().getParcelableExtra(ACCOUNT);
 
+        setTitle(account.getAccountName());
+
         binding.accountSettingsFeeds.setOnClickListener(v -> {
             Intent intent = new Intent(getApplication(), ManageFeedsActivity.class);
             intent.putExtra(ManageFeedsActivity.ACCOUNT, account);
diff --git a/app/src/main/java/com/readrops/app/utils/DrawerManager.java b/app/src/main/java/com/readrops/app/utils/DrawerManager.java
index 6802249a..e11eb16b 100644
--- a/app/src/main/java/com/readrops/app/utils/DrawerManager.java
+++ b/app/src/main/java/com/readrops/app/utils/DrawerManager.java
@@ -177,7 +177,6 @@ public class DrawerManager {
                 .withIcon(color != 0 ? drawableWithColor(color) : drawableWithColor(activity.getResources().getColor(R.color.colorPrimary)))
                 .withIdentifier(feed.getId());
 
-
         Glide.with(activity)
                 .load(feed.getIconUrl())
                 .into(new CustomTarget<Drawable>() {
diff --git a/app/src/main/res/drawable/cell_separator.xml b/app/src/main/res/drawable/cell_separator.xml
new file mode 100644
index 00000000..179f5541
--- /dev/null
+++ b/app/src/main/res/drawable/cell_separator.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@android:color/darker_gray" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_account_settings.xml b/app/src/main/res/layout/activity_account_settings.xml
index 28ab7e3c..dbfe6b87 100644
--- a/app/src/main/res/layout/activity_account_settings.xml
+++ b/app/src/main/res/layout/activity_account_settings.xml
@@ -23,9 +23,16 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:text="@string/feeds" />
+                android:text="@string/feeds_and_folders" />
         </RelativeLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@drawable/cell_separator"
+            app:layout_constraintBottom_toTopOf="@id/account_settings_account"
+            app:layout_constraintTop_toBottomOf="@id/account_settings_feeds" />
+
         <RelativeLayout
             android:id="@+id/account_settings_account"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 0605810b..abd591b4 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -59,7 +59,8 @@
     <string name="no_feed">Aucun flux</string>
     <string name="choose_account">Choisir un compte</string>
     <string name="local_account">Compte local</string>
-    <string name="feeds">Flux</string>
+    <string name="feeds_and_folders">Flux et dossiers</string>
     <string name="account">Compte</string>
+    <string name="manage_feeds_folders">Gérer les flux et dossiers</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5a6ac66b..89f74975 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,6 +64,7 @@
     <string name="local_account">Local account</string>
     <string name="freshrss" translatable="false">Freshrss</string>
     <string name="feedly" translatable="false">Feedly</string>
-    <string name="feeds">Feeds</string>
+    <string name="feeds_and_folders">Feeds and folders</string>
     <string name="account">Account</string>
+    <string name="manage_feeds_folders">Manage feeds and folders</string>
 </resources>