diff --git a/samples/stock/AndroidManifest.xml b/samples/stock/AndroidManifest.xml index 332bde0..4231716 100644 --- a/samples/stock/AndroidManifest.xml +++ b/samples/stock/AndroidManifest.xml @@ -62,6 +62,11 @@ android:icon="@drawable/ic_location_map" android:label="@string/new_york_city" android:theme="@style/AppTheme.TranslucentActionBar" /> - + + diff --git a/samples/stock/res/layout/activity_view_pager.xml b/samples/stock/res/layout/activity_view_pager.xml new file mode 100644 index 0000000..ab775f6 --- /dev/null +++ b/samples/stock/res/layout/activity_view_pager.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/samples/stock/res/values/strings.xml b/samples/stock/res/values/strings.xml index f8d7531..20159e0 100644 --- a/samples/stock/res/values/strings.xml +++ b/samples/stock/res/values/strings.xml @@ -16,4 +16,5 @@ Header Overlay Example Choose a city Change dataset + View Pager Example \ No newline at end of file diff --git a/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/HomeActivity.java b/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/HomeActivity.java index b3a7f45..6ed80a4 100644 --- a/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/HomeActivity.java +++ b/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/HomeActivity.java @@ -35,7 +35,8 @@ public class HomeActivity extends ListActivity { new ActivityInfo(SampleFragmentActivity.class, R.string.activity_title_fragment), new ActivityInfo(NoParallaxActivity.class, R.string.activity_title_no_parallax), new ActivityInfo(NavigationDrawerActivity.class, R.string.activity_title_navigation), - new ActivityInfo(HeaderOverlayActivity.class, R.string.activity_title_header_overlay)); + new ActivityInfo(HeaderOverlayActivity.class, R.string.activity_title_header_overlay), + new ActivityInfo(ViewPagerActivity.class, R.string.activity_title_view_pager)); @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/NavigationDrawerActivity.java b/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/NavigationDrawerActivity.java index 0081f45..03dbf59 100644 --- a/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/NavigationDrawerActivity.java +++ b/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/NavigationDrawerActivity.java @@ -16,13 +16,13 @@ */ package com.manuelpeinado.fadingactionbar.demo; -import android.app.Activity; -import android.app.Fragment; -import android.app.FragmentManager; import android.content.res.Configuration; import android.content.res.TypedArray; import android.os.Bundle; import android.support.v4.app.ActionBarDrawerToggle; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentActivity; +import android.support.v4.app.FragmentManager; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.view.MenuItem; @@ -31,7 +31,7 @@ import android.widget.ArrayAdapter; import android.widget.ListView; -public class NavigationDrawerActivity extends Activity implements AdapterView.OnItemClickListener { +public class NavigationDrawerActivity extends FragmentActivity implements AdapterView.OnItemClickListener { private DrawerLayout mDrawerLayout; private ListView mDrawerList; @@ -128,7 +128,7 @@ private void selectItem(int position) { args.putInt(SampleFragment.ARG_ACTION_BG_RES, R.drawable.ab_background); fragment.setArguments(args); - FragmentManager fragmentManager = getFragmentManager(); + FragmentManager fragmentManager = getSupportFragmentManager(); fragmentManager.beginTransaction().replace(R.id.content_frame, fragment).commit(); // update selected item and title, then close the drawer diff --git a/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/SampleFragment.java b/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/SampleFragment.java index bc12b53..b6ee922 100644 --- a/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/SampleFragment.java +++ b/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/SampleFragment.java @@ -17,8 +17,8 @@ package com.manuelpeinado.fadingactionbar.demo; import android.app.Activity; -import android.app.Fragment; import android.os.Bundle; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/SampleFragmentActivity.java b/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/SampleFragmentActivity.java index 9faa5a8..bba97d9 100644 --- a/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/SampleFragmentActivity.java +++ b/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/SampleFragmentActivity.java @@ -15,11 +15,11 @@ */ package com.manuelpeinado.fadingactionbar.demo; -import android.app.Activity; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.view.Menu; -public class SampleFragmentActivity extends Activity { +public class SampleFragmentActivity extends FragmentActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/ViewPagerActivity.java b/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/ViewPagerActivity.java new file mode 100644 index 0000000..137bfa0 --- /dev/null +++ b/samples/stock/src/com/manuelpeinado/fadingactionbar/demo/ViewPagerActivity.java @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2013 Manuel Peinado + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.manuelpeinado.fadingactionbar.demo; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentActivity; +import android.support.v4.app.FragmentPagerAdapter; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; +import android.view.Menu; + +public class ViewPagerActivity extends FragmentActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_view_pager); + + ViewPager viewPager = (ViewPager)findViewById(R.id.viewPager); + viewPager.setAdapter(createViewPagerAdapter()); + } + + private PagerAdapter createViewPagerAdapter() { + return new FragmentPagerAdapter(getSupportFragmentManager()) { + @Override + public int getCount() { + return 3; + } + + @Override + public Fragment getItem(int position) { + return new SampleFragment(); + } + }; + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.activity_menu, menu); + return true; + } +}