various lint stuff; fix layout of directory picker

12 files changed, 83 insertions, 87 deletions

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
index 179ac49..9644d11 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
@@ -499,9 +499,9 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 		};
 	
 		String comicsDir = m_prefs.getString("comics_directory", null);
-		
+
 		if (comicsDir != null && m_activity.isStorageAvailable()) {
-            if (m_swipeLayout != null) m_swipeLayout.setRefreshing(true);
+			if (m_swipeLayout != null) m_swipeLayout.setRefreshing(true);
 
             rescanTask.execute(m_baseDirectory.length() > 0 ? m_baseDirectory : comicsDir);
 		}
@@ -524,8 +524,8 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 		}
 
 		m_activity.setTitle(comicsDir.equals(m_baseDirectory) ? getString(R.string.app_name) : new File(m_baseDirectory).getName());
-    }
-	
+	}
+
 	public void onItemClick(AdapterView<?> av, View view, int position, long id) {
 		//Log.d(TAG, "onItemClick position=" + position);
 		
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
index d0fe0f4..8238b29 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
@@ -11,7 +11,6 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteStatement;
 import android.graphics.BitmapFactory;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.preference.PreferenceManager;
@@ -105,7 +104,7 @@ public class CommonActivity extends ActionBarActivity {
 	    	if (googleAccount != null) {
 	    		m_syncClient.setOwner(googleAccount);    			
 	    	} else {
-	    		if (Build.HARDWARE.contains("goldfish")) {		    		
+	    		if (BuildConfig.DEBUG) {
 		    		m_syncClient.setOwner("TEST-ACCOUNT");	    			
 		    		
 		    		//toast(R.string.sync_running_in_test_mode);
@@ -115,7 +114,7 @@ public class CommonActivity extends ActionBarActivity {
 	    			    		
 	    			SharedPreferences.Editor editor = m_prefs.edit();
 	    			editor.putBoolean("use_position_sync", false);
-	    			editor.commit();
+	    			editor.apply();
 	    		}
 	    	}
     	} else {
@@ -123,16 +122,6 @@ public class CommonActivity extends ActionBarActivity {
     	}
 	}
 
-	protected void setSmallScreen(boolean smallScreen) {
-		Log.d(TAG, "m_smallScreenMode=" + smallScreen);
-		m_smallScreenMode = smallScreen;
-	}
-
-	public boolean isSmallScreen() {
-		return m_smallScreenMode;
-	}
-
-	
 	public void onComicArchiveSelected(String fileName) {
 		//
 	}
@@ -142,7 +131,7 @@ public class CommonActivity extends ActionBarActivity {
 
 		Cursor c = getReadableDb().query("comics_cache", null,
 				"filename = ? AND path = ?",
-				new String[] { file.getName(), file.getParentFile().getAbsolutePath() }, null, null, null);
+				new String[]{file.getName(), file.getParentFile().getAbsolutePath()}, null, null, null);
 
 		if (c.moveToFirst()) {
 			return c;
@@ -186,23 +175,6 @@ public class CommonActivity extends ActionBarActivity {
 		}
 	}
 
-	public void setChecksum(String fileName, String checksum) {
-		Cursor c = findComicByFileName(fileName);
-		
-		if (c != null) {
-			c.close();
-			
-			File file = new File(fileName);
-			
-			SQLiteStatement stmt = getWritableDb().compileStatement("UPDATE comics_cache SET checksum = ? WHERE filename = ? AND path = ?");
-			stmt.bindString(1, checksum);
-			stmt.bindString(2, file.getName());
-			stmt.bindString(3, file.getParentFile().getAbsolutePath());
-			stmt.execute();
-			stmt.close();
-		}
-	}
-
 	public void resetProgress(final String fileName) {
 		
 		if (m_prefs.getBoolean("use_position_sync", false) && m_syncClient.hasOwner()) {
@@ -218,10 +190,10 @@ public class CommonActivity extends ActionBarActivity {
 			           }
 			       })
 			       .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-			           public void onClick(DialogInterface dialog, int id) {
-			                dialog.cancel();			                
-			           }
-			       });
+					   public void onClick(DialogInterface dialog, int id) {
+						   dialog.cancel();
+					   }
+				   });
 			AlertDialog alert = builder.create();
 			alert.show();
 		
@@ -268,27 +240,7 @@ public class CommonActivity extends ActionBarActivity {
 		}	
 	}
 
-	public String getChecksum(String fileName) { 
-		String checksum = null;
-		
-		File file = new File(fileName);
-		
-		Cursor c = getReadableDb().query("comics_cache", new String[] { "checksum" },
-				"filename = ? AND path = ?",
-				new String[] { file.getName(), file.getParentFile().getAbsolutePath() }, null, null, null);
-
-		if (c.moveToFirst()) {
-			checksum = c.getString(c.getColumnIndex("checksum"));
-		}
-
-		c.close();
-		
-		return checksum;
-
-	}
-
-	
-	public int getLastPosition(String fileName) { 
+	public int getLastPosition(String fileName) {
 		int position = 0;
 		
 		File file = new File(fileName);
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CompatListActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CompatListActivity.java
new file mode 100644
index 0000000..759918b
--- /dev/null
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CompatListActivity.java
@@ -0,0 +1,33 @@
+package org.fox.ttcomics2;
+
+import android.support.v7.app.ActionBarActivity;
+import android.widget.HeaderViewListAdapter;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+
+// http://stackoverflow.com/questions/18403647/actionbaractivity-of-android-support-v7-appcompat-and-listactivity-in-same-act
+
+public abstract class CompatListActivity extends ActionBarActivity {
+
+    private ListView mListView;
+
+    protected ListView getListView() {
+        if (mListView == null) {
+            mListView = (ListView) findViewById(android.R.id.list);
+        }
+        return mListView;
+    }
+
+    protected void setListAdapter(ListAdapter adapter) {
+        getListView().setAdapter(adapter);
+    }
+
+    protected ListAdapter getListAdapter() {
+        ListAdapter adapter = getListView().getAdapter();
+        if (adapter instanceof HeaderViewListAdapter) {
+            return ((HeaderViewListAdapter)adapter).getWrappedAdapter();
+        } else {
+            return adapter;
+        }
+    }
+}
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DirectoryPicker.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DirectoryPicker.java
index 48f6ad9..d2ca379 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DirectoryPicker.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DirectoryPicker.java
@@ -1,10 +1,10 @@
 package org.fox.ttcomics2;
 
-import android.app.ListActivity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
@@ -39,7 +39,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
  */
 
-public class DirectoryPicker extends ListActivity {
+public class DirectoryPicker extends CompatListActivity {
 
 	public static final String START_DIR = "startDir";
 	public static final String ONLY_DIRS = "onlyDirs";
@@ -68,6 +68,8 @@ public class DirectoryPicker extends ListActivity {
         }
         
         setContentView(R.layout.chooser_list);
+		setSupportActionBar((Toolbar)findViewById(R.id.actionbar_toolbar));
+
         setTitle(dir.getAbsolutePath());
         Button btnChoose = (Button) findViewById(R.id.btnChoose);
         String name = dir.getName();
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
index 5566a2f..d2ea6fc 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
@@ -25,7 +25,7 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
     private final static int TRIAL_DAYS = 7;
 	
 	private int m_selectedTab;
-	//private String m_baseDirectory = "";
+	private String m_rootDirectory = "";
     private MaterialTabHost tabHost;
 
     @SuppressLint("NewApi")
@@ -33,6 +33,8 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+		m_rootDirectory = m_prefs.getString("comics_directory", "");
+
         setContentView(R.layout.activity_main);
 		setSupportActionBar((Toolbar) findViewById(R.id.actionbar_toolbar));
         setTitle(R.string.app_name);
@@ -119,7 +121,19 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
 
         //((ViewGroup)findViewById(R.id.comics_list)).setLayoutTransition(new LayoutTransition());
     }
-    
+
+	@Override
+	public void onResume() {
+		super.onResume();
+
+		if (!m_rootDirectory.equals(m_prefs.getString("comics_directory", ""))) {
+			Log.d(TAG, "root directory changed, restarting");
+
+			finish();
+			startActivity(getIntent());
+		}
+	}
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.activity_main, menu);
@@ -160,14 +174,6 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
 		File file = new File(fileName);
 		
 		if (file.isDirectory()) {
-			/*Intent intent = new Intent(MainActivity.this,
-					MainActivity.class);
-
-			intent.putExtra("baseDir", fileName);
-			intent.putExtra("selectedTab", m_selectedTab);
-
-			startActivityForResult(intent, 0);*/
-
 			FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
 
 			ComicListFragment frag = new ComicListFragment();
@@ -228,13 +234,6 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
 
         if (m_selectedTab != tab.getPosition() && m_selectedTab != -1) {
 
-            //ComicListFragment frag = new ComicListFragment();
-			//frag.setMode(tab.getPosition());
-
-            //frag.setBaseDirectory(m_baseDirectory);
-
-            //sft.replace(R.id.comics_list, frag, FRAG_COMICS_LIST);
-
 			ComicListFragment frag = (ComicListFragment) getSupportFragmentManager().findFragmentByTag(FRAG_COMICS_LIST);
 
 			if (frag != null && frag.isAdded()) {
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
index 2100000..9129149 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
@@ -51,7 +51,7 @@ public class PreferencesActivity extends CommonActivity {
 
             SharedPreferences.Editor editor = prefs.edit();
             editor.putString("comics_directory", path);
-            editor.commit();
+            editor.apply();
 
         }
     }
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java
index cc0b0fc..47d62a6 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesFragment.java
@@ -105,7 +105,7 @@ public class PreferencesFragment extends PreferenceFragment {
 
                                         SharedPreferences.Editor editor = prefs.edit();
                                         editor.putBoolean("use_position_sync", false);
-                                        editor.commit();
+                                        editor.apply();
 
                                         Toast toast = Toast.makeText(getActivity(), R.string.error_sync_no_account, Toast.LENGTH_SHORT);
                                         toast.show();
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
index e93df1c..a40cf30 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
@@ -185,7 +185,7 @@ public class ViewComicActivity extends CommonActivity {
 			SharedPreferences.Editor editor = m_prefs.edit();
 			editor.putBoolean("prefs_lock_orientation", locked);
 			editor.putInt("last_orientation", getResources().getConfiguration().orientation);
-			editor.commit();
+			editor.apply();
 		}
 	}
 	
diff --git a/org.fox.ttcomics/src/main/res/layout/chooser_list.xml b/org.fox.ttcomics/src/main/res/layout/chooser_list.xml
index 4200bc9..0b93edd 100644
--- a/org.fox.ttcomics/src/main/res/layout/chooser_list.xml
+++ b/org.fox.ttcomics/src/main/res/layout/chooser_list.xml
@@ -4,6 +4,8 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
+    <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
+
     <ListView
         android:id="@android:id/list"
         android:layout_width="fill_parent"
@@ -12,11 +14,13 @@
 
     <LinearLayout
         android:id="@+id/linearLayout2"
+        style="?android:attr/buttonBarStyle"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" >
 
         <Button
             android:id="@+id/btnParent"
+            style="?android:attr/buttonBarButtonStyle"
             android:layout_width="fill_parent"
             android:layout_weight="1"
             android:layout_height="wrap_content"
@@ -24,6 +28,7 @@
 
         <Button
             android:id="@+id/btnChoose"
+            style="?android:attr/buttonBarButtonStyle"
             android:layout_weight="1"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml
index 63ba73b..bae39e0 100755
--- a/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml
+++ b/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-android:id="@+id/comics_pager_container"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/comics_pager_container"
 android:layout_width="fill_parent"
     android:animateLayoutChanges="true"
 android:layout_height="fill_parent" >
@@ -39,7 +40,8 @@ android:layout_height="fill_parent" >
             android:singleLine="true"
             android:layout_alignTop="@+id/comics_seek_bar"
             android:gravity="center"
-            android:layout_alignBottom="@+id/comics_seek_bar" />
+            android:layout_alignBottom="@+id/comics_seek_bar"
+            tools:ignore="HardcodedText" />
 
         <TextView
             android:layout_width="60dp"
@@ -53,7 +55,8 @@ android:layout_height="fill_parent" >
             android:layout_alignParentStart="true"
             android:layout_alignParentBottom="false"
             android:layout_alignTop="@+id/comics_seek_bar"
-            android:layout_alignBottom="@+id/comics_seek_bar" />
+            android:layout_alignBottom="@+id/comics_seek_bar"
+            tools:ignore="HardcodedText" />
 
 
     </RelativeLayout>
diff --git a/org.fox.ttcomics/src/main/res/menu/comic_archive_context.xml b/org.fox.ttcomics/src/main/res/menu/comic_archive_context.xml
index 9a39898..9954036 100644
--- a/org.fox.ttcomics/src/main/res/menu/comic_archive_context.xml
+++ b/org.fox.ttcomics/src/main/res/menu/comic_archive_context.xml
@@ -1,8 +1,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/menu_mark_as_read"
-        android:title="Mark as read" />
+        android:title="@string/mark_as_read" />
     
     <item android:id="@+id/menu_reset_progress"
-        android:title="Reset progress" />
+        android:title="@string/reset_progress" />
     
 </menu>
diff --git a/org.fox.ttcomics/src/main/res/values/strings.xml b/org.fox.ttcomics/src/main/res/values/strings.xml
index baf00e5..e17e397 100755
--- a/org.fox.ttcomics/src/main/res/values/strings.xml
+++ b/org.fox.ttcomics/src/main/res/values/strings.xml
@@ -68,4 +68,6 @@
     <string name="prefs_build_timestamp">%1$s</string>
     <string name="prefs_build_timestamp_title">Build timestamp</string>
     <string name="crash_dialog_text">Unfortunately, Pow! Comics Reader has stopped. Submit crash report to tt-rss.org?</string>
+    <string name="mark_as_read">Mark as read</string>
+    <string name="reset_progress">Reset progress</string>
 </resources>
\ No newline at end of file