maj composition

Author: Vincent Timofti

project.properties

@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=Google Inc.:Google APIs:22
+target=android-17

res/layout/composition_layout2.xml

@@ -3,7 +3,7 @@
     android:layout_width="fill_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:gravity="center_horizontal" >
+    android:gravity="center" >
 
     <TextView
         android:id="@+id/choix_garniture"
@@ -15,7 +15,8 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="fill_parent" >
+        android:layout_height="wrap_content" 
+       	android:gravity="center">
 
         <GridLayout
             android:layout_width="wrap_content"
@@ -26,7 +27,7 @@
             <ToggleButton
                 android:id="@+id/buttonJambon"
                 android:layout_column="1"
-                android:layout_gravity="right"
+                android:width = "100dp"
                 android:layout_row="1"
                 android:textOn="@string/jambon"
                 android:textOff="@string/jambon" />
@@ -41,6 +42,7 @@
 
             <ToggleButton
                 android:id="@+id/viande1"
+                android:width = "100dp"
                 android:layout_width="match_parent"
                 android:layout_column="0"
                 android:layout_gravity="center"
@@ -50,13 +52,15 @@
 
             <ToggleButton
                 android:id="@+id/toggleButton4"
+                android:width = "100dp"
                 android:layout_column="2"
                 android:layout_gravity="right"
                 android:layout_row="1"
                 android:text="ToggleButton" />
 
             <ToggleButton
                 android:id="@+id/toggleButton3"
+                android:width = "100dp"
                 android:layout_column="0"
                 android:layout_gravity="left"
                 android:layout_row="2"
@@ -65,6 +69,7 @@
 
             <ToggleButton
                 android:id="@+id/toggleButton2"
+                android:width = "100dp"
                 android:layout_column="1"
                 android:layout_gravity="left"
                 android:layout_row="2"
@@ -82,6 +87,7 @@
 
             <ToggleButton
                 android:id="@+id/toggleButton9"
+                android:width = "100dp"
                 android:layout_column="3"
                 android:layout_gravity="left"
                 android:layout_row="1"
@@ -98,6 +104,7 @@
 
             <ToggleButton
                 android:id="@+id/buttonChevre"
+                android:width = "100dp"
                 android:layout_column="1"
                 android:layout_gravity="left"
                 android:layout_row="4"
@@ -106,6 +113,7 @@
 
             <ToggleButton
                 android:id="@+id/buttonEmmental"
+                android:width = "100dp"
                 android:layout_column="0"
                 android:layout_gravity="left"
                 android:layout_row="5"
@@ -130,4 +138,23 @@
             android:text="TextView" />
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center" >
+
+        <Button
+            android:id="@+id/buttonRevenirBase"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bouton_revenir_base" />
+
+        <Button
+            android:id="@+id/button2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bouton_confirmer" />
+
+    </LinearLayout>
+
 </LinearLayout>

res/values/strings.xml

@@ -23,5 +23,7 @@
     <string name="mozzarella">Mozzarella</string>
     <string name="emmental">Emmental</string>
     <string name="chevre">Chèvre</string>
+    <string name="bouton_confirmer">Commander la pizza &gt;</string>
+    <string name="bouton_revenir_base">&lt; Changer la base</string>
 
 </resources>

src/infsi351/Restauration/FragmentComposition2.java

@@ -5,6 +5,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.TextView;
 
 public class FragmentComposition2 extends Fragment {
@@ -24,8 +25,13 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
 
 		View view = inflater.inflate(R.layout.composition_layout2, container, false);
-//		TextView textView = (TextView) view.findViewById(R.id.textView1);
-//		textView.setText(base);
+		
+		 final Button button_retour = (Button) view.findViewById(R.id.buttonRevenirBase);
+         button_retour.setOnClickListener(new View.OnClickListener() {
+             public void onClick(View v) {
+            	 ((MainActivity) getActivity()).backToComposition1();
+             }
+         });
 
 		return view;
 	}

src/infsi351/Restauration/MainActivity.java

@@ -107,6 +107,17 @@ public void switchToComposition2(String base) {
 		fragmentTransaction.commit();
 
 	}
+	
+	public void backToComposition1()
+	{
+		Fragment fragment = new FragmentComposition1();
+		
+		android.support.v4.app.FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+		fragmentTransaction.setCustomAnimations(R.anim.enter_from_left, R.anim.exit_to_right);
+		fragmentTransaction.replace(R.id.container, fragment);
+		fragmentTransaction.commit();
+		
+	}
 
 
 }