diff options
author | Andrew Dolgov <[email protected]> | 2015-06-10 18:32:18 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-06-10 18:32:18 +0300 |
commit | 4cd46001d98f26aafe4a2e9f611abe11569e25b9 (patch) | |
tree | d6cc115f2bd5e15df86603d3414d1189112ef283 /org.fox.ttcomics/src/main/java | |
parent | b179d6fb38428d5956dd76b009d74a042cc3f3e8 (diff) |
refactor some code/layout names
Diffstat (limited to 'org.fox.ttcomics/src/main/java')
7 files changed, 9 insertions, 33 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); |