Preparing project for Android Studio

.gitignore

@@ -28,3 +28,11 @@ proguard/
 *.ipr
 *.iws
 .idea/
+
+# Gradle files
+.gradle/
+build/
+/*/build/
+
+# Log Files
+*.log

app/.gitignore

@@ -0,0 +1 @@
+/build

app/build.gradle

@@ -0,0 +1,24 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "19.1.0"
+
+    defaultConfig {
+        applicationId "se.kth.csc.iprog.dinnerplanner.android"
+        minSdkVersion 15
+        targetSdkVersion 19
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+}

proguard-project.txt → app/proguard-rules.pro

@@ -1,11 +1,8 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
+# in /Applications/adt-bundle-mac-x86_64-20131030/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

AndroidManifest.xml → app/src/main/AndroidManifest.xml

@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="se.kth.csc.iprog.dinnerplanner.android"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="18" />
+    package="se.kth.csc.iprog.dinnerplanner.android" >
 
     <application
-        android:name="se.kth.csc.iprog.dinnerplanner.android.DinnerPlannerApplication"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="se.kth.csc.iprog.dinnerplanner.android.MainActivity"
+            android:name=".MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

src/se/kth/csc/iprog/dinnerplanner/android/DinnerPlannerApplication.java → app/src/main/java/se/kth/csc/iprog/dinnerplanner/android/DinnerPlannerApplication.java

@@ -1,8 +1,9 @@
 package se.kth.csc.iprog.dinnerplanner.android;
 
-import se.kth.csc.iprog.dinnerplanner.model.DinnerModel;
 import android.app.Application;
 
+import se.kth.csc.iprog.dinnerplanner.model.DinnerModel;
+
 public class DinnerPlannerApplication extends Application {
 
 	private DinnerModel model = new DinnerModel();

src/se/kth/csc/iprog/dinnerplanner/android/MainActivity.java → app/src/main/java/se/kth/csc/iprog/dinnerplanner/android/MainActivity.java

@@ -1,24 +1,26 @@
 package se.kth.csc.iprog.dinnerplanner.android;
 
-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;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import se.kth.csc.iprog.dinnerplanner.android.view.ExampleView;
+
 
 public class MainActivity extends Activity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // Default call to load previous state
-    	super.onCreate(savedInstanceState);
-    	
-    	// Set the view for the main activity screen
-    	// it must come before any call to findViewById method
+        super.onCreate(savedInstanceState);
+
+        // Set the view for the main activity screen
+        // it must come before any call to findViewById method
         setContentView(R.layout.activity_main);
-
-    	// Creating the view class instance
-    	ExampleView mainView = new ExampleView(findViewById(R.id.this_is_example_view_id));
 
+        // Creating the view class instance
+        ExampleView mainView = new ExampleView(findViewById(R.id.this_is_example_view_id));
     }
 
 }

src/se/kth/csc/iprog/dinnerplanner/android/view/ExampleView.java → app/src/main/java/se/kth/csc/iprog/dinnerplanner/android/view/ExampleView.java

@@ -1,10 +1,10 @@
 package se.kth.csc.iprog.dinnerplanner.android.view;
 
-import se.kth.csc.iprog.dinnerplanner.android.R;
-import se.kth.csc.iprog.dinnerplanner.model.DinnerModel;
 import android.view.View;
 import android.widget.TextView;
 
+import se.kth.csc.iprog.dinnerplanner.android.R;
+
 public class ExampleView {
 
 	View view;

src/se/kth/csc/iprog/dinnerplanner/model/IDinnerModel.java → app/src/main/java/se/kth/csc/iprog/dinnerplanner/model/IDinnerModel.java

@@ -26,4 +26,16 @@ public interface IDinnerModel {
 	 * Returns the total price of the menu (all the ingredients multiplied by number of guests).
 	 */
 	public float getTotalMenuPrice();
+
+    /**
+     * Adds the passed dish to the menu. If the dish of that type already exists on the menu
+     * it is removed from the menu and the new one added.
+     */
+    public void addDishToMenu(Dish dish);
+
+    /**
+     * Remove dish from menu
+     */
+    public void removeDishFromMenu(Dish dish);
+
 }

res/layout/activity_main.xml → app/src/main/res/layout/activity_main.xml

@@ -2,16 +2,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".MainActivity">
-	
+    android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity">
+
     <include
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         layout="@layout/example_view" />
 
-
 </RelativeLayout>

app/src/main/res/values-w820dp/dimens.xml

@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>

res/values/dimens.xml → app/src/main/res/values/dimens.xml

@@ -1,7 +1,5 @@
 <resources>
-
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
-
 </resources>

res/values/strings.xml → app/src/main/res/values/strings.xml

@@ -2,7 +2,7 @@
 <resources>
 
     <string name="app_name">DinnerPlanner</string>
-    <string name="action_settings">Settings</string>
     <string name="hello_world">Hello world!</string>
+    <string name="action_settings">Settings</string>
 
 </resources>

app/src/main/res/values/styles.xml

@@ -0,0 +1,8 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+    </style>
+
+</resources>

build.gradle

@@ -0,0 +1,19 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.0.0'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}

gradle.properties

@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip