Fixed all hardcoded strings

8 files changed, 15 insertions, 12 deletions

diff --git a/README.md b/README.md
index 7cd6f2c..5afc936 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,6 @@ Copyright © 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps. All
 (see also the @todo markings throughout the source code)
 
 ## High priority
-* Walk through all java to check for hardcoded strings
-* Don't train both like and dislike
 * Test deleting feeds
 * Test settings button
 * Make  "start" not clickable
diff --git a/app/src/main/java/org/rssin/android/FeedSorterTrainer.java b/app/src/main/java/org/rssin/android/FeedSorterTrainer.java
index 1f88a3e..987ed45 100755
--- a/app/src/main/java/org/rssin/android/FeedSorterTrainer.java
+++ b/app/src/main/java/org/rssin/android/FeedSorterTrainer.java
@@ -14,8 +14,8 @@ public class FeedSorterTrainer implements Runnable {
 

     @Override

     public void run() {

+        Log.d("FeedSorterTrainer", "Training starting...");

         for (int i = 0; i < 50; i++) {

-            Log.d("FeedSorterTrainer", "Training: round " + i);

             sorterProvider.getFeedSorter().train();

             try {

                 Thread.sleep(10);

@@ -24,6 +24,7 @@ public class FeedSorterTrainer implements Runnable {
             }

         }

 

+        Log.d("FeedSorterTrainer", "Training stopping...");

         sorterProvider.save();

     }

 }

diff --git a/app/src/main/java/org/rssin/android/FeedsActivity.java b/app/src/main/java/org/rssin/android/FeedsActivity.java
index 4a69af9..32f256a 100755
--- a/app/src/main/java/org/rssin/android/FeedsActivity.java
+++ b/app/src/main/java/org/rssin/android/FeedsActivity.java
@@ -105,8 +105,8 @@ public class FeedsActivity extends ActionBarActivity {
 
         AlertDialog.Builder alert = new AlertDialog.Builder(this);
 
-        alert.setTitle("Add feed");
-        alert.setMessage("URL:");
+        alert.setTitle(getString(R.string.feeds_activity_add_feed));
+        alert.setMessage(getString(R.string.feeds_activity_url));
 
         final EditText input = new EditText(this);
         input.setFocusable(true);
diff --git a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
index 931a86c..3041859 100755
--- a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
+++ b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
@@ -182,8 +182,8 @@ public class FilterSettingsActivity extends ActionBarActivity {
 
         AlertDialog.Builder alert = new AlertDialog.Builder(this);
 
-        alert.setTitle("Title");
-        alert.setMessage("New title:");
+        alert.setTitle(getString(R.string.filter_settings_title));
+        alert.setMessage(getString(R.string.filter_settings_new_title));
 
         final EditText input = new EditText(this);
         input.setText(filter.getTitle());
diff --git a/app/src/main/java/org/rssin/android/HomeScreenActivity.java b/app/src/main/java/org/rssin/android/HomeScreenActivity.java
index 378ac18..f33411b 100755
--- a/app/src/main/java/org/rssin/android/HomeScreenActivity.java
+++ b/app/src/main/java/org/rssin/android/HomeScreenActivity.java
@@ -41,7 +41,7 @@ public class HomeScreenActivity extends ActionBarActivity implements NavigationD
         fragmentManager.beginTransaction()

                 .replace(R.id.container, currentFragment = initialFragment)

                 .commit();

-        mTitle = "All feeds";

+        mTitle = getString(R.string.navigation_drawer_all_feeds);

     }

 

     private Fragment currentFragment;

diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
index c768a3b..e239588 100755
--- a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
@@ -119,8 +119,8 @@ public class NavigationDrawerManageFeedsFragment extends Fragment {
 

         AlertDialog.Builder alert = new AlertDialog.Builder(context);

 

-        alert.setTitle("Add feed");

-        alert.setMessage("URL:");

+        alert.setTitle(getString(R.string.feeds_activity_add_feed));

+        alert.setMessage(getString(R.string.feeds_activity_url));

 

         final EditText input = new EditText(context);

         input.setFocusable(true);

diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java
index 405d7be..42be75f 100755
--- a/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java
@@ -115,8 +115,8 @@ public class NavigationDrawerManageFiltersFragment extends Fragment {
 

         AlertDialog.Builder alert = new AlertDialog.Builder(rootView.getContext());

 

-        alert.setTitle("Add filter");

-        alert.setMessage("Title:");

+        alert.setTitle(getString(R.string.filters_action_add));

+        alert.setMessage(getString(R.string.filter_settings_title));

 

         final EditText input = new EditText(rootView.getContext());

         input.setFocusable(true);

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3b3a884..591a878 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -70,4 +70,8 @@
     <string name="navigation_drawer_edit_filters">FILTERS (EDIT)</string>
     <string name="navigation_drawer_edit_feeds">FEEDS (EDIT)</string>
     <string name="article_feedback_saved">Feedback saved.</string>
+    <string name="feeds_activity_add_feed">Add feed</string>
+    <string name="feeds_activity_url">URL:</string>
+    <string name="filter_settings_title">Title</string>
+    <string name="filter_settings_new_title">New title:</string>
 </resources>