diff --git a/PremiereActivite/app/build.gradle b/PremiereActivite/app/build.gradle index 1484248..245903a 100644 --- a/PremiereActivite/app/build.gradle +++ b/PremiereActivite/app/build.gradle @@ -23,4 +23,5 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' compile 'com.android.support:design:23.2.1' + compile 'com.android.support:support-v13:23.2.1' } diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java index d347bdc..35268fa 100644 --- a/PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java +++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java @@ -1,12 +1,10 @@ package com.example.app_10p5; +import android.app.Activity; import android.content.Intent; -import android.opengl.ETC1; import android.os.Bundle; import android.support.design.widget.TabLayout; -import android.support.v4.app.FragmentActivity; import android.support.v4.view.ViewPager; -import android.text.InputFilter; import android.view.View; import android.widget.EditText; import android.widget.Toast; @@ -20,7 +18,7 @@ import java.util.HashMap; /** * Created by beaus on 24/04/2016. */ -public class MainActivite extends FragmentActivity implements ASyncResponse { +public class MainActivite extends Activity implements ASyncResponse { public static final int STATE_RIEN = 0; public static final int STATE_COMMANDE = 3; @@ -55,7 +53,7 @@ public class MainActivite extends FragmentActivity implements ASyncResponse { tabLayout.setTabGravity(TabLayout.GRAVITY_FILL); final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); - final PagerAdapter adapter = new PagerAdapter(getSupportFragmentManager(), tabLayout.getTabCount()); + final PagerAdapter adapter = new PagerAdapter(getFragmentManager(), tabLayout.getTabCount()); viewPager.setAdapter(adapter); viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout)); tabLayout.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/PagerAdapter.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/PagerAdapter.java index 9268443..2c83c6a 100644 --- a/PremiereActivite/app/src/main/java/com/example/app_10p5/PagerAdapter.java +++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/PagerAdapter.java @@ -3,9 +3,9 @@ package com.example.app_10p5; /** * Created by beaus on 24/04/2016. */ -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import android.app.Fragment; +import android.app.FragmentManager; +import android.support.v13.app.FragmentStatePagerAdapter;; public class PagerAdapter extends FragmentStatePagerAdapter { int mNumOfTabs; diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment1.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment1.java index c9b2d97..3ec34c7 100644 --- a/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment1.java +++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment1.java @@ -1,7 +1,7 @@ package com.example.app_10p5; import android.os.Bundle; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment2.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment2.java index deb5800..2dded82 100644 --- a/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment2.java +++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment2.java @@ -1,7 +1,7 @@ package com.example.app_10p5; import android.os.Bundle; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.text.InputFilter; import android.view.LayoutInflater; import android.view.View; diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment3.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment3.java index bf1358a..c0059ec 100644 --- a/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment3.java +++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment3.java @@ -2,7 +2,7 @@ package com.example.app_10p5; import android.os.Bundle; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment4.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment4.java index f43638f..2d79780 100644 --- a/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment4.java +++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment4.java @@ -1,7 +1,7 @@ package com.example.app_10p5; import android.os.Bundle; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment5.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment5.java index 392accd..7ba4abb 100644 --- a/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment5.java +++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment5.java @@ -1,7 +1,7 @@ package com.example.app_10p5; import android.os.Bundle; -import android.support.v4.app.Fragment; +import android.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -- libgit2 0.21.2