diff options
Diffstat (limited to 'org.fox.ttcomics/src')
13 files changed, 114 insertions, 89 deletions
diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml index 184abc9..5e15002 100755 --- a/org.fox.ttcomics/src/main/AndroidManifest.xml +++ b/org.fox.ttcomics/src/main/AndroidManifest.xml @@ -5,7 +5,7 @@ <uses-sdk
android:minSdkVersion="16"
- android:targetSdkVersion="19" />
+ android:targetSdkVersion="21" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
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);
diff --git a/org.fox.ttcomics/src/main/res/layout-land/fragment_comics_list.xml b/org.fox.ttcomics/src/main/res/layout-land/fragment_comics_list.xml index 53a2e0a..dbfb649 100644 --- a/org.fox.ttcomics/src/main/res/layout-land/fragment_comics_list.xml +++ b/org.fox.ttcomics/src/main/res/layout-land/fragment_comics_list.xml @@ -1,8 +1,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/FrameLayout4"
android:layout_width="fill_parent"
- android:layout_height="fill_parent" >
+ android:layout_height="fill_parent">
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/comics_swipe_container"
@@ -28,7 +27,7 @@ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:text="@string/error_no_comic_arhives_found_" />
+ android:text="@string/error_no_comic_archives_found_" />
</LinearLayout>
</FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml b/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml index b8310c9..ebbc43e 100644 --- a/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml +++ b/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml @@ -1,10 +1,18 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
+<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"
- android:layout_height="match_parent" >
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_height="match_parent">
+ <it.neokree.materialtabs.MaterialTabHost
+ android:id="@+id/materialTabHost"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ app:textColor="#FFFFFF"
+ app:primaryColor="?colorPrimary"
+ app:accentColor="?colorAccent" />
<FrameLayout
android:id="@+id/comics_list"
@@ -19,5 +27,5 @@ android:layout_height="wrap_content"
android:visibility="gone"
android:text="" />
-
-</FrameLayout>
\ No newline at end of file +
+</LinearLayout>
diff --git a/org.fox.ttcomics/src/main/res/layout-sw600dp/fragment_comics_list.xml b/org.fox.ttcomics/src/main/res/layout-sw600dp/fragment_comics_list.xml index 547b461..1ddf6c3 100644 --- a/org.fox.ttcomics/src/main/res/layout-sw600dp/fragment_comics_list.xml +++ b/org.fox.ttcomics/src/main/res/layout-sw600dp/fragment_comics_list.xml @@ -1,8 +1,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/FrameLayout4"
android:layout_width="fill_parent"
- android:layout_height="fill_parent" >
+ android:layout_height="fill_parent">
<android.support.v4.widget.SwipeRefreshLayout
@@ -29,7 +28,7 @@ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:text="@string/error_no_comic_arhives_found_" />
+ android:text="@string/error_no_comic_archives_found_" />
</LinearLayout>
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 49a8732..982e7a1 100644 --- a/org.fox.ttcomics/src/main/res/layout/activity_main.xml +++ b/org.fox.ttcomics/src/main/res/layout/activity_main.xml @@ -1,9 +1,18 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
+<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"
- android:layout_height="match_parent" >
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_height="match_parent">
+
+ <it.neokree.materialtabs.MaterialTabHost
+ android:id="@+id/materialTabHost"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ app:textColor="#FFFFFF"
+ app:primaryColor="?colorPrimary"
+ app:accentColor="?colorAccent" />
<FrameLayout
android:id="@+id/comics_list"
@@ -12,4 +21,4 @@ </FrameLayout>
-</FrameLayout>
\ No newline at end of file +</LinearLayout>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml index 0b7871f..e557871 100644 --- a/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml +++ b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml @@ -7,6 +7,7 @@ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
+ card_view:cardUseCompatPadding="true"
card_view:cardElevation="2dp"
tools:ignore="HardcodedText" >
@@ -40,6 +41,7 @@ android:paddingBottom="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:visibility="gone"
android:layout_weight="0"
android:src="@drawable/ic_action_overflow" />
diff --git a/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml index 7830de1..382a9a9 100644 --- a/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml +++ b/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml @@ -1,8 +1,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/FrameLayout4"
android:layout_width="fill_parent"
- android:layout_height="fill_parent" >
+ android:layout_height="fill_parent">
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/comics_swipe_container"
@@ -28,7 +27,7 @@ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:text="@string/error_no_comic_arhives_found_" />
+ android:text="@string/error_no_comic_archives_found_" />
</LinearLayout>
</FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/res/menu/activity_main.xml b/org.fox.ttcomics/src/main/res/menu/activity_main.xml index 7956d2c..a7ca037 100644 --- a/org.fox.ttcomics/src/main/res/menu/activity_main.xml +++ b/org.fox.ttcomics/src/main/res/menu/activity_main.xml @@ -1,14 +1,15 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:ugh="http://schemas.android.com/apk/res-auto"> + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_rescan" android:title="@string/menu_rescan" android:icon="@drawable/ic_refresh_light" - ugh:showAsAction="" /> + app:showAsAction="ifRoom" /> <item android:id="@+id/menu_settings" android:title="@string/menu_settings" - android:icon="@drawable/ic_settings" + android:icon="@drawable/ic_settings" + app:showAsAction="ifRoom" android:orderInCategory="100" /> </menu> diff --git a/org.fox.ttcomics/src/main/res/values-v19/style.xml b/org.fox.ttcomics/src/main/res/values-v19/style.xml deleted file mode 100644 index 1caf78d..0000000 --- a/org.fox.ttcomics/src/main/res/values-v19/style.xml +++ /dev/null @@ -1,25 +0,0 @@ -<resources>
-
- <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
- <item name="android:actionBarStyle">@style/ActionBar.Light</item>
- </style>
-
- <style name="ActionBar.Light" parent="Widget.AppCompat.ActionBar.Solid">
- <item name="android:background">#222222</item>
- <item name="android:titleTextStyle">@style/ActionBarText.Light</item>
- </style>
-
- <style name="ActionBarText.Light" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
- <item name="android:textColor">@android:color/white</item>
- </style>
-
- <style name="ViewLightTheme" parent="Theme.AppCompat.Light.DarkActionBar">
- <item name="viewComicsBackground">@android:color/transparent</item>
- <item name="android:actionBarStyle">@style/ActionBar.Light</item>
- </style>
-
- <style name="ViewDarkTheme" parent="Theme.AppCompat">
- <item name="viewComicsBackground">@android:color/black</item>
- </style>
-
-</resources>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/res/values/strings.xml b/org.fox.ttcomics/src/main/res/values/strings.xml index 6f0a32c..76745b5 100644 --- a/org.fox.ttcomics/src/main/res/values/strings.xml +++ b/org.fox.ttcomics/src/main/res/values/strings.xml @@ -4,7 +4,7 @@ <string name="hello_world">Hello world!</string>
<string name="menu_settings">Settings</string>
<string name="menu_go_location">Go to</string>
- <string name="title_activity_main">Comics Reader</string>
+ <string name="title_activity_main">Pow! Comics Reader</string>
<string name="title_activity_preferences">Settings</string>
<string name="prefs_comics_directory">Comics directory</string>
<string name="prefs_general">General</string>
@@ -40,7 +40,7 @@ <string name="menu_sync_location">Sync to last page read</string>
<string name="share_comic">Share comic</string>
<string name="choose">Choose</string>
- <string name="error_no_comic_arhives_found_">No comic arhives found.</string>
+ <string name="error_no_comic_archives_found_">No comic archives found.</string>
<string name="prefs_use_position_sync">Sync last read pages</string>
<string name="prefs_use_position_sync_summary">Requires at least one Google account on the device. No personally identifiable information is sent.</string>
<string name="error_sync_no_account">No Google account found, sync disabled.</string>
diff --git a/org.fox.ttcomics/src/main/res/values/style.xml b/org.fox.ttcomics/src/main/res/values/style.xml index a62c354..a34281e 100644 --- a/org.fox.ttcomics/src/main/res/values/style.xml +++ b/org.fox.ttcomics/src/main/res/values/style.xml @@ -1,14 +1,18 @@ <resources>
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-
+ <item name="colorPrimary">#D33737</item>
+ <item name="colorPrimaryDark">#B20000</item>
+ <item name="colorAccent">#FF6600</item>
</style>
- <style name="ViewLightTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+ <style name="ViewLightTheme" parent="AppTheme">
<item name="viewComicsBackground">@android:color/transparent</item>
</style>
<style name="ViewDarkTheme" parent="Theme.AppCompat">
+ <item name="colorPrimary">@android:color/black</item>
+ <item name="colorPrimaryDark">@android:color/black</item>
<item name="viewComicsBackground">@android:color/black</item>
</style>
|