diff --git a/PremiereActivite/app/build.gradle b/PremiereActivite/app/build.gradle index 245903a..18369c6 100644 --- a/PremiereActivite/app/build.gradle +++ b/PremiereActivite/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "23.0.3" + buildToolsVersion '23.2.1' defaultConfig { applicationId "com.example.app_10p5" diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java index d3c5324..3207572 100644 --- a/PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java +++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java @@ -46,6 +46,7 @@ public class CarteActivite extends Activity implements ASyncResponse { mAPI = "api/client/ajouter"; break; case MainActivite.STATE_RECHARGEMENT: + System.out.println("bite"); mParam.put("montant", String.valueOf(getIntent().getFloatExtra("montant", -1))); mParam.put("jeton", getIntent().getStringExtra("token")); mAPI = "api/client/recharger"; @@ -179,6 +180,7 @@ public class CarteActivite extends Activity implements ASyncResponse { public void clientAPI() { try { + System.out.println("chatte"); URL url = new URL(HOST + mAPI); NetworkThread nt = new NetworkThread(url, mParam); nt.delegate = this; 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 74fd64b..ae9cf75 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,6 +1,8 @@ package com.example.app_10p5; import android.app.Activity; +import android.app.FragmentManager; +import android.app.FragmentTransaction; import android.content.Intent; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; @@ -22,7 +24,7 @@ import java.util.HashMap; /** * Created by beaus on 24/04/2016. */ -public class MainActivite extends Activity implements ASyncResponse { +public class MainActivite extends Activity implements ASyncResponse, main_tab_frag.OnFragmentInteractionListener { public static final int STATE_RIEN = 0; public static final int STATE_COMMANDE = 3; @@ -49,42 +51,11 @@ public class MainActivite extends Activity implements ASyncResponse { getActionBar().setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.colorPrimary))); - TabLayout tabLayout = (TabLayout) findViewById(R.id.tab_layout); - tabLayout.setTabMode(TabLayout.MODE_SCROLLABLE); - tabLayout.addTab(tabLayout.newTab().setText("Connexion")); - tabLayout.addTab(tabLayout.newTab().setText("Commande")); - tabLayout.addTab(tabLayout.newTab().setText("Rechargement")); - tabLayout.addTab(tabLayout.newTab().setText("Création")); - tabLayout.addTab(tabLayout.newTab().setText("Vidange")); - tabLayout.setTabGravity(TabLayout.GRAVITY_FILL); - - final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); - final PagerAdapter adapter = new PagerAdapter(getFragmentManager(), tabLayout.getTabCount()); - viewPager.setAdapter(adapter); - viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout)); - tabLayout.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { - @Override - public void onTabSelected(TabLayout.Tab tab) { - if(mToken != "" && System.currentTimeMillis() - mTimeToken < EXPIRATION){ - viewPager.setCurrentItem(tab.getPosition()); - } - else{ - viewPager.setCurrentItem(tab.getPosition()); //Empeche un bug graphique - viewPager.setCurrentItem(0); - Toast.makeText(MainActivite.this, "Veuillez vous connecter.", Toast.LENGTH_LONG).show(); - } - } - - @Override - public void onTabUnselected(TabLayout.Tab tab) { - - } - - @Override - public void onTabReselected(TabLayout.Tab tab) { - - } - }); + FragmentManager fragmentManager = getFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + main_tab_frag fragment = new main_tab_frag(); + fragmentTransaction.add(R.id.fragment_container, fragment); + fragmentTransaction.commit(); } @Override @@ -101,6 +72,11 @@ public class MainActivite extends Activity implements ASyncResponse { } @Override + public void onFragmentInteraction(String s){ + + } + + @Override public void onSaveInstanceState(Bundle savedInstanceState){ savedInstanceState.putString("token", mToken); savedInstanceState.putInt("state", mState); @@ -148,8 +124,8 @@ public class MainActivite extends Activity implements ASyncResponse { } else{ Toast.makeText(this, "Veuillez vous reconnecter.", Toast.LENGTH_LONG).show(); - final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); - viewPager.setCurrentItem(0); + /*final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); + viewPager.setCurrentItem(0);*/ } } @@ -185,8 +161,8 @@ public class MainActivite extends Activity implements ASyncResponse { } else{ Toast.makeText(this, "Veuillez vous reconnecter.", Toast.LENGTH_LONG).show(); - final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); - viewPager.setCurrentItem(0); + /*final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); + viewPager.setCurrentItem(0);*/ } } @@ -217,8 +193,8 @@ public class MainActivite extends Activity implements ASyncResponse { } else{ Toast.makeText(this, "Veuillez vous reconnecter.", Toast.LENGTH_LONG).show(); - final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); - viewPager.setCurrentItem(0); + /*final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); + viewPager.setCurrentItem(0);*/ } } @@ -267,8 +243,8 @@ public class MainActivite extends Activity implements ASyncResponse { } else{ Toast.makeText(this, "Veuillez vous reconnecter.", Toast.LENGTH_LONG).show(); - final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); - viewPager.setCurrentItem(0); + /*final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); + viewPager.setCurrentItem(0);*/ } } @@ -317,8 +293,8 @@ public class MainActivite extends Activity implements ASyncResponse { Toast.makeText(this, "Bonjour " + mUser + " vous êtes bien connecté pour " + EXPIRATION / (1000 * 60) + " minutes.", Toast.LENGTH_LONG).show(); EditText coUser = (EditText) findViewById(R.id.connection_password); coUser.setText(""); - final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); - viewPager.setCurrentItem(1); + /*final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); + viewPager.setCurrentItem(1);*/ } else{ Toast.makeText(this, "Erreur dans la requête: " + output.get("status"), Toast.LENGTH_LONG).show(); @@ -332,4 +308,12 @@ public class MainActivite extends Activity implements ASyncResponse { Toast.makeText(this, "Impossible de se connecter au serveur", Toast.LENGTH_LONG).show(); } } + + public String getToken(){ + return mToken; + } + + public long getTimeToken(){ + return mTimeToken; + } } diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/main_tab_frag.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/main_tab_frag.java new file mode 100644 index 0000000..bc5fa5a --- /dev/null +++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/main_tab_frag.java @@ -0,0 +1,87 @@ +package com.example.app_10p5; + +import android.app.Activity; +import android.content.Context; +import android.os.Bundle; +import android.app.Fragment; +import android.support.design.widget.TabLayout; +import android.support.v4.view.ViewPager; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Toast; + + +public class main_tab_frag extends Fragment { + + + public main_tab_frag() { + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + View ret = inflater.inflate(R.layout.fragment_main_tab_frag, container, false); + + final MainActivite parent = (MainActivite) getActivity(); + + TabLayout tabLayout = (TabLayout) ret.findViewById(R.id.tab_layout); + tabLayout.setTabMode(TabLayout.MODE_SCROLLABLE); + tabLayout.addTab(tabLayout.newTab().setText("Connexion")); + tabLayout.addTab(tabLayout.newTab().setText("Commande")); + tabLayout.addTab(tabLayout.newTab().setText("Rechargement")); + tabLayout.addTab(tabLayout.newTab().setText("Création")); + tabLayout.addTab(tabLayout.newTab().setText("Vidange")); + tabLayout.setTabGravity(TabLayout.GRAVITY_FILL); + + final ViewPager viewPager = (ViewPager) ret.findViewById(R.id.pager); + final PagerAdapter adapter = new PagerAdapter(getFragmentManager(), tabLayout.getTabCount()); + viewPager.setAdapter(adapter); + viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout)); + tabLayout.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { + @Override + public void onTabSelected(TabLayout.Tab tab) { + if(parent.getToken() != "" && System.currentTimeMillis() - parent.getTimeToken() < MainActivite.EXPIRATION){ + viewPager.setCurrentItem(tab.getPosition()); + } + else{ + viewPager.setCurrentItem(tab.getPosition()); //Empeche un bug graphique + viewPager.setCurrentItem(0); + Toast.makeText(parent, "Veuillez vous connecter.", Toast.LENGTH_LONG).show(); + } + } + + @Override + public void onTabUnselected(TabLayout.Tab tab) { + + } + + @Override + public void onTabReselected(TabLayout.Tab tab) { + + } + }); + + return ret; + } + + @Override + public void onAttach(Context context) { + super.onAttach(context); + } + + @Override + public void onDetach() { + super.onDetach(); + } + + public interface OnFragmentInteractionListener { + void onFragmentInteraction(String s); + } +} diff --git a/PremiereActivite/app/src/main/res/layout/fragment_main_tab_frag.xml b/PremiereActivite/app/src/main/res/layout/fragment_main_tab_frag.xml new file mode 100644 index 0000000..2925262 --- /dev/null +++ b/PremiereActivite/app/src/main/res/layout/fragment_main_tab_frag.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/PremiereActivite/app/src/main/res/layout/layout_main.xml b/PremiereActivite/app/src/main/res/layout/layout_main.xml index 17bf995..fb1b72c 100644 --- a/PremiereActivite/app/src/main/res/layout/layout_main.xml +++ b/PremiereActivite/app/src/main/res/layout/layout_main.xml @@ -1,22 +1,6 @@ - - - - - - - \ No newline at end of file + android:layout_height="match_parent" + android:background="?android:attr/detailsElementBackground" /> diff --git a/PremiereActivite/app/src/main/res/values/strings.xml b/PremiereActivite/app/src/main/res/values/strings.xml index 81c33b2..42b0708 100644 --- a/PremiereActivite/app/src/main/res/values/strings.xml +++ b/PremiereActivite/app/src/main/res/values/strings.xml @@ -12,4 +12,7 @@ Déconnexion Connexion + + Hello blank fragment + -- libgit2 0.21.2