From 46692d0e89300dc067331b24ea043238e648d87b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 7 Feb 2015 22:05:21 +0300 Subject: ~material design~ --- .../main/java/org/fox/ttcomics/MainActivity.java | 102 +++++++++++++-------- .../java/org/fox/ttcomics/ViewComicActivity.java | 3 +- 2 files changed, 67 insertions(+), 38 deletions(-) (limited to 'org.fox.ttcomics/src/main/java/org') diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/MainActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/MainActivity.java index 62cf046..7e05c8b 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/MainActivity.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/MainActivity.java @@ -1,7 +1,6 @@ package org.fox.ttcomics; -import android.animation.LayoutTransition; import android.annotation.SuppressLint; import android.app.AlertDialog; import android.content.DialogInterface; @@ -9,25 +8,27 @@ import android.content.Intent; import android.os.Bundle; import android.support.v4.app.FragmentTransaction; import android.support.v7.app.ActionBar; -import android.support.v7.app.ActionBar.Tab; import android.util.Log; import android.view.Menu; import android.view.MenuItem; -import android.view.ViewGroup; -import android.view.Window; import java.io.File; -public class MainActivity extends CommonActivity { +import it.neokree.materialtabs.MaterialTab; +import it.neokree.materialtabs.MaterialTabHost; +import it.neokree.materialtabs.MaterialTabListener; + +public class MainActivity extends CommonActivity implements MaterialTabListener { private final String TAG = this.getClass().getSimpleName(); private final static int TRIAL_DAYS = 7; - private TabListener m_tabListener; + //private TabListener m_tabListener; private int m_selectedTab; private String m_baseDirectory = ""; private String m_fileName = ""; + private MaterialTabHost tabHost; - @SuppressLint("NewApi") + /* @SuppressLint("NewApi") private class TabListener implements ActionBar.TabListener { @Override @@ -60,21 +61,23 @@ public class MainActivity extends CommonActivity { } - } + } */ @SuppressLint("NewApi") @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - requestWindowFeature(Window.FEATURE_PROGRESS); + //requestWindowFeature(Window.FEATURE_PROGRESS); setContentView(R.layout.activity_main); - setProgressBarVisibility(false); + //setProgressBarVisibility(false); setSmallScreen(findViewById(R.id.tablet_layout_hack) == null); - + + tabHost = (MaterialTabHost) this.findViewById(R.id.materialTabHost); + if (savedInstanceState == null) { m_selectedTab = getIntent().getIntExtra("selectedTab", 0); @@ -98,38 +101,34 @@ public class MainActivity extends CommonActivity { m_baseDirectory = savedInstanceState.getString("baseDir"); m_fileName = savedInstanceState.getString("fileName"); } - - m_tabListener = new TabListener(); - - ActionBar actionBar = getSupportActionBar(); - - actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); - - actionBar.addTab(getSupportActionBar().newTab() - .setText(R.string.tab_all_comics) - .setTabListener(m_tabListener)); - actionBar.addTab(getSupportActionBar().newTab() - .setText(R.string.tab_unread) - .setTabListener(m_tabListener)); + tabHost.addTab(tabHost.newTab() + .setText(getString(R.string.tab_all_comics)) + .setTabListener(this)); - actionBar.addTab(getSupportActionBar().newTab() - .setText(R.string.tab_unfinished) - .setTabListener(m_tabListener)); + tabHost.addTab(tabHost.newTab() + .setText(getString(R.string.tab_unread)) + .setTabListener(this)); - actionBar.addTab(getSupportActionBar().newTab() - .setText(R.string.tab_read) - .setTabListener(m_tabListener)); + tabHost.addTab(tabHost.newTab() + .setText(getString(R.string.tab_unfinished)) + .setTabListener(this)); + + tabHost.addTab(tabHost.newTab() + .setText(getString(R.string.tab_read)) + .setTabListener(this)); if (savedInstanceState != null) { m_selectedTab = savedInstanceState.getInt("selectedTab"); } else { m_selectedTab = getIntent().getIntExtra("selectedTab", 0); } - - actionBar.selectTab(actionBar.getTabAt(m_selectedTab)); - - actionBar.setDisplayHomeAsUpEnabled(m_baseDirectory.length() > 0); + + if (m_selectedTab != -1) + tabHost.setSelectedNavigationItem(m_selectedTab); + + ActionBar actionBar = getSupportActionBar(); + actionBar.setDisplayHomeAsUpEnabled(m_baseDirectory.length() > 0); if (m_prefs.getString("comics_directory", null) == null) { AlertDialog.Builder builder = new AlertDialog.Builder(this); @@ -153,7 +152,7 @@ public class MainActivity extends CommonActivity { alert.show(); } - ((ViewGroup)findViewById(R.id.comics_list)).setLayoutTransition(new LayoutTransition()); + //((ViewGroup)findViewById(R.id.comics_list)).setLayoutTransition(new LayoutTransition()); } @Override @@ -235,5 +234,36 @@ public class MainActivity extends CommonActivity { super.onActivityResult(requestCode, resultCode, intent); } - + + @Override + public void onTabSelected(MaterialTab tab) { + + tabHost.setSelectedNavigationItem(tab.getPosition()); + + FragmentTransaction sft = getSupportFragmentManager().beginTransaction(); + + 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); + } + + m_selectedTab = tab.getPosition(); + + sft.commit(); + } + + @Override + public void onTabReselected(MaterialTab materialTab) { + + } + + @Override + public void onTabUnselected(MaterialTab materialTab) { + + } } diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java index fd492f8..dd9ac17 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java @@ -19,7 +19,6 @@ import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.view.Window; import android.view.WindowManager; import android.widget.NumberPicker; @@ -41,7 +40,7 @@ public class ViewComicActivity extends CommonActivity { setTheme(m_prefs.getBoolean("use_dark_theme", false) ? R.style.ViewDarkTheme : R.style.ViewLightTheme); - requestWindowFeature(Window.FEATURE_PROGRESS); + //requestWindowFeature(Window.FEATURE_PROGRESS); if (m_prefs.getBoolean("prevent_screen_sleep", false)) getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); -- cgit v1.2.3