Commit c656eb54 authored by Christian Dresen's avatar Christian Dresen
Browse files

Package and App-Rename

parent b11a4740
package ms.itsecteam.warpdrink;
package ms.itsecteam.warppay;
import android.app.Application;
import android.test.ApplicationTestCase;
......
<?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"
......
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 {
......
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();
......
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;
......
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 {
......
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;
}
......
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;
......
package ms.itsecteam.warpdrink.data.models.local;
package ms.warpzone.warppay.data.models.local;
import com.activeandroid.Model;
import com.activeandroid.annotation.Column;
......
package ms.itsecteam.warpdrink.data.models.local;
package ms.warpzone.warppay.data.models.local;
import com.activeandroid.Model;
import com.activeandroid.annotation.Column;
......
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 {
......
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 {
......
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 {
......
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 {
......
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 {
......
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 {
......
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 {
......
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;
......
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 {
......
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 {
......
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;
......
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);
}
......
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 {
......
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> {
......
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>{
......
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 {
......
......@@ -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"
......
<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" />
......
<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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment