From fef7df0f36e8871a6e2bd36030d5b68a85e91f0e Mon Sep 17 00:00:00 2001
From: Size43
Date: Wed, 10 Jun 2015 11:53:29 +0200
Subject: Fixed all hardcoded strings

---
 app/src/main/java/org/rssin/android/FeedSorterTrainer.java            | 3 ++-
 app/src/main/java/org/rssin/android/FeedsActivity.java                | 4 ++--
 app/src/main/java/org/rssin/android/FilterSettingsActivity.java       | 4 ++--
 app/src/main/java/org/rssin/android/HomeScreenActivity.java           | 2 +-
 .../java/org/rssin/android/NavigationDrawerManageFeedsFragment.java   | 4 ++--
 .../java/org/rssin/android/NavigationDrawerManageFiltersFragment.java | 4 ++--
 app/src/main/res/values/strings.xml                                   | 4 ++++
 7 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'app/src/main')

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>
-- 
cgit v1.2.3