Skip to content
Snippets Groups Projects
Commit c656eb54 authored by Christian Dresen's avatar Christian Dresen
Browse files

Package and App-Rename

parent b11a4740
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 45 additions and 50 deletions
WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/listener/CategoryOnClickListener.java → WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/listener/CategoryOnClickListener.java
+ 2
− 4
View file @ c656eb54
package ms.itsecteam.warpdrink.listener; package ms.warpzone.warppay.listener;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import ms.itsecteam.warpdrink.dialogs.ProductDialog; import ms.warpzone.warppay.dialogs.ProductDialog;
import ms.itsecteam.warpdrink.manager.UiManager;
public class CategoryOnClickListener implements View.OnClickListener { public class CategoryOnClickListener implements View.OnClickListener {
......
WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/manager/DataManager.java → WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/DataManager.java
+ 6
− 7
View file @ c656eb54
package ms.itsecteam.warpdrink.manager; package ms.warpzone.warppay.manager;
import android.util.Log; import android.util.Log;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import ms.itsecteam.warpdrink.data.models.local.User; import ms.warpzone.warppay.data.models.local.User;
import ms.itsecteam.warpdrink.data.models.rest.RestProduct; import ms.warpzone.warppay.data.models.rest.RestProduct;
import ms.itsecteam.warpdrink.data.models.rest.RestTransaction; import ms.warpzone.warppay.data.models.rest.RestTransaction;
import ms.itsecteam.warpdrink.data.models.rest.RestUser; import ms.warpzone.warppay.data.models.rest.RestUser;
import ms.itsecteam.warpdrink.orderList.Order; import ms.warpzone.warppay.orderList.Order;
import retrofit.Callback; import retrofit.Callback;
import retrofit.Response; import retrofit.Response;
import retrofit.Retrofit; import retrofit.Retrofit;
......
WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/manager/MainManager.java → WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/MainManager.java
+ 14
− 13
View file @ c656eb54
package ms.itsecteam.warpdrink.manager; package ms.warpzone.warppay.manager;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
import java.util.List; import java.util.List;
import ms.itsecteam.warpdrink.MainActivity; import ms.warpzone.warppay.MainActivity;
import ms.itsecteam.warpdrink.R; import ms.warpzone.warppay.R;
import ms.itsecteam.warpdrink.data.SQLiteService; import ms.warpzone.warppay.data.SQLiteService;
import ms.itsecteam.warpdrink.data.models.local.Category; import ms.warpzone.warppay.data.models.local.Category;
import ms.itsecteam.warpdrink.data.models.local.User; import ms.warpzone.warppay.data.models.local.User;
import ms.itsecteam.warpdrink.data.RestService; import ms.warpzone.warppay.data.RestService;
import ms.itsecteam.warpdrink.data.models.rest.RestCategory; import ms.warpzone.warppay.data.models.rest.RestCategory;
import ms.itsecteam.warpdrink.data.models.rest.RestProduct; import ms.warpzone.warppay.data.models.rest.RestProduct;
import ms.itsecteam.warpdrink.data.models.rest.RestTransaction; import ms.warpzone.warppay.data.models.rest.RestTransaction;
import ms.itsecteam.warpdrink.data.models.rest.RestUser; import ms.warpzone.warppay.data.models.rest.RestUser;
import ms.itsecteam.warpdrink.orderList.Order; import ms.warpzone.warppay.orderList.Order;
import retrofit.Callback; import retrofit.Callback;
import retrofit.GsonConverterFactory; import retrofit.GsonConverterFactory;
import retrofit.Response; import retrofit.Response;
...@@ -40,6 +40,7 @@ public class MainManager { ...@@ -40,6 +40,7 @@ public class MainManager {
this.uiManager = UiManager.getInstance(); this.uiManager = UiManager.getInstance();
this.dataManager = DataManager.getInstance(); this.dataManager = DataManager.getInstance();
this.restService = this.createRestService(); this.restService = this.createRestService();
} }
private RestService createRestService() { private RestService createRestService() {
...@@ -97,7 +98,7 @@ public class MainManager { ...@@ -97,7 +98,7 @@ public class MainManager {
this.restService.getAllProducts().enqueue(new Callback<List<RestProduct>>() { this.restService.getAllProducts().enqueue(new Callback<List<RestProduct>>() {
@Override @Override
public void onResponse(Response<List<RestProduct>> response, Retrofit retrofit) { 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) { if (productList != null) {
MainManager.getInstance().uiManager.refreshProductData(productList); MainManager.getInstance().uiManager.refreshProductData(productList);
} }
......
WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/manager/UiManager.java → WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/UiManager.java
+ 13
− 14
View file @ c656eb54
package ms.itsecteam.warpdrink.manager; package ms.warpzone.warppay.manager;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.os.Build; import android.os.Build;
import android.text.Editable;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
...@@ -20,18 +19,18 @@ import android.widget.TextView; ...@@ -20,18 +19,18 @@ import android.widget.TextView;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import ms.itsecteam.warpdrink.MainActivity; import ms.warpzone.warppay.MainActivity;
import ms.itsecteam.warpdrink.R; import ms.warpzone.warppay.R;
import ms.itsecteam.warpdrink.data.models.local.Category; import ms.warpzone.warppay.data.models.local.Category;
import ms.itsecteam.warpdrink.data.models.local.Product; import ms.warpzone.warppay.data.models.local.Product;
import ms.itsecteam.warpdrink.data.models.local.User; import ms.warpzone.warppay.data.models.local.User;
import ms.itsecteam.warpdrink.dialogs.ChargeDialog; import ms.warpzone.warppay.dialogs.ChargeDialog;
import ms.itsecteam.warpdrink.dialogs.NewUserDialog; import ms.warpzone.warppay.dialogs.NewUserDialog;
import ms.itsecteam.warpdrink.dialogs.PayChoiceDialog; import ms.warpzone.warppay.dialogs.PayChoiceDialog;
import ms.itsecteam.warpdrink.listener.CategoryOnClickListener; import ms.warpzone.warppay.listener.CategoryOnClickListener;
import ms.itsecteam.warpdrink.orderList.ListViewAdapter; import ms.warpzone.warppay.orderList.ListViewAdapter;
import ms.itsecteam.warpdrink.orderList.ListViewAdapterProducts; import ms.warpzone.warppay.orderList.ListViewAdapterProducts;
import ms.itsecteam.warpdrink.orderList.Order; import ms.warpzone.warppay.orderList.Order;
public class UiManager implements View.OnKeyListener, View.OnClickListener, AdapterView.OnItemClickListener { public class UiManager implements View.OnKeyListener, View.OnClickListener, AdapterView.OnItemClickListener {
......
WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/orderList/ListViewAdapter.java → WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/orderList/ListViewAdapter.java
+ 2
− 3
View file @ c656eb54
package ms.itsecteam.warpdrink.orderList; package ms.warpzone.warppay.orderList;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
...@@ -7,12 +7,11 @@ import android.view.View; ...@@ -7,12 +7,11 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Button; import android.widget.Button;
import android.widget.ImageButton;
import android.widget.TextView; import android.widget.TextView;
import java.util.List; import java.util.List;
import ms.itsecteam.warpdrink.R; import ms.warpzone.warppay.R;
public class ListViewAdapter extends ArrayAdapter<Order> { public class ListViewAdapter extends ArrayAdapter<Order> {
......
WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/orderList/ListViewAdapterProducts.java → WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/orderList/ListViewAdapterProducts.java
+ 3
− 3
View file @ c656eb54
package ms.itsecteam.warpdrink.orderList; package ms.warpzone.warppay.orderList;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
...@@ -10,8 +10,8 @@ import android.widget.TextView; ...@@ -10,8 +10,8 @@ import android.widget.TextView;
import java.util.List; import java.util.List;
import ms.itsecteam.warpdrink.R; import ms.warpzone.warppay.R;
import ms.itsecteam.warpdrink.data.models.local.Product; import ms.warpzone.warppay.data.models.local.Product;
public class ListViewAdapterProducts extends ArrayAdapter<Product>{ public class ListViewAdapterProducts extends ArrayAdapter<Product>{
......
WarpDrinkApp/app/src/main/java/ms/itsecteam/warpdrink/orderList/Order.java → WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/orderList/Order.java
+ 2
− 3
View file @ c656eb54
package ms.itsecteam.warpdrink.orderList; package ms.warpzone.warppay.orderList;
import android.widget.Button; import android.widget.Button;
import android.widget.ImageButton;
import java.io.Serializable; 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 { public class Order implements Serializable {
......
WarpDrinkApp/app/src/main/res/layout/activity_main.xml
+ 1
− 1
View file @ c656eb54
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin" android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_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 <LinearLayout
android:orientation="vertical" android:orientation="vertical"
......
WarpDrinkApp/app/src/main/res/menu/menu_main.xml
+ 1
− 1
View file @ c656eb54
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" 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 <item
android:id="@+id/action_settings" android:id="@+id/action_settings"
android:title="Settings" /> android:title="Settings" />
......
WarpDrinkApp/app/src/main/res/values/strings.xml
+ 1
− 1
View file @ c656eb54
<resources> <resources>
<string name="app_name">WarpDrink</string> <string name="app_name">WarpPay</string>
<string name="txtTotalAmountConfirm">Gesamtbetrag: %1$,.2f </string> <string name="txtTotalAmountConfirm">Gesamtbetrag: %1$,.2f </string>
<string name="action_settings">Settings</string> <string name="action_settings">Settings</string>
......
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