From b0a21c2602178c60aa4cb6ea8e9319de1bfc03d0 Mon Sep 17 00:00:00 2001
From: Vincent Stoessel <vincents@backbase.com>
Date: Mon, 13 Jul 2020 04:58:41 -0400
Subject: [PATCH] more remapping

---
 app/src/main/res/layout/activity_details.xml          |  2 +-
 app/src/main/res/layout/activity_donation_details.xml |  2 +-
 app/src/main/res/layout/fragment_about.xml            |  3 ++-
 app/src/main/res/values/strings.xml                   | 11 ++++-------
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout/activity_details.xml
index c07ab1b..d3eb552 100644
--- a/app/src/main/res/layout/activity_details.xml
+++ b/app/src/main/res/layout/activity_details.xml
@@ -243,7 +243,7 @@
             <TextView
                 android:id="@+id/news_label"
                 style="@style/Person.Section.Label"
-                android:text="@string/news"
+                android:text="@string/person.news"
                 android:textAllCaps="true"
                 app:layout_constraintTop_toBottomOf="@id/outcome"
                 app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/activity_donation_details.xml b/app/src/main/res/layout/activity_donation_details.xml
index 871e475..6190fc9 100644
--- a/app/src/main/res/layout/activity_donation_details.xml
+++ b/app/src/main/res/layout/activity_donation_details.xml
@@ -149,7 +149,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
-                    android:text="@string/social_media_hashtags"
+                    android:text="@string/person.hashtags"
                     android:textAllCaps="true"
                     android:textColor="@color/colorBlack"
                     android:textSize="18sp"
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index f366af7..732f1ce 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -72,6 +72,7 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="16dp"
                 android:text="@string/about_this_project.title"
+                android:textAllCaps="true"
                 android:textColor="@color/colorBlack"
                 android:textSize="18sp"
                 android:textStyle="bold" />
@@ -117,7 +118,7 @@
                 android:layout_marginStart="@dimen/margin_16dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="@dimen/margin_16dp"
-                android:text="@string/history_header"
+                android:text="@string/more_history.aboutTitle"
                 android:textColor="@color/colorBlack"
                 android:textSize="18sp"
                 android:textStyle="bold"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 34363c2..2316821 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,8 +33,8 @@
     <string name="person.news">News</string>
     <string name="person.media">Media</string>
     <string name="person.hashtags">Social Media Hashtags</string>
-    <string name="person.hashtagCopyTip">Press and hold to copy</string>
-    <string name="person.copied">Copied</string>
+<!--    <string name="person.hashtagCopyTip">Press and hold to copy</string>-->
+<!--    <string name="person.copied">Copied</string>-->
 
     <string-array name="filters">
         <item>Age</item>
@@ -94,16 +94,13 @@
     <string name="hashtags">Social Media Hashtags</string>
     <string name="media">Media</string>
     <string name="news">News</string>
-    <string name="outcome">Outcome</string>
 
-    <string name="social_media_hashtags">SOCIAL MEDIA HASHTAGS</string>
     <string name="about_this_project.title">About this project</string>
-    <string name="about_project_title">ABOUT THIS PROJECT</string>
     <string name="about_this_project_details">Welcome to the Say Their Names Project. Our aim is to build an open-source platform to raise awareness of the injustice and often forgotten names of racial inequality. We strive to identify and amplify verified organizations to ensure donations are reaching those who can make the most impact with it.</string>
     <string name="request_edit_or_removal.title">REQUEST AN EDIT OR REMOVAL</string>
     <string name="request_edit_or_removal.details">If you would like to propose an edit to a victim page or if you are a representative of the victim and would like the victim to be removed from this directory please send us a message on Twitter.</string>
-    <string name="history_header">HISTORY ON THE SAY THEIR NAME MOVEMENT</string>
+    <string name="more_history.aboutTitle">SOME HISTORY ON THE SAY THEIR NAMES MOVEMENT</string>
+
     <string name="did_we_miss_someone">DID WE MISS SOMEONE?</string>
     <string name="request_to_add_new_name">REQUEST TO ADD A NAME</string>
-    <string name="request_to_add_a_name">REQUEST TO ADD A NAME</string>
 </resources>
\ No newline at end of file