diff --git a/WarpDrinkApp/app/src/androidTest/java/ms/itsecteam/warpdrink/ApplicationTest.java b/WarpDrinkApp/app/src/androidTest/java/ms/itsecteam/warppay/ApplicationTest.java
similarity index 90%
rename from WarpDrinkApp/app/src/androidTest/java/ms/itsecteam/warpdrink/ApplicationTest.java
rename to WarpDrinkApp/app/src/androidTest/java/ms/itsecteam/warppay/ApplicationTest.java
index c1f6f2e9ae8ccc6427804f1d51a5da82a775775d..b9cb312813ddce6a84731ad35dc50790e18d978b 100644
--- a/WarpDrinkApp/app/src/androidTest/java/ms/itsecteam/warpdrink/ApplicationTest.java
+++ b/WarpDrinkApp/app/src/androidTest/java/ms/itsecteam/warppay/ApplicationTest.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink;
+package ms.itsecteam.warppay;
import android.app.Application;
import android.test.ApplicationTestCase;
diff --git a/WarpDrinkApp/app/src/main/AndroidManifest.xml b/WarpDrinkApp/app/src/main/AndroidManifest.xml
index d48f3052ef5b9808b0aaf6c9bf66828ab0542a0d..dfa9e13ba4c1e4a1a557d039f08b55c33407bc9d 100644
--- a/WarpDrinkApp/app/src/main/AndroidManifest.xml
+++ b/WarpDrinkApp/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="ms.itsecteam.warpdrink" >
+ package="ms.warpzone.warppay" >
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<uses-permission android:name="android.permission.NFC" />
@@ -12,17 +12,15 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:largeHeap="true"
- android:name="ms.itsecteam.warpdrink.WarpDrinkApplication"
+ android:name="ms.warpzone.warppay.WarpPayApplication"
android:theme="@style/AppTheme">
- <meta-data android:name="AA_DB_NAME" android:value="warpdrink_data.db" />
- <meta-data android:name="AA_DB_VERSION" android:value="6" />
- <meta-data
- android:name="AA_MODELS"
- android:value="ms.itsecteam.warpdrink.data.objects.User" />
+ <meta-data android:name="AA_DB_NAME" android:value="warppay_data.db" />
+ <meta-data android:name="AA_DB_VERSION" android:value="8" />
+
<activity
- android:name=".MainActivity"
+ android:name="ms.warpzone.warppay.MainActivity"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:windowSoftInputMode="stateVisible"
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/MainActivity.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/MainActivity.java
similarity index 93%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/MainActivity.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/MainActivity.java
index 3e879c3cbf8997176386c916cbac37b03f64270e..85e25f3f7e04fb39b457da815ad5c0a76c9a0478 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/MainActivity.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/MainActivity.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink;
+package ms.warpzone.warppay;
import android.app.AlertDialog;
import android.app.PendingIntent;
@@ -17,14 +17,15 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
-import ms.itsecteam.warpdrink.data.models.local.User;
+import ms.warpzone.warppay.R;
+import ms.warpzone.warppay.data.models.local.User;
-import ms.itsecteam.warpdrink.dialogs.NewUserDialog;
-import ms.itsecteam.warpdrink.dialogs.SettingsDialog;
-import ms.itsecteam.warpdrink.manager.DataManager;
-import ms.itsecteam.warpdrink.manager.MainManager;
-import ms.itsecteam.warpdrink.manager.UiManager;
-import ms.itsecteam.warpdrink.orderList.Order;
+import ms.warpzone.warppay.dialogs.NewUserDialog;
+import ms.warpzone.warppay.dialogs.SettingsDialog;
+import ms.warpzone.warppay.manager.DataManager;
+import ms.warpzone.warppay.manager.MainManager;
+import ms.warpzone.warppay.manager.UiManager;
+import ms.warpzone.warppay.orderList.Order;
public class MainActivity extends AppCompatActivity implements View.OnClickListener {
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/WarpDrinkApplication.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/WarpPayApplication.java
similarity index 58%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/WarpDrinkApplication.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/WarpPayApplication.java
index e03ffc85b4caad50c8256db35323f6a4052c82a9..3fc4f2ca8a6d18358546703c650cce197079c8a3 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/WarpDrinkApplication.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/WarpPayApplication.java
@@ -1,7 +1,7 @@
-package ms.itsecteam.warpdrink;
+package ms.warpzone.warppay;
import com.activeandroid.ActiveAndroid;
-public class WarpDrinkApplication extends com.activeandroid.app.Application {
+public class WarpPayApplication extends com.activeandroid.app.Application {
@Override
public void onCreate() {
super.onCreate();
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/RestService.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/RestService.java
similarity index 74%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/RestService.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/RestService.java
index 835cd08269ebb4c11743e656a9ed4a5780aedff4..44b091a4f8c216933affcdbad92262e3dfe88a26 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/RestService.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/RestService.java
@@ -1,12 +1,12 @@
-package ms.itsecteam.warpdrink.data;
+package ms.warpzone.warppay.data;
import java.util.List;
-import ms.itsecteam.warpdrink.data.models.rest.RestCategory;
-import ms.itsecteam.warpdrink.data.models.rest.RestProduct;
-import ms.itsecteam.warpdrink.data.models.rest.RestTransaction;
-import ms.itsecteam.warpdrink.data.models.rest.RestUser;
+import ms.warpzone.warppay.data.models.rest.RestCategory;
+import ms.warpzone.warppay.data.models.rest.RestProduct;
+import ms.warpzone.warppay.data.models.rest.RestTransaction;
+import ms.warpzone.warppay.data.models.rest.RestUser;
import retrofit.Call;
import retrofit.http.Body;
import retrofit.http.GET;
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/SQLiteService.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/SQLiteService.java
similarity index 81%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/SQLiteService.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/SQLiteService.java
index f9d7df5ecaaee604727d6f6e46013cd899594cbd..92b22a2fbc6167522810e77563f64235b4df2266 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/SQLiteService.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/SQLiteService.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink.data;
+package ms.warpzone.warppay.data;
import android.util.Log;
@@ -6,13 +6,13 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import ms.itsecteam.warpdrink.data.models.local.Category;
-import ms.itsecteam.warpdrink.data.models.local.Product;
-import ms.itsecteam.warpdrink.data.models.local.Setting;
-import ms.itsecteam.warpdrink.data.models.local.User;
-import ms.itsecteam.warpdrink.data.models.rest.RestCategory;
-import ms.itsecteam.warpdrink.data.models.rest.RestProduct;
-import ms.itsecteam.warpdrink.data.models.rest.RestUser;
+import ms.warpzone.warppay.data.models.local.Category;
+import ms.warpzone.warppay.data.models.local.Product;
+import ms.warpzone.warppay.data.models.local.Setting;
+import ms.warpzone.warppay.data.models.local.User;
+import ms.warpzone.warppay.data.models.rest.RestCategory;
+import ms.warpzone.warppay.data.models.rest.RestProduct;
+import ms.warpzone.warppay.data.models.rest.RestUser;
public class SQLiteService {
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/local/Category.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Category.java
similarity index 94%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/local/Category.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Category.java
index a710b71ae4da95b985bb6a62c638d6148367b6b0..c84ab7d87bfe23378672f5765eb34d076a67b2d3 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/local/Category.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Category.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink.data.models.local;
+package ms.warpzone.warppay.data.models.local;
import com.activeandroid.Model;
import com.activeandroid.annotation.Column;
@@ -22,6 +22,7 @@ public class Category extends Model {
}
public Category(int cid, String name) {
+ super();
this.cid = cid;
this.name = name;
}
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/local/Product.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Product.java
similarity index 97%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/local/Product.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Product.java
index 5c1b22b44bff6bb51aed43fa54df8b6f22df507e..c7178c42a6a35c452a6671dddf3b8204c24c4682 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/local/Product.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Product.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink.data.models.local;
+package ms.warpzone.warppay.data.models.local;
import android.util.Log;
@@ -33,6 +33,7 @@ public class Product extends Model {
}
public Product(int pid, String name, String category, float price, int count) {
+ super();
this.pid = pid;
this.name = name;
this.category = category;
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/local/Setting.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Setting.java
similarity index 97%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/local/Setting.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Setting.java
index 52b6986991d96b5eae5cf650f552bcc259cc0e39..dccf4c6669033a27aa3c96cd637e7fd72016ca86 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/local/Setting.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Setting.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink.data.models.local;
+package ms.warpzone.warppay.data.models.local;
import com.activeandroid.Model;
import com.activeandroid.annotation.Column;
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/local/User.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/User.java
similarity index 97%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/local/User.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/User.java
index 4bea14647478546ac81daf5cc808e0736b7bf3c8..58161dee633028ed5654feb7a015d6c0c924c467 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/local/User.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/User.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink.data.models.local;
+package ms.warpzone.warppay.data.models.local;
import com.activeandroid.Model;
import com.activeandroid.annotation.Column;
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/rest/RestCategory.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/rest/RestCategory.java
similarity index 89%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/rest/RestCategory.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/rest/RestCategory.java
index 04e7c4b596a29f4a746ee7a48545817ce4771c85..de04f32e433df866b18278a01e43ffdcebed00af 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/rest/RestCategory.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/rest/RestCategory.java
@@ -1,6 +1,6 @@
-package ms.itsecteam.warpdrink.data.models.rest;
+package ms.warpzone.warppay.data.models.rest;
-import ms.itsecteam.warpdrink.data.models.local.Category;
+import ms.warpzone.warppay.data.models.local.Category;
public class RestCategory {
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/rest/RestProduct.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/rest/RestProduct.java
similarity index 90%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/rest/RestProduct.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/rest/RestProduct.java
index c3f8cfcf88a9eb814322f0ebed5440700e342e7a..3f0e4b3a02346dd98bfacf257a3381361e237653 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/rest/RestProduct.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/rest/RestProduct.java
@@ -1,9 +1,6 @@
-package ms.itsecteam.warpdrink.data.models.rest;
+package ms.warpzone.warppay.data.models.rest;
-import android.util.Log;
-
-import ms.itsecteam.warpdrink.data.models.local.Product;
-import ms.itsecteam.warpdrink.data.models.local.User;
+import ms.warpzone.warppay.data.models.local.Product;
public class RestProduct {
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/rest/RestTransaction.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/rest/RestTransaction.java
similarity index 96%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/rest/RestTransaction.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/rest/RestTransaction.java
index 97db60eac4e61252cfba285a92d8a082eb053d95..19e02d07eaba91cf70008d4b546719a66a279871 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/rest/RestTransaction.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/rest/RestTransaction.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink.data.models.rest;
+package ms.warpzone.warppay.data.models.rest;
public class RestTransaction {
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/rest/RestUser.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/rest/RestUser.java
similarity index 92%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/rest/RestUser.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/rest/RestUser.java
index c272c0c78dad69be10c97b4f292d29a2509e5db7..8fa370d341c882baf9844ab7baf0ae2686f7815a 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/data/models/rest/RestUser.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/rest/RestUser.java
@@ -1,6 +1,6 @@
-package ms.itsecteam.warpdrink.data.models.rest;
+package ms.warpzone.warppay.data.models.rest;
-import ms.itsecteam.warpdrink.data.models.local.User;
+import ms.warpzone.warppay.data.models.local.User;
public class RestUser {
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/ChargeCustomDialog.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/ChargeCustomDialog.java
similarity index 89%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/ChargeCustomDialog.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/ChargeCustomDialog.java
index f80aaa37aecfb495e504bd1928c375f90df74f80..8fe1210f0837204254e04b617f865ac9eade0acf 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/ChargeCustomDialog.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/ChargeCustomDialog.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink.dialogs;
+package ms.warpzone.warppay.dialogs;
import android.app.Dialog;
import android.os.Bundle;
@@ -7,9 +7,9 @@ import android.view.Window;
import android.widget.Button;
import android.widget.NumberPicker;
-import ms.itsecteam.warpdrink.MainActivity;
-import ms.itsecteam.warpdrink.R;
-import ms.itsecteam.warpdrink.manager.MainManager;
+import ms.warpzone.warppay.MainActivity;
+import ms.warpzone.warppay.R;
+import ms.warpzone.warppay.manager.MainManager;
public class ChargeCustomDialog extends Dialog implements
View.OnClickListener {
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/ChargeDialog.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/ChargeDialog.java
similarity index 91%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/ChargeDialog.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/ChargeDialog.java
index 8bf942a4558268deae45f33d7ef8051fd2af777e..a966492d71d7aafcd4aff0edafed48ba3c5a210b 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/ChargeDialog.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/ChargeDialog.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink.dialogs;
+package ms.warpzone.warppay.dialogs;
import android.app.Dialog;
import android.os.Bundle;
@@ -6,9 +6,9 @@ import android.view.View;
import android.view.Window;
import android.widget.Button;
-import ms.itsecteam.warpdrink.MainActivity;
-import ms.itsecteam.warpdrink.R;
-import ms.itsecteam.warpdrink.manager.MainManager;
+import ms.warpzone.warppay.MainActivity;
+import ms.warpzone.warppay.R;
+import ms.warpzone.warppay.manager.MainManager;
public class ChargeDialog extends Dialog implements
android.view.View.OnClickListener {
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/NewUserDialog.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/NewUserDialog.java
similarity index 90%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/NewUserDialog.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/NewUserDialog.java
index e0cc8ba19c31900693310afb79168b1511b092b4..8b1a752aa3c174cb5a94044c351863810779fcf4 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/NewUserDialog.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/NewUserDialog.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink.dialogs;
+package ms.warpzone.warppay.dialogs;
import android.app.Dialog;
import android.os.Bundle;
@@ -6,11 +6,10 @@ import android.view.View;
import android.view.Window;
import android.widget.Button;
import android.widget.TextView;
-import android.widget.Toast;
-import ms.itsecteam.warpdrink.MainActivity;
-import ms.itsecteam.warpdrink.R;
-import ms.itsecteam.warpdrink.manager.MainManager;
+import ms.warpzone.warppay.MainActivity;
+import ms.warpzone.warppay.R;
+import ms.warpzone.warppay.manager.MainManager;
public class NewUserDialog extends Dialog implements
View.OnClickListener {
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/PayChoiceDialog.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/PayChoiceDialog.java
similarity index 85%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/PayChoiceDialog.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/PayChoiceDialog.java
index d84a6676638979eda5cd3cc19a2d7ac8d30c3381..4f3862c62405c8975972344e3d6ba9c725ce0457 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/PayChoiceDialog.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/PayChoiceDialog.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink.dialogs;
+package ms.warpzone.warppay.dialogs;
import android.app.Dialog;
import android.os.Bundle;
@@ -6,10 +6,9 @@ import android.view.View;
import android.view.Window;
import android.widget.Button;
-import ms.itsecteam.warpdrink.MainActivity;
-import ms.itsecteam.warpdrink.R;
-import ms.itsecteam.warpdrink.manager.DataManager;
-import ms.itsecteam.warpdrink.manager.MainManager;
+import ms.warpzone.warppay.R;
+import ms.warpzone.warppay.manager.DataManager;
+import ms.warpzone.warppay.manager.MainManager;
public class PayChoiceDialog extends Dialog implements
View.OnClickListener {
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/ProductDialog.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/ProductDialog.java
similarity index 86%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/ProductDialog.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/ProductDialog.java
index 47a2dcd435f7e76974ba51b81f36273aee5995ef..4fcb5c52209fee7fa8e6f3246692ca57ad7ab1a6 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/ProductDialog.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/ProductDialog.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink.dialogs;
+package ms.warpzone.warppay.dialogs;
import android.app.Dialog;
import android.os.Bundle;
@@ -9,12 +9,12 @@ import android.widget.GridLayout;
import java.util.List;
-import ms.itsecteam.warpdrink.MainActivity;
-import ms.itsecteam.warpdrink.R;
-import ms.itsecteam.warpdrink.data.models.local.Product;
-import ms.itsecteam.warpdrink.manager.MainManager;
-import ms.itsecteam.warpdrink.manager.UiManager;
-import ms.itsecteam.warpdrink.orderList.Order;
+import ms.warpzone.warppay.MainActivity;
+import ms.warpzone.warppay.R;
+import ms.warpzone.warppay.data.models.local.Product;
+import ms.warpzone.warppay.manager.MainManager;
+import ms.warpzone.warppay.manager.UiManager;
+import ms.warpzone.warppay.orderList.Order;
public class ProductDialog extends Dialog implements View.OnClickListener {
private MainActivity c;
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/SettingsDialog.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/SettingsDialog.java
similarity index 89%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/SettingsDialog.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/SettingsDialog.java
index 9ea94d40210949c55b8d51b7e5e657e9b9a26b21..9b6403b434b62a114599e8496c481875a70a1131 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/dialogs/SettingsDialog.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/dialogs/SettingsDialog.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink.dialogs;
+package ms.warpzone.warppay.dialogs;
import android.app.Dialog;
import android.os.Bundle;
@@ -7,9 +7,9 @@ import android.view.Window;
import android.widget.Button;
import android.widget.TextView;
-import ms.itsecteam.warpdrink.MainActivity;
-import ms.itsecteam.warpdrink.R;
-import ms.itsecteam.warpdrink.data.SQLiteService;
+import ms.warpzone.warppay.MainActivity;
+import ms.warpzone.warppay.R;
+import ms.warpzone.warppay.data.SQLiteService;
public class SettingsDialog extends Dialog implements
View.OnClickListener {
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/listener/CategoryOnClickListener.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/listener/CategoryOnClickListener.java
similarity index 66%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/listener/CategoryOnClickListener.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/listener/CategoryOnClickListener.java
index a72fc16a92a4919248dc549f62a279252482c4ec..558966f7000d7b0267a5d06a3d1eccfaec1c144f 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/listener/CategoryOnClickListener.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/listener/CategoryOnClickListener.java
@@ -1,10 +1,8 @@
-package ms.itsecteam.warpdrink.listener;
-import android.util.Log;
+package ms.warpzone.warppay.listener;
import android.view.View;
import android.widget.Button;
-import ms.itsecteam.warpdrink.dialogs.ProductDialog;
-import ms.itsecteam.warpdrink.manager.UiManager;
+import ms.warpzone.warppay.dialogs.ProductDialog;
public class CategoryOnClickListener implements View.OnClickListener {
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/manager/DataManager.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/DataManager.java
similarity index 90%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/manager/DataManager.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/DataManager.java
index 2c88b387d94430bf5fec4ee0fce8431515bd2248..bd768d414983f4fb138a81790fd32de1d659c82b 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/manager/DataManager.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/DataManager.java
@@ -1,15 +1,14 @@
-package ms.itsecteam.warpdrink.manager;
+package ms.warpzone.warppay.manager;
import android.util.Log;
-import java.io.IOException;
import java.util.ArrayList;
-import ms.itsecteam.warpdrink.data.models.local.User;
-import ms.itsecteam.warpdrink.data.models.rest.RestProduct;
-import ms.itsecteam.warpdrink.data.models.rest.RestTransaction;
-import ms.itsecteam.warpdrink.data.models.rest.RestUser;
-import ms.itsecteam.warpdrink.orderList.Order;
+import ms.warpzone.warppay.data.models.local.User;
+import ms.warpzone.warppay.data.models.rest.RestProduct;
+import ms.warpzone.warppay.data.models.rest.RestTransaction;
+import ms.warpzone.warppay.data.models.rest.RestUser;
+import ms.warpzone.warppay.orderList.Order;
import retrofit.Callback;
import retrofit.Response;
import retrofit.Retrofit;
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/manager/MainManager.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/MainManager.java
similarity index 91%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/manager/MainManager.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/MainManager.java
index a0f205597487c433552f75de8bb8be46810b9b7e..7a48ccfda53c9e6cb3d5611cb154d9708003b700 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/manager/MainManager.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/MainManager.java
@@ -1,21 +1,21 @@
-package ms.itsecteam.warpdrink.manager;
+package ms.warpzone.warppay.manager;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.util.Log;
import android.widget.Toast;
import java.util.List;
-import ms.itsecteam.warpdrink.MainActivity;
-import ms.itsecteam.warpdrink.R;
-import ms.itsecteam.warpdrink.data.SQLiteService;
-import ms.itsecteam.warpdrink.data.models.local.Category;
-import ms.itsecteam.warpdrink.data.models.local.User;
-import ms.itsecteam.warpdrink.data.RestService;
-import ms.itsecteam.warpdrink.data.models.rest.RestCategory;
-import ms.itsecteam.warpdrink.data.models.rest.RestProduct;
-import ms.itsecteam.warpdrink.data.models.rest.RestTransaction;
-import ms.itsecteam.warpdrink.data.models.rest.RestUser;
-import ms.itsecteam.warpdrink.orderList.Order;
+import ms.warpzone.warppay.MainActivity;
+import ms.warpzone.warppay.R;
+import ms.warpzone.warppay.data.SQLiteService;
+import ms.warpzone.warppay.data.models.local.Category;
+import ms.warpzone.warppay.data.models.local.User;
+import ms.warpzone.warppay.data.RestService;
+import ms.warpzone.warppay.data.models.rest.RestCategory;
+import ms.warpzone.warppay.data.models.rest.RestProduct;
+import ms.warpzone.warppay.data.models.rest.RestTransaction;
+import ms.warpzone.warppay.data.models.rest.RestUser;
+import ms.warpzone.warppay.orderList.Order;
import retrofit.Callback;
import retrofit.GsonConverterFactory;
import retrofit.Response;
@@ -40,6 +40,7 @@ public class MainManager {
this.uiManager = UiManager.getInstance();
this.dataManager = DataManager.getInstance();
this.restService = this.createRestService();
+
}
private RestService createRestService() {
@@ -97,7 +98,7 @@ public class MainManager {
this.restService.getAllProducts().enqueue(new Callback<List<RestProduct>>() {
@Override
public void onResponse(Response<List<RestProduct>> response, Retrofit retrofit) {
- List<ms.itsecteam.warpdrink.data.models.local.Product> productList = MainManager.getInstance().sqLiteService.refreshProductData(response.body());
+ List<ms.warpzone.warppay.data.models.local.Product> productList = MainManager.getInstance().sqLiteService.refreshProductData(response.body());
if (productList != null) {
MainManager.getInstance().uiManager.refreshProductData(productList);
}
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/manager/UiManager.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/UiManager.java
similarity index 92%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/manager/UiManager.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/UiManager.java
index 8800139033e1bf9b4073e8a7cc3dcfdd2100b0b1..32778fa69d38376fee7ba6c51f41ca01387ec210 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/manager/UiManager.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/UiManager.java
@@ -1,8 +1,7 @@
-package ms.itsecteam.warpdrink.manager;
+package ms.warpzone.warppay.manager;
import android.annotation.TargetApi;
import android.os.Build;
-import android.text.Editable;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
@@ -20,18 +19,18 @@ import android.widget.TextView;
import java.util.ArrayList;
import java.util.List;
-import ms.itsecteam.warpdrink.MainActivity;
-import ms.itsecteam.warpdrink.R;
-import ms.itsecteam.warpdrink.data.models.local.Category;
-import ms.itsecteam.warpdrink.data.models.local.Product;
-import ms.itsecteam.warpdrink.data.models.local.User;
-import ms.itsecteam.warpdrink.dialogs.ChargeDialog;
-import ms.itsecteam.warpdrink.dialogs.NewUserDialog;
-import ms.itsecteam.warpdrink.dialogs.PayChoiceDialog;
-import ms.itsecteam.warpdrink.listener.CategoryOnClickListener;
-import ms.itsecteam.warpdrink.orderList.ListViewAdapter;
-import ms.itsecteam.warpdrink.orderList.ListViewAdapterProducts;
-import ms.itsecteam.warpdrink.orderList.Order;
+import ms.warpzone.warppay.MainActivity;
+import ms.warpzone.warppay.R;
+import ms.warpzone.warppay.data.models.local.Category;
+import ms.warpzone.warppay.data.models.local.Product;
+import ms.warpzone.warppay.data.models.local.User;
+import ms.warpzone.warppay.dialogs.ChargeDialog;
+import ms.warpzone.warppay.dialogs.NewUserDialog;
+import ms.warpzone.warppay.dialogs.PayChoiceDialog;
+import ms.warpzone.warppay.listener.CategoryOnClickListener;
+import ms.warpzone.warppay.orderList.ListViewAdapter;
+import ms.warpzone.warppay.orderList.ListViewAdapterProducts;
+import ms.warpzone.warppay.orderList.Order;
public class UiManager implements View.OnKeyListener, View.OnClickListener, AdapterView.OnItemClickListener {
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/orderList/ListViewAdapter.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/orderList/ListViewAdapter.java
similarity index 94%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/orderList/ListViewAdapter.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/orderList/ListViewAdapter.java
index f145fa0b92864240244f224d6fc1a7e4c36a87d9..3440f5b39d9ba1bfa59263b1f4abcfccf443dea5 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/orderList/ListViewAdapter.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/orderList/ListViewAdapter.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink.orderList;
+package ms.warpzone.warppay.orderList;
import android.app.Activity;
import android.content.Context;
@@ -7,12 +7,11 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.Button;
-import android.widget.ImageButton;
import android.widget.TextView;
import java.util.List;
-import ms.itsecteam.warpdrink.R;
+import ms.warpzone.warppay.R;
public class ListViewAdapter extends ArrayAdapter<Order> {
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/orderList/ListViewAdapterProducts.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/orderList/ListViewAdapterProducts.java
similarity index 92%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/orderList/ListViewAdapterProducts.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/orderList/ListViewAdapterProducts.java
index b8f8158793db970297c1493fa9d12140339f9067..64a198920ab3529018113b3b7cce5461c2a1e098 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/orderList/ListViewAdapterProducts.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/orderList/ListViewAdapterProducts.java
@@ -1,4 +1,4 @@
-package ms.itsecteam.warpdrink.orderList;
+package ms.warpzone.warppay.orderList;
import android.app.Activity;
import android.content.Context;
@@ -10,8 +10,8 @@ import android.widget.TextView;
import java.util.List;
-import ms.itsecteam.warpdrink.R;
-import ms.itsecteam.warpdrink.data.models.local.Product;
+import ms.warpzone.warppay.R;
+import ms.warpzone.warppay.data.models.local.Product;
public class ListViewAdapterProducts extends ArrayAdapter<Product>{
diff --git a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/orderList/Order.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/orderList/Order.java
similarity index 85%
rename from WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/orderList/Order.java
rename to WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/orderList/Order.java
index 1f7dc3ccb5166693c74df476e6d10f56406cfada..5461dfd465deb33e23ebc5ceb8fe3c76ff2ea27e 100644
--- a/WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/orderList/Order.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/orderList/Order.java
@@ -1,11 +1,10 @@
-package ms.itsecteam.warpdrink.orderList;
+package ms.warpzone.warppay.orderList;
import android.widget.Button;
-import android.widget.ImageButton;
import java.io.Serializable;
-import ms.itsecteam.warpdrink.data.models.local.Product;
+import ms.warpzone.warppay.data.models.local.Product;
public class Order implements Serializable {
diff --git a/WarpDrinkApp/app/src/main/res/layout/activity_main.xml b/WarpDrinkApp/app/src/main/res/layout/activity_main.xml
index 433704cf2417a4b045a4970278db8b0c591ee1ad..4784d998758f171522890228b02bf24505a3b46d 100644
--- a/WarpDrinkApp/app/src/main/res/layout/activity_main.xml
+++ b/WarpDrinkApp/app/src/main/res/layout/activity_main.xml
@@ -3,7 +3,7 @@
android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
- android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity">
+ android:paddingBottom="@dimen/activity_vertical_margin" tools:context="ms.warpzone.warppay.MainActivity">
<LinearLayout
android:orientation="vertical"
diff --git a/WarpDrinkApp/app/src/main/res/menu/menu_main.xml b/WarpDrinkApp/app/src/main/res/menu/menu_main.xml
index 835133e66153c7f1a62d4ccbea9a26b8a88b18f4..8b4216a46cce1aa4bbfd7229ac310d90b7f15b1f 100644
--- a/WarpDrinkApp/app/src/main/res/menu/menu_main.xml
+++ b/WarpDrinkApp/app/src/main/res/menu/menu_main.xml
@@ -1,6 +1,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools" tools:context=".MainActivity">
+ xmlns:tools="http://schemas.android.com/tools" tools:context="ms.warpzone.warppay.MainActivity">
<item
android:id="@+id/action_settings"
android:title="Settings" />
diff --git a/WarpDrinkApp/app/src/main/res/values/strings.xml b/WarpDrinkApp/app/src/main/res/values/strings.xml
index 6b4c96ca32f37691d86d7b70bb54542c07fafced..ff4437d4b453d70ed8315a3fc20f7b10f876a546 100644
--- a/WarpDrinkApp/app/src/main/res/values/strings.xml
+++ b/WarpDrinkApp/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
<resources>
- <string name="app_name">WarpDrink</string>
+ <string name="app_name">WarpPay</string>
<string name="txtTotalAmountConfirm">Gesamtbetrag: %1$,.2f </string>
<string name="action_settings">Settings</string>