refactor some code/layout names

18 files changed, 17 insertions, 77 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 d994e7c..ceb0d9b 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
@@ -248,7 +248,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {    	
 		
-		View view = inflater.inflate(R.layout.fragment_comics_list, container, false);
+		View view = inflater.inflate(R.layout.fragment_comics_grid, container, false);
 		
 		if (savedInstanceState != null) {
 			m_mode = savedInstanceState.getInt("mode");
@@ -317,7 +317,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 	public void onCreateContextMenu(ContextMenu menu, View v,
 	    ContextMenuInfo menuInfo) {
 		
-		getActivity().getMenuInflater().inflate(R.menu.comic_archive_context, menu);
+		getActivity().getMenuInflater().inflate(R.menu.context_comic_archive, menu);
 
 		AdapterContextMenuInfo info = (AdapterContextMenuInfo)menuInfo;
 		
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 af79bdf..efc90dc 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
@@ -16,7 +16,6 @@ import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
-import android.view.Display;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
@@ -42,8 +41,6 @@ public class CommonActivity extends AppCompatActivity {
 	protected SharedPreferences m_prefs;
 	protected SyncClient m_syncClient = new SyncClient();
 
-	private boolean m_smallScreenMode = true;
-	
 	private boolean m_storageAvailable;
 	private boolean m_storageWritable;
 
@@ -318,14 +315,6 @@ public class CommonActivity extends AppCompatActivity {
     
     public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
-		/*case R.id.menu_rescan:
-			ComicListFragment frag = (ComicListFragment) getSupportFragmentManager().findFragmentByTag(FRAG_COMICS_LIST);
-			
-			if (frag != null && frag.isAdded()) {
-				frag.rescan(true);
-			}
-			
-			return true;*/
 		case R.id.menu_settings:
 			Intent intent = new Intent(CommonActivity.this,
 					PreferencesActivity.class);
@@ -338,16 +327,6 @@ public class CommonActivity extends AppCompatActivity {
 		}
 	}
 
-	@SuppressWarnings("deprecation")
-	public boolean isPortrait() {
-		Display display = getWindowManager().getDefaultDisplay(); 
-		
-	    int width = display.getWidth();
-	    int height = display.getHeight();
-		
-	    return width < height;
-	}
-
 	protected static String md5(String s) {
 		try {
 			MessageDigest digest = java.security.MessageDigest.getInstance("MD5");
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 d2ca379..77551f2 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
@@ -67,8 +67,8 @@ public class DirectoryPicker extends CompatListActivity {
             } 
         }
         
-        setContentView(R.layout.chooser_list);
-		setSupportActionBar((Toolbar)findViewById(R.id.actionbar_toolbar));
+        setContentView(R.layout.activity_directory_picker);
+		setSupportActionBar((Toolbar)findViewById(R.id.toolbar));
 
         setTitle(dir.getAbsolutePath());
         Button btnChoose = (Button) findViewById(R.id.btnChoose);
@@ -110,7 +110,7 @@ public class DirectoryPicker extends CompatListActivity {
         
         final ArrayList<File> files = filter(dir.listFiles(), onlyDirs, showHidden);
         String[] names = names(files);
-        setListAdapter(new ArrayAdapter<String>(this, R.layout.list_item, names));        	
+        setListAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, names));
         
 
         lv.setOnItemClickListener(new OnItemClickListener() {
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 61f2b02..8f700a0 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
@@ -42,7 +42,7 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
 		m_useSync = m_prefs.getBoolean("use_position_sync", false);
 
         setContentView(R.layout.activity_main);
-		setSupportActionBar((Toolbar) findViewById(R.id.actionbar_toolbar));
+		setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
         setTitle(R.string.app_name);
 
         tabHost = (MaterialTabHost) this.findViewById(R.id.materialTabHost);
@@ -105,8 +105,6 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
 			       .setCancelable(false)
 			       .setPositiveButton(R.string.dialog_need_prefs_preferences, new DialogInterface.OnClickListener() {
 			           public void onClick(DialogInterface dialog, int id) {
-			   			// launch preferences
-			   			
 			        	   Intent intent = new Intent(MainActivity.this,
 			        			   PreferencesActivity.class);
 			        	   startActivityForResult(intent, 0);
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 9129149..9aee379 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
@@ -17,8 +17,8 @@ public class PreferencesActivity extends CommonActivity {
 
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.preferences);
-        setSupportActionBar((Toolbar) findViewById(R.id.actionbar_toolbar));;
+        setContentView(R.layout.activity_preferences);
+        setSupportActionBar((Toolbar) findViewById(R.id.toolbar));;
 
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setHomeButtonEnabled(true);
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 47d62a6..a3f16b5 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
@@ -29,7 +29,6 @@ public class PreferencesFragment extends PreferenceFragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.preferences);
 
     }
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 eb769f2..56fd182 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
@@ -53,7 +53,7 @@ public class ViewComicActivity extends CommonActivity {
         }
 
         setContentView(R.layout.activity_view_comic);
-		setSupportActionBar((Toolbar) findViewById(R.id.actionbar_toolbar));;
+		setSupportActionBar((Toolbar) findViewById(R.id.toolbar));;
 
 		if (m_prefs.getBoolean("use_full_screen", false)) {
 			hideSystemUI(true);
diff --git a/org.fox.ttcomics/src/main/res/layout/chooser_list.xml b/org.fox.ttcomics/src/main/res/layout/activity_directory_picker.xml
index 0b93edd..f738785 100644
--- a/org.fox.ttcomics/src/main/res/layout/chooser_list.xml
+++ b/org.fox.ttcomics/src/main/res/layout/activity_directory_picker.xml
@@ -4,7 +4,7 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
+    <include layout="@layout/toolbar" android:id="@+id/toolbar" />
 
     <ListView
         android:id="@android:id/list"
diff --git a/org.fox.ttcomics/src/main/res/layout/activity_main.xml b/org.fox.ttcomics/src/main/res/layout/activity_main.xml
index 3eb66bc..442434a 100755
--- a/org.fox.ttcomics/src/main/res/layout/activity_main.xml
+++ b/org.fox.ttcomics/src/main/res/layout/activity_main.xml
@@ -1,12 +1,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/FrameLayout1"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent">
 
-    <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
+    <include layout="@layout/toolbar" android:id="@+id/toolbar" />
 
     <it.neokree.materialtabs.MaterialTabHost
         android:elevation="4dp"
diff --git a/org.fox.ttcomics/src/main/res/layout/preferences.xml b/org.fox.ttcomics/src/main/res/layout/activity_preferences.xml
index 55b82d5..f54fcd1 100644
--- a/org.fox.ttcomics/src/main/res/layout/preferences.xml
+++ b/org.fox.ttcomics/src/main/res/layout/activity_preferences.xml
@@ -12,9 +12,9 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentBottom="true"
-        android:layout_below="@+id/actionbar_toolbar">
+        android:layout_below="@+id/toolbar">
     </FrameLayout>
 
-    <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
+    <include layout="@layout/toolbar" android:id="@+id/toolbar" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/layout/activity_view_comic.xml b/org.fox.ttcomics/src/main/res/layout/activity_view_comic.xml
index 7451f23..cba6feb 100644
--- a/org.fox.ttcomics/src/main/res/layout/activity_view_comic.xml
+++ b/org.fox.ttcomics/src/main/res/layout/activity_view_comic.xml
@@ -1,5 +1,4 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/FrameLayout2"
     android:animateLayoutChanges="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -11,6 +10,6 @@
 
     </FrameLayout>
 
-    <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
+    <include layout="@layout/toolbar" android:id="@+id/toolbar" />
   
 </FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/layout/dialog_location.xml b/org.fox.ttcomics/src/main/res/layout/dialog_location.xml
index 4b946d3..733e4bc 100644
--- a/org.fox.ttcomics/src/main/res/layout/dialog_location.xml
+++ b/org.fox.ttcomics/src/main/res/layout/dialog_location.xml
@@ -1,5 +1,4 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linearLayout1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical" >
diff --git a/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml
index 59103d4..55c8513 100644
--- a/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml
+++ b/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml
@@ -1,5 +1,4 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/FrameLayout3"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
@@ -8,13 +7,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <!-- <TextView
-        android:id="@+id/comic_page"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|right"
-        android:layout_margin="4dp"
-        android:alpha="0.25"
-        android:text="25" /> -->
-
 </FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comics_grid.xml
index 3266a45..651ad65 100644
--- a/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml
+++ b/org.fox.ttcomics/src/main/res/layout/fragment_comics_grid.xml
@@ -1,6 +1,5 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/FrameLayout4"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
@@ -17,21 +16,6 @@
             android:numColumns="auto_fit" />
     </android.support.v4.widget.SwipeRefreshLayout>
 
-    <!-- <LinearLayout
-        android:id="@+id/no_comics"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/textView1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/error_no_comic_archives_found_" />
-    </LinearLayout> -->
-
     <com.shamanland.fab.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="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 bae39e0..41e79c5 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
@@ -2,9 +2,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/comics_pager_container"
-android:layout_width="fill_parent"
+    android:layout_width="fill_parent"
     android:animateLayoutChanges="true"
-android:layout_height="fill_parent" >
+    android:layout_height="fill_parent" >
 
     <org.fox.ttcomics2.ViewPager
         xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/org.fox.ttcomics/src/main/res/layout/list_item.xml b/org.fox.ttcomics/src/main/res/layout/list_item.xml
deleted file mode 100644
index f0958d6..0000000
--- a/org.fox.ttcomics/src/main/res/layout/list_item.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:padding="10dp"
-    android:textSize="16sp" >
-</TextView>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/layout/actionbar_toolbar.xml b/org.fox.ttcomics/src/main/res/layout/toolbar.xml
index 2e82015..3f24ba4 100644
--- a/org.fox.ttcomics/src/main/res/layout/actionbar_toolbar.xml
+++ b/org.fox.ttcomics/src/main/res/layout/toolbar.xml
@@ -2,7 +2,7 @@
 <android.support.v7.widget.Toolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/actionbar_toolbar"
+    android:id="@+id/toolbar"
     app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
     app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
     android:elevation="4dp"
diff --git a/org.fox.ttcomics/src/main/res/menu/comic_archive_context.xml b/org.fox.ttcomics/src/main/res/menu/context_comic_archive.xml
index 58bf58f..58bf58f 100644
--- a/org.fox.ttcomics/src/main/res/menu/comic_archive_context.xml
+++ b/org.fox.ttcomics/src/main/res/menu/context_comic_archive.xml