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 35268fa..74fd64b 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 @@ -2,9 +2,13 @@ package com.example.app_10p5; import android.app.Activity; import android.content.Intent; +import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.support.design.widget.TabLayout; import android.support.v4.view.ViewPager; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.view.View; import android.widget.EditText; import android.widget.Toast; @@ -43,6 +47,8 @@ public class MainActivite extends Activity implements ASyncResponse { mTimeToken = -1; mToken = ""; + 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")); @@ -82,6 +88,19 @@ public class MainActivite extends Activity implements ASyncResponse { } @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.menu, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle item selection + return super.onOptionsItemSelected(item); + } + + @Override public void onSaveInstanceState(Bundle savedInstanceState){ savedInstanceState.putString("token", mToken); savedInstanceState.putInt("state", mState); diff --git a/PremiereActivite/app/src/main/res/layout/layout_main.xml b/PremiereActivite/app/src/main/res/layout/layout_main.xml index 8754a45..17bf995 100644 --- a/PremiereActivite/app/src/main/res/layout/layout_main.xml +++ b/PremiereActivite/app/src/main/res/layout/layout_main.xml @@ -1,37 +1,22 @@ - - + android:minHeight="75dp"/> + android:layout_height="fill_parent" /> \ No newline at end of file diff --git a/PremiereActivite/app/src/main/res/menu/menu.xml b/PremiereActivite/app/src/main/res/menu/menu.xml new file mode 100644 index 0000000..979eaf0 --- /dev/null +++ b/PremiereActivite/app/src/main/res/menu/menu.xml @@ -0,0 +1,24 @@ + + + + + + + + + \ No newline at end of file diff --git a/PremiereActivite/app/src/main/res/values-v21/styles.xml b/PremiereActivite/app/src/main/res/values-v21/styles.xml deleted file mode 100644 index 251fb9f..0000000 --- a/PremiereActivite/app/src/main/res/values-v21/styles.xml +++ /dev/null @@ -1,9 +0,0 @@ -> - - - diff --git a/PremiereActivite/app/src/main/res/values/colors.xml b/PremiereActivite/app/src/main/res/values/colors.xml index 4d44345..913bb9f 100644 --- a/PremiereActivite/app/src/main/res/values/colors.xml +++ b/PremiereActivite/app/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ - #3F51B5 + #EE4242 #303F9F #ff4081 diff --git a/PremiereActivite/app/src/main/res/values/strings.xml b/PremiereActivite/app/src/main/res/values/strings.xml index 5eba800..81c33b2 100644 --- a/PremiereActivite/app/src/main/res/values/strings.xml +++ b/PremiereActivite/app/src/main/res/values/strings.xml @@ -9,5 +9,7 @@ Prix Vidange Passez la carte du client + Déconnexion + Connexion diff --git a/PremiereActivite/app/src/main/res/values/styles.xml b/PremiereActivite/app/src/main/res/values/styles.xml index 545b9c6..810687a 100644 --- a/PremiereActivite/app/src/main/res/values/styles.xml +++ b/PremiereActivite/app/src/main/res/values/styles.xml @@ -1,20 +1,11 @@ - - - -