From 82e8f9afcc1e691abb9093984b8a75701585ae5a Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Fri, 2 Nov 2018 20:21:21 +0200 Subject: Switch to androidx. --- .../main/java/example/zxing/TabbedScanning.java | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'sample/src/main/java/example/zxing/TabbedScanning.java') diff --git a/sample/src/main/java/example/zxing/TabbedScanning.java b/sample/src/main/java/example/zxing/TabbedScanning.java index 0818c1d9..5e9f4530 100644 --- a/sample/src/main/java/example/zxing/TabbedScanning.java +++ b/sample/src/main/java/example/zxing/TabbedScanning.java @@ -2,13 +2,15 @@ package example.zxing; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.view.ViewPager; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.fragment.app.FragmentTransaction; +import androidx.legacy.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -20,12 +22,12 @@ public class TabbedScanning extends AppCompatActivity implements ActionBar.TabLi private static final String TAG = TabbedScanning.class.getSimpleName(); /** - * The {@link android.support.v4.view.PagerAdapter} that will provide + * The {@link PagerAdapter} that will provide * fragments for each of the sections. We use a * {@link FragmentPagerAdapter} derivative, which will keep every * loaded fragment in memory. If this becomes too memory intensive, it * may be best to switch to a - * {@link android.support.v13.app.FragmentStatePagerAdapter}. + * {@link FragmentStatePagerAdapter}. */ private SectionsPagerAdapter mSectionsPagerAdapter; @@ -200,14 +202,14 @@ public class TabbedScanning extends AppCompatActivity implements ActionBar.TabLi * A {@link FragmentPagerAdapter} that returns a fragment corresponding to * one of the sections/tabs/pages. */ - public class SectionsPagerAdapter extends android.support.v4.app.FragmentPagerAdapter { + public class SectionsPagerAdapter extends FragmentPagerAdapter { public SectionsPagerAdapter(FragmentManager fm) { super(fm); } @Override - public android.support.v4.app.Fragment getItem(int position) { + public Fragment getItem(int position) { if(position == 0) { return ScanFragment.newInstance(); } else { -- cgit v1.2.3