From 2ac21be7057a448b81f7108e5dffc5609ca8181c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 31 May 2017 08:25:28 +0300
Subject: remove material tabs library (doesn't seem to work on 7.x)

---
 org.fox.ttcomics/build.gradle                      |  1 -
 org.fox.ttcomics/org.fox.ttcomics.iml              |  3 +-
 .../main/java/org/fox/ttcomics2/MainActivity.java  | 32 ++++++++++------------
 .../src/main/res/layout/activity_main.xml          | 10 -------
 4 files changed, 16 insertions(+), 30 deletions(-)

(limited to 'org.fox.ttcomics')

diff --git a/org.fox.ttcomics/build.gradle b/org.fox.ttcomics/build.gradle
index 6e3f0b3..70a2c7a 100755
--- a/org.fox.ttcomics/build.gradle
+++ b/org.fox.ttcomics/build.gradle
@@ -28,7 +28,6 @@ dependencies {
     compile 'com.android.support:support-v4:25.3.1'
     compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.android.support:cardview-v7:25.3.1'
-    compile 'it.neokree:MaterialTabs:0.11'
     compile 'com.shamanland:fab:0.0.5'
     compile 'jp.co.recruit_mp:android-HeaderFooterGridView:0.2.4'
     compile files('libs/universal-image-loader-1.9.3.jar')
diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml
index 7e5b8f3..37cac3f 100755
--- a/org.fox.ttcomics/org.fox.ttcomics.iml
+++ b/org.fox.ttcomics/org.fox.ttcomics.iml
@@ -78,6 +78,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
@@ -111,7 +112,6 @@
     <orderEntry type="library" exported="" name="lib-core-3.1.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="android-ui-1.2" level="project" />
     <orderEntry type="library" exported="" name="view-pager-transforms-1.2.32" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
@@ -120,6 +120,5 @@
     <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
-    <orderEntry type="library" exported="" name="MaterialTabs-0.11" level="project" />
   </component>
 </module>
\ No newline at end of file
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 8a961f2..2dd75d3 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
@@ -29,16 +29,11 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import it.neokree.materialtabs.MaterialTab;
-import it.neokree.materialtabs.MaterialTabHost;
-import it.neokree.materialtabs.MaterialTabListener;
-
-public class MainActivity extends CommonActivity implements MaterialTabListener, SharedPreferences.OnSharedPreferenceChangeListener {
+public class MainActivity extends CommonActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
 	private final String TAG = this.getClass().getSimpleName();
-    private final static int TRIAL_DAYS = 7;
-	
+
 	private int m_selectedTab;
-    private MaterialTabHost tabHost;
+    //private MaterialTabHost tabHost;
 	private ProgressDialog m_progressDialog;
 	private boolean m_needRestart;
 
@@ -73,11 +68,12 @@ public class MainActivity extends CommonActivity implements MaterialTabListener,
 
 		setContentView(R.layout.activity_main);
 		setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
+
 		setTitle(R.string.app_name);
 
 		m_progressDialog = new ProgressDialog(this);
 
-		tabHost = (MaterialTabHost) this.findViewById(R.id.materialTabHost);
+		//tabHost = (MaterialTabHost) this.findViewById(R.id.materialTabHost);
 
 		if (savedInstanceState == null) {
 			m_selectedTab = getIntent().getIntExtra("selectedTab", 0);
@@ -102,7 +98,7 @@ public class MainActivity extends CommonActivity implements MaterialTabListener,
 
 		m_selectedTab = -1;
 
-		tabHost.addTab(tabHost.newTab()
+		/*tabHost.addTab(tabHost.newTab()
 				.setText(getString(R.string.tab_all_comics))
 				.setTabListener(this));
 
@@ -116,7 +112,9 @@ public class MainActivity extends CommonActivity implements MaterialTabListener,
 
 		tabHost.addTab(tabHost.newTab()
 				.setText(getString(R.string.tab_read))
-				.setTabListener(this));
+				.setTabListener(this));*/
+
+
 
 		if (savedInstanceState != null) {
 			m_selectedTab = savedInstanceState.getInt("selectedTab");
@@ -124,8 +122,8 @@ public class MainActivity extends CommonActivity implements MaterialTabListener,
 			m_selectedTab = getIntent().getIntExtra("selectedTab", 0);
 		}
 
-		if (m_selectedTab != -1)
-			tabHost.setSelectedNavigationItem(m_selectedTab);
+		/*if (m_selectedTab != -1)
+			tabHost.setSelectedNavigationItem(m_selectedTab);*/
 
 
 		String[] permissions;
@@ -370,7 +368,7 @@ public class MainActivity extends CommonActivity implements MaterialTabListener,
 	    super.onActivityResult(requestCode, resultCode, intent);
 	}
 
-    @Override
+    /*@Override
     public void onTabSelected(MaterialTab tab) {
 
         tabHost.setSelectedNavigationItem(tab.getPosition());
@@ -390,9 +388,9 @@ public class MainActivity extends CommonActivity implements MaterialTabListener,
         m_selectedTab = tab.getPosition();
 
         sft.commit();
-    }
+    }*/
 
-    @Override
+    /*@Override
     public void onTabReselected(MaterialTab materialTab) {
 
     }
@@ -400,7 +398,7 @@ public class MainActivity extends CommonActivity implements MaterialTabListener,
     @Override
     public void onTabUnselected(MaterialTab materialTab) {
 
-    }
+    }*/
 
 	private void updateComicsList() {
 		ComicListFragment frag = (ComicListFragment) getSupportFragmentManager().findFragmentByTag(FRAG_COMICS_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 442434a..1c05df7 100755
--- a/org.fox.ttcomics/src/main/res/layout/activity_main.xml
+++ b/org.fox.ttcomics/src/main/res/layout/activity_main.xml
@@ -2,20 +2,10 @@
     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/toolbar" android:id="@+id/toolbar" />
 
-    <it.neokree.materialtabs.MaterialTabHost
-        android:elevation="4dp"
-        android:id="@+id/materialTabHost"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        app:textColor="@android:color/primary_text_dark"
-        app:primaryColor="?colorPrimary"
-        app:accentColor="?colorAccent" />
-
     <FrameLayout
         android:id="@+id/comics_list"
         android:layout_width="match_parent"
-- 
cgit v1.2.3