changing main view to example view

kth-csc-iprog · Jan 29, 2014 · 7d7243c · 7d7243c
1 parent 7d9add3
commit 7d7243c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
@@ -6,13 +6,12 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".MainActivity" 
-    android:id="@+id/main_view">
-
-    <TextView
-        android:id="@+id/example_text"
-        android:layout_width="wrap_content"
+    tools:context=".MainActivity">
+
+    <include
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/hello_world" />
+        layout="@layout/example_view" />
+
 
 </RelativeLayout>
diff --git a/res/layout/example_view.xml b/res/layout/example_view.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:id="@+id/example_view" >
+
+    <TextView
+        android:id="@+id/example_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/hello_world" />
+
+</RelativeLayout>
diff --git a/src/se/kth/csc/iprog/dinnerplanner/android/MainActivity.java b/src/se/kth/csc/iprog/dinnerplanner/android/MainActivity.java
@@ -1,6 +1,6 @@
 package se.kth.csc.iprog.dinnerplanner.android;
 
-import se.kth.csc.iprog.dinnerplanner.android.view.MainView;
+import se.kth.csc.iprog.dinnerplanner.android.view.ExampleView;
 import se.kth.csc.iprog.dinnerplanner.model.DinnerModel;
 import android.os.Bundle;
 import android.app.Activity;
@@ -20,7 +20,7 @@ protected void onCreate(Bundle savedInstanceState) {
         DinnerModel model = ((DinnerPlannerApplication) this.getApplication()).getModel();
 
     	// Creating the view class
-    	MainView mainView = new MainView(findViewById(R.id.main_view), model);
+    	ExampleView mainView = new ExampleView(findViewById(R.id.example_view), model);
 
     }
 

diff --git a/.../dinnerplanner/android/view/MainView.java → ...nnerplanner/android/view/ExampleView.java b/.../dinnerplanner/android/view/MainView.java → ...nnerplanner/android/view/ExampleView.java
@@ -5,11 +5,11 @@
 import android.view.View;
 import android.widget.TextView;
 
-public class MainView {
+public class ExampleView {
 
 	View view;
 
-	public MainView(View view, DinnerModel model) {
+	public ExampleView(View view, DinnerModel model) {
 
 		// store in the class the reference to the Android View
 		this.view = view;