diff --git a/WarpDrinkApp/app/app.iml b/WarpDrinkApp/app/app.iml index 99f036f630474a56d8bdce4d426ca4e9477e4e20..6ab4ba75ba838d60df6fdb87e6c053f84457e6b5 100644 --- a/WarpDrinkApp/app/app.iml +++ b/WarpDrinkApp/app/app.iml @@ -88,6 +88,7 @@ </content> <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" exported="" name="activeandroid-3.0" level="project" /> <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" /> <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" /> <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" /> diff --git a/WarpDrinkApp/app/libs/activeandroid-3.0.jar b/WarpDrinkApp/app/libs/activeandroid-3.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..6694276ab286080037510285f2810c2d7ff79350 Binary files /dev/null and b/WarpDrinkApp/app/libs/activeandroid-3.0.jar differ diff --git a/WarpDrinkApp/app/src/main/AndroidManifest.xml b/WarpDrinkApp/app/src/main/AndroidManifest.xml index 9c88d68e4723c0dc534bcd96e98a5020eb41c73b..58957097ff908946fdd9312f3ad252ca671f6ab0 100644 --- a/WarpDrinkApp/app/src/main/AndroidManifest.xml +++ b/WarpDrinkApp/app/src/main/AndroidManifest.xml @@ -6,7 +6,15 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" + android:name="ms.itsecteam.warpdrink.WarpDrinkApplication" android:theme="@style/AppTheme" > + <uses-permission android:name="android.permission.INTERNET"></uses-permission> + + <meta-data android:name="AA_DB_NAME" android:value="warpdrink_data.db" /> + <meta-data android:name="AA_DB_VERSION" android:value="5" /> + <meta-data + android:name="AA_MODELS" + android:value="ms.itsecteam.warpdrink.data.User" /> <activity android:name=".MainActivity" android:label="@string/app_name" diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/MainActivity.java b/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/MainActivity.java index 88fd6efb13fc0dc74792280f01eca1800af4cd5d..c77d8016a34b20eb495d00afd3b5afe8f353e1ce 100644 --- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/MainActivity.java +++ b/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/MainActivity.java @@ -2,11 +2,15 @@ package ms.itsecteam.warpdrink; import android.support.v7.app.ActionBarActivity; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.ListView; +import android.widget.TextView; import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import ms.itsecteam.warpdrink.data.User; import ms.itsecteam.warpdrink.orderList.ListViewAdapter; @@ -47,6 +51,7 @@ public class MainActivity extends ActionBarActivity implements View.OnClickListe this.lstAdapter = new ListViewAdapter(this, R.layout.order_list_item, new ArrayList<Order>()); this.lstOrdered.setAdapter(this.lstAdapter); + } public void removeOrderOnClickHandler(View v) { diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/WarpDrinkApplication.java b/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/WarpDrinkApplication.java new file mode 100644 index 0000000000000000000000000000000000000000..854f795fc8f881d5b466b9f09c4385721c8a0146 --- /dev/null +++ b/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/WarpDrinkApplication.java @@ -0,0 +1,18 @@ +package ms.itsecteam.warpdrink; + +import android.util.Log; + +import com.activeandroid.ActiveAndroid; + +/** + * Created by Chris on 26.06.2015. + */ +public class WarpDrinkApplication extends com.activeandroid.app.Application { + @Override + public void onCreate() { + super.onCreate(); + Log.d("DATABASE", "INIT"); + ActiveAndroid.initialize(this); + } + +} diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/User.java b/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/User.java index 432d018f3f2a6e46c16f2c7995a59b0abf1743c8..68245942106edce77ecee68973c974c8c5589b98 100644 --- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/User.java +++ b/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/User.java @@ -1,13 +1,33 @@ package ms.itsecteam.warpdrink.data; -/** - * Created by Chris on 26.06.2015. - */ -public class User { - private int id; +import com.activeandroid.Model; +import com.activeandroid.annotation.Column; +import com.activeandroid.annotation.Table; +import com.activeandroid.query.Select; + +import java.util.List; + +@Table(name = "Users") +public class User extends Model { + + @Column(name = "userid") + private int userid; + @Column(name = "name") private String name; + @Column(name = "credit") private double credit; + public User() { + super(); + } + + public User(int userid, String name, double credit) { + super(); + this.userid = userid; + this.name = name; + this.credit = credit; + } + public String getName() { return name; } @@ -23,4 +43,13 @@ public class User { public void setCredit(double credit) { this.credit = credit; } + + public static List<User> getAll() { + return new Select() + .from(User.class) + .execute(); + } + public String toString() { + return "[Name: "+this.name+", Credit:"+this.credit+"]"; + } }