Go to next unfinished string (issue #1)

Author: pryds

res/drawable-hdpi/ic_action_forward.png

@@ -14,6 +14,12 @@
           android:icon="@drawable/ic_action_next_item"
           android:showAsAction="ifRoom"
           android:enabled="false" />
+    
+    <item android:id="@+id/action_nextunfinished"
+          android:title="@string/action_nextunfinished"
+          android:icon="@drawable/ic_action_forward"
+          android:showAsAction="ifRoom"
+          android:enabled="false" />
 
     <item android:id="@+id/action_load"
           android:title="@string/action_load"

res/drawable-mdpi/ic_action_forward.png

@@ -19,6 +19,7 @@
     <string name="meta_files">Files:</string>
     <string name="action_previous">Previous</string>
     <string name="action_next">Next</string>
+    <string name="action_nextunfinished">Next unfinished</string>
     <string name="action_load">Load</string>
     <string name="action_save">Save</string>
     <string name="action_settings">Settings</string>

res/drawable-xhdpi/ic_action_forward.png

@@ -129,6 +129,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
             currentPluralForm = 0;
             updateScreen();
             return true;
+        case R.id.action_nextunfinished:
+            currentString = str.getNextStringInNeedOfWork(currentString);
+            currentPluralForm = 0;
+            updateScreen();
+            return true;
         case R.id.action_settings:
             openSettings();
             return true;
@@ -368,6 +373,9 @@ private void enableInitiallyDisabledViews(boolean enable) {
         MenuItem actionNext = menu.findItem(R.id.action_next);
         actionNext.setEnabled(enable);
 
+        MenuItem actionNextUnfinished = menu.findItem(R.id.action_nextunfinished);
+        actionNextUnfinished.setEnabled(enable);
+        
         MenuItem actionSave = menu.findItem(R.id.action_save);
         actionSave.setEnabled(enable);
 

res/drawable-xxhdpi/ic_action_forward.png

@@ -94,8 +94,6 @@ public void updateHeaderInfo(Activity activity) {
         SharedPreferences pref =
                 PreferenceManager.getDefaultSharedPreferences(activity);
 
-        //TODO: Give warning if preferences (name, email, etc.) are not set
-        
         String[] headerArray = translatedString.get(0).split("\n");
         Vector<String> headerLines = new Vector<String>(Arrays.asList(headerArray));
 
@@ -222,6 +220,10 @@ public boolean isUntranslated() {
         return true;
     }
 
+    public boolean needsWork() {
+        return isUntranslated() || isFuzzy();
+    }
+    
     public boolean isPluralString() {
         return !(untranslatedStringPlural == null ||
                 untranslatedStringPlural.equals(""));

res/menu/main_activity_actions.xml

@@ -55,6 +55,29 @@ public int countUntranslatedStrings() {
         return count;
     }
 
+    public int getNextStringInNeedOfWork(int startingFrom) {
+        if (startingFrom > strings.size())
+            startingFrom = strings.size();
+        
+        if (startingFrom < strings.size()-1) {
+            for (int i = startingFrom+1; i < strings.size(); i++) {
+                if (strings.get(i).needsWork())
+                    return i;
+            }
+        }
+        
+        //if we reach here, no strings needing work were found from startingFrom
+        //and onwards. So, start from 0 instead.
+        for (int i = 0; i < startingFrom; i++) {
+            if (strings.get(i).needsWork())
+                return i;
+        }
+        
+        //if we reach here, no strings needing work were found in the entire
+        //collection.
+        return startingFrom;
+    }
+    
     public int parse(File poFile, Activity activity) {
         Vector<String> poFileLines = new Vector<String>();
         try {