Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed ViewPagerIndicator dependency

This commit is contained in:
daniel oeh 2013-08-06 20:02:30 +02:00
parent 95148ace8e
commit e14525a14f
5 changed files with 4 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/about.html
View File

@ -48,9 +48,6 @@
<h2>ActionBarSherlock <a href="http://actionbarsherlock.com" title="Link">(Link)</a></h2>
by Jake Wharton, licensed under the Apache 2.0 license
<h2>Android-ViewPagerIndicator <a href="http://viewpagerindicator.com">(Link)</a></h2>
by Jake Wharton, licensed under the Apache 2.0 license
<h2>NineOldAndroids <a href="http://nineoldandroids.com">(Link)</a></h2>
by Jake Wharton, licensed under the Apache 2.0 license

6
pom.xml
View File

@ -48,12 +48,6 @@
<version>4.1.0</version>
<type>apklib</type>
</dependency>
<dependency>
<groupId>com.viewpagerindicator</groupId>
<artifactId>library</artifactId>
<version>2.3.1</version>
<type>apklib</type>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>annotations</artifactId>

10
res/layout/miroguide_category.xml
View File

@ -5,17 +5,15 @@
android:layout_height="match_parent"
android:orientation="vertical" >
<com.viewpagerindicator.TabPageIndicator
android:id="@+id/tabs"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
/>
<android.support.v4.view.ViewPager
android:id="@+id/viewpager"
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1">
<android.support.v4.view.PagerTabStrip
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top" />
</android.support.v4.view.ViewPager>
</LinearLayout>

22
res/values/styles.xml
View File

@ -2,7 +2,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="Theme.AntennaPod.Light" parent="@style/Theme.Sherlock.Light.ForceOverflow">
<item name="vpiTabPageIndicatorStyle">@style/AntennaPod.LightTabPageIndicator</item>
<item name="attr/action_about">@drawable/action_about</item>
<item name="attr/action_search">@drawable/action_search</item>
<item name="attr/action_settings">@drawable/action_settings</item>
@ -38,21 +37,7 @@
<item name="attr/dragview_float_background">@color/white</item>
</style>
<style name="AntennaPod.TabPageIndicator" parent="Widget.TabPageIndicator">
<item name="android:paddingTop">16dp</item>
<item name="android:paddingLeft">8dp</item>
<item name="android:paddingRight">8dp</item>
<item name="android:paddingBottom">16dp</item>
<item name="android:textSize">12sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="AntennaPod.LightTabPageIndicator" parent="AntennaPod.TabPageIndicator">
<item name="android:textColor">@color/black</item>
</style>
<style name="Theme.AntennaPod.Dark" parent="@style/Theme.Sherlock.ForceOverflow">
<item name="vpiTabPageIndicatorStyle">@style/AntennaPod.DarkTabPageIndicator</item>
<item name="attr/action_about">@drawable/action_about_dark</item>
<item name="attr/action_search">@drawable/action_search_dark</item>
<item name="attr/action_settings">@drawable/action_settings_dark</item>
@ -88,10 +73,6 @@
<item name="attr/dragview_float_background">@color/black</item>
</style>
<style name="AntennaPod.DarkTabPageIndicator" parent="AntennaPod.TabPageIndicator">
<item name="android:textColor">#FFFFFF</item>
</style>
<style name="UndoBar">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">48dp</item>
@ -102,9 +83,7 @@
<item name="android:orientation">horizontal</item>
<item name="android:background">@drawable/undobar</item>
<item name="android:clickable">true</item>
<item name="android:showDividers">middle</item>
<item name="android:divider">@drawable/undobar_divider</item>
<item name="android:dividerPadding">10dp</item>
</style>
<style name="UndoBarMessage">
<item name="android:layout_width">0dp</item>
@ -125,7 +104,6 @@
<item name="android:drawableLeft">@drawable/ic_undobar_undo</item>
<item name="android:drawablePadding">12dp</item>
<item name="android:textAppearance">?android:textAppearanceSmall</item>
<item name="android:textAllCaps">true</item>
<item name="android:textStyle">bold</item>
<item name="android:textColor">#fff</item>
<item name="android:text">@string/undo</item>

4
src/de/danoeh/antennapod/activity/MiroGuideCategoryActivity.java
View File

@ -10,7 +10,6 @@ import android.util.Log;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
import com.viewpagerindicator.TabPageIndicator;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.fragment.MiroGuideChannellistFragment;
@ -28,7 +27,6 @@ public class MiroGuideCategoryActivity extends SherlockFragmentActivity {
private ViewPager viewpager;
private CategoryPagerAdapter pagerAdapter;
private TabPageIndicator tabs;
private String category;
@ -40,14 +38,12 @@ public class MiroGuideCategoryActivity extends SherlockFragmentActivity {
setContentView(R.layout.miroguide_category);
viewpager = (ViewPager) findViewById(R.id.viewpager);
tabs = (TabPageIndicator) findViewById(R.id.tabs);
category = getIntent().getStringExtra(EXTRA_CATEGORY);
if (category != null) {
getSupportActionBar().setTitle(category);
pagerAdapter = new CategoryPagerAdapter(getSupportFragmentManager());
viewpager.setAdapter(pagerAdapter);
tabs.setViewPager(viewpager);
} else {
Log.e(TAG, "Activity was started with invalid arguments");
}