diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cbb6c24..a1a27eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,9 +4,9 @@ - + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:orientation="vertical"> + + + android:id="@+id/activity_main_viewpager" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> \ No newline at end of file diff --git a/app/src/main/res/layout/afficher_fragment.xml b/app/src/main/res/layout/afficher_fragment.xml index 254f037..c1afbd8 100644 --- a/app/src/main/res/layout/afficher_fragment.xml +++ b/app/src/main/res/layout/afficher_fragment.xml @@ -1,8 +1,7 @@ + android:layout_height="wrap_content"> + style="@style/titre_style" /> + + - + style="@style/label_style" /> + + style="@style/label_style" /> + + style="@style/label_style" /> + + android:layout_height="wrap_content" /> \ No newline at end of file diff --git a/app/src/main/res/layout/ajouter_fragment.xml b/app/src/main/res/layout/ajouter_fragment.xml index b9e6c62..6572fe8 100644 --- a/app/src/main/res/layout/ajouter_fragment.xml +++ b/app/src/main/res/layout/ajouter_fragment.xml @@ -1,76 +1,84 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + android:stretchColumns="1"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center" + android:text="@string/ajouter_titre" + style="@style/titre_style" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/ajouter_label_plat" + android:layout_gravity="center" + style="@style/label_style"/> + android:id="@+id/input_plat" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_span="2" + android:inputType="text" + android:maxLength="20" + android:maxLines="1" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/ajouter_label_duree" + style="@style/label_style"/> + android:id="@+id/input_duree" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:timePickerMode="spinner" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/ajouter_label_temperature" + android:layout_gravity="center" + style="@style/label_style"/> + android:id="@+id/input_temperature" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_span="2" + android:inputType="number" />