Skip to content

Commit 94c9dd1

Browse files
committed
General cleanup
- Removed unused resources - Cleaned up styles (mostly removing default stuff) - Improved and corrected method documentation - Minor refactoring of min method
1 parent d7fd49c commit 94c9dd1

21 files changed

Lines changed: 81 additions & 130 deletions

File tree

ViewPagerTransformsExample/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
android:allowBackup="true"
1313
android:icon="@drawable/ic_launcher"
1414
android:label="@string/app_name"
15-
android:theme="@style/AppTheme" >
15+
android:theme="@style/AppBaseTheme" >
1616
<activity
1717
android:name="com.ToxicBakery.viewpager.transforms.example.MainActivity"
1818
android:label="@string/app_name" >
-650 KB
Binary file not shown.
-9.18 KB
Binary file not shown.
-5.11 KB
Binary file not shown.

ViewPagerTransformsExample/res/layout/fragment_main.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
55
android:gravity="center"
6-
android:paddingBottom="@dimen/activity_vertical_margin"
7-
android:paddingLeft="@dimen/activity_horizontal_margin"
8-
android:paddingRight="@dimen/activity_horizontal_margin"
9-
android:paddingTop="@dimen/activity_vertical_margin"
106
android:text="@string/app_name"
11-
android:textColor="?android:attr/colorBackground"
7+
android:textColor="@android:color/white"
128
android:textSize="72sp"
139
tools:context="com.ToxicBakery.viewpager.transforms.example.MainActivity$PlaceholderFragment" />

ViewPagerTransformsExample/res/values-w820dp/dimens.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

ViewPagerTransformsExample/res/values/dimens.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<style name="AppBaseTheme" parent="android:Theme.Holo">
5+
<item name="android:windowBackground">@android:color/background_light</item>
6+
<item name="android:actionBarStyle">@style/DarkActionBar</item>
7+
</style>
8+
9+
<style name="DarkActionBar" parent="@android:style/Widget.Holo.ActionBar">
10+
<item name="android:background">@android:color/background_dark</item>
11+
</style>
12+
13+
</resources>

ViewPagerTransformsExample/res/values/styles.xml

Lines changed: 0 additions & 20 deletions
This file was deleted.

ViewPagerTransformsExample/src/com/ToxicBakery/viewpager/transforms/example/MainActivity.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,23 @@ public class MainActivity extends Activity implements OnNavigationListener {
4141
private static final ArrayList<TransformerItem> TRANSFORM_CLASSES;
4242

4343
static {
44-
TRANSFORM_CLASSES = new ArrayList<>();
44+
TRANSFORM_CLASSES = new ArrayList<TransformerItem>();
4545
TRANSFORM_CLASSES.add(new TransformerItem(DefaultTransformer.class));
4646
TRANSFORM_CLASSES.add(new TransformerItem(AccordionTransformer.class));
4747
TRANSFORM_CLASSES.add(new TransformerItem(BackgroundToForegroundTransformer.class));
48-
TRANSFORM_CLASSES.add(new TransformerItem(DepthPageTransformer.class));
49-
TRANSFORM_CLASSES.add(new TransformerItem(ForegroundToBackgroundTransformer.class));
5048
TRANSFORM_CLASSES.add(new TransformerItem(CubeInTransformer.class));
5149
TRANSFORM_CLASSES.add(new TransformerItem(CubeOutTransformer.class));
50+
TRANSFORM_CLASSES.add(new TransformerItem(DepthPageTransformer.class));
5251
TRANSFORM_CLASSES.add(new TransformerItem(FlipHorizontalTransformer.class));
5352
TRANSFORM_CLASSES.add(new TransformerItem(FlipVerticalTransformer.class));
53+
TRANSFORM_CLASSES.add(new TransformerItem(ForegroundToBackgroundTransformer.class));
5454
TRANSFORM_CLASSES.add(new TransformerItem(RotateDownTransformer.class));
5555
TRANSFORM_CLASSES.add(new TransformerItem(RotateUpTransformer.class));
5656
TRANSFORM_CLASSES.add(new TransformerItem(StackTransformer.class));
5757
TRANSFORM_CLASSES.add(new TransformerItem(TabletTransformer.class));
5858
TRANSFORM_CLASSES.add(new TransformerItem(ZoomInTransformer.class));
59-
TRANSFORM_CLASSES.add(new TransformerItem(ZoomOutTranformer.class));
6059
TRANSFORM_CLASSES.add(new TransformerItem(ZoomOutSlideTransformer.class));
60+
TRANSFORM_CLASSES.add(new TransformerItem(ZoomOutTranformer.class));
6161
}
6262

6363
private int mSelectedItem;
@@ -74,8 +74,8 @@ protected void onCreate(Bundle savedInstanceState) {
7474
selectedPage = savedInstanceState.getInt(KEY_SELECTED_PAGE);
7575
}
7676

77-
final ArrayAdapter<TransformerItem> actionBarAdapter = new ArrayAdapter<>(getApplicationContext(),
78-
android.R.layout.simple_list_item_1, android.R.id.text1, TRANSFORM_CLASSES);
77+
final ArrayAdapter<TransformerItem> actionBarAdapter = new ArrayAdapter<TransformerItem>(
78+
getApplicationContext(), android.R.layout.simple_list_item_1, android.R.id.text1, TRANSFORM_CLASSES);
7979

8080
final ActionBar actionBar = getActionBar();
8181
actionBar.setListNavigationCallbacks(actionBarAdapter, this);

0 commit comments

Comments
 (0)