volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

initial commit

Browse Source
This commit is contained in:
cimenmus
2019-03-16 17:18:27 +03:00
parent 02ff66bd16
commit 8b066ff771
155 changed files with 1161 additions and 787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
.idea/assetWizardSettings.xml generated Normal file
View File

@@ -0,0 +1,143 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="WizardSettings">
<option name="children">
<map>
<entry key="imageWizard">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="imageAssetPanel">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="actionbar">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="clipArt">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
<option name="values">
<map>
<entry key="theme" value="HOLO_DARK" />
<entry key="themeColor" value="ffffff" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="launcher">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="backgroundImage">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="trimmed" value="true" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="foregroundImage">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
<entry key="scalingPercent" value="90" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
<option name="values">
<map>
<entry key="backgroundAssetType" value="COLOR" />
<entry key="backgroundColor" value="d03f3f" />
<entry key="foregroundImage" value="$USER_HOME$/Desktop/pizzamax-512.png" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="launcherLegacy">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="clipArt">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="notification">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="clipArt">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="vectorWizard">
<value>
<PersistentState />
</value>
</entry>
</map>
</option>
</component>
</project>

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

BIN
.idea/caches/gradle_models.ser generated
View File

Binary file not shown.

2
.idea/modules.xml generated
View File

@@ -3,7 +3,7 @@
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/pizzapp-android.iml" filepath="$PROJECT_DIR$/pizzapp-android.iml" /> <module fileurl="file://$PROJECT_DIR$/pizzamaxx-android.iml" filepath="$PROJECT_DIR$/pizzamaxx-android.iml" />
</modules> </modules>
</component> </component>
</project> </project>

4
app/build.gradle
View File

@@ -19,7 +19,7 @@ repositories {
android { android {
compileSdkVersion 28 compileSdkVersion 28
defaultConfig { defaultConfig {
applicationId "ch.pizzapp.capri" applicationId "ch.pizzamaxx.capri"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 28 targetSdkVersion 28
versionCode 26 // play store'daki version --> canlı: 25 - dahili test: 24 versionCode 26 // play store'daki version --> canlı: 25 - dahili test: 24
@@ -27,7 +27,7 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
manifestPlaceholders = [ manifestPlaceholders = [
onesignal_app_id: '8cff62c3-88f0-4dcf-ab72-36d9aa272e30', onesignal_app_id: 'deeeccf5-0d0b-4457-a54f-ec7b6d06092d',
// Project number pulled from dashboard, local value is ignored. // Project number pulled from dashboard, local value is ignored.
onesignal_google_project_number: 'REMOTE' onesignal_google_project_number: 'REMOTE'
] ]

2
app/src/androidTest/java/ch/pizzapp/android/ExampleInstrumentedTest.java → app/src/androidTest/java/ch/pizzamaxx/android/ExampleInstrumentedTest.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android; package ch.pizzamaxx.android;
import android.content.Context; import android.content.Context;
import android.support.test.InstrumentationRegistry; import android.support.test.InstrumentationRegistry;

38
app/src/main/AndroidManifest.xml
View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ch.pizzapp.android"> package="ch.pizzamaxx.android">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application <application
android:name=".App" android:name="ch.pizzamaxx.android.App"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher_new" android:icon="@mipmap/ic_launcher"
android:logo="@mipmap/ic_launcher_new" android:logo="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_new_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"
android:theme="@style/AppTheme.NoActionBar"> android:theme="@style/AppTheme.NoActionBar">
@@ -22,7 +22,7 @@
/> />
<activity <activity
android:name=".activity.SplashActivity" android:name="ch.pizzamaxx.android.activity.SplashActivity"
android:screenOrientation="portrait"> android:screenOrientation="portrait">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@@ -31,44 +31,44 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".activity.LoginActivity" android:name="ch.pizzamaxx.android.activity.LoginActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".activity.RegisterActivity" android:name="ch.pizzamaxx.android.activity.RegisterActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".activity.MainActivity" android:name="ch.pizzamaxx.android.activity.MainActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".activity.CreateOrderActivity" android:name="ch.pizzamaxx.android.activity.CreateOrderActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name=".activity.ForgotPasswordActivity" android:name="ch.pizzamaxx.android.activity.ForgotPasswordActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".activity.MyAddressesActivity" android:name="ch.pizzamaxx.android.activity.MyAddressesActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".activity.UpdatePasswordActivity" android:name="ch.pizzamaxx.android.activity.UpdatePasswordActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".activity.AddAddressActivity" android:name="ch.pizzamaxx.android.activity.AddAddressActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".activity.UpdateProfileActivity" android:name="ch.pizzamaxx.android.activity.UpdateProfileActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".activity.ProductDetailsActivity" android:name="ch.pizzamaxx.android.activity.ProductDetailsActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".activity.OrderHistoryDetailsActivity" android:name="ch.pizzamaxx.android.activity.OrderHistoryDetailsActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".activity.CampaignProductListActivity" android:name="ch.pizzamaxx.android.activity.CampaignProductListActivity"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity <activity
android:name=".activity.CampaignProductDetailsActivity" android:name="ch.pizzamaxx.android.activity.CampaignProductDetailsActivity"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity android:name="com.braintreepayments.api.BraintreeBrowserSwitchActivity" <activity android:name="com.braintreepayments.api.BraintreeBrowserSwitchActivity"

BIN
app/src/main/ic_launcher-web.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 35 KiB

3
app/src/main/java/ch/pizzapp/android/App.java → app/src/main/java/ch/pizzamaxx/android/App.java
View File

@@ -1,6 +1,5 @@
package ch.pizzapp.android; package ch.pizzamaxx.android;
import android.app.Application;
import android.support.multidex.MultiDexApplication; import android.support.multidex.MultiDexApplication;
import com.crashlytics.android.Crashlytics; import com.crashlytics.android.Crashlytics;

32
app/src/main/java/ch/pizzapp/android/activity/AddAddressActivity.java → app/src/main/java/ch/pizzamaxx/android/activity/AddAddressActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.activity; package ch.pizzamaxx.android.activity;
import android.content.Intent; import android.content.Intent;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
@@ -16,21 +16,21 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.api.ApiEndPoints; import ch.pizzamaxx.android.api.ApiEndPoints;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseArray; import ch.pizzamaxx.android.api.ResponseArray;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.ViewHelper; import ch.pizzamaxx.android.helper.ViewHelper;
import ch.pizzapp.android.model.AddNewAddressResponseModel; import ch.pizzamaxx.android.model.AddNewAddressResponseModel;
import ch.pizzapp.android.model.CityModel; import ch.pizzamaxx.android.model.CityModel;
import ch.pizzapp.android.model.CountryModel; import ch.pizzamaxx.android.model.CountryModel;
import ch.pizzapp.android.model.ZoneModel; import ch.pizzamaxx.android.model.ZoneModel;
import ch.pizzapp.android.view.AppDropdownView; import ch.pizzamaxx.android.view.AppDropdownView;
import ch.pizzapp.android.view.AppEditText; import ch.pizzamaxx.android.view.AppEditText;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

9
app/src/main/java/ch/pizzapp/android/activity/BaseActivity.java → app/src/main/java/ch/pizzamaxx/android/activity/BaseActivity.java
View File

@@ -1,17 +1,12 @@
package ch.pizzapp.android.activity; package ch.pizzamaxx.android.activity;
import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.PersistableBundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.view.Window;
import android.view.WindowManager;
import ch.pizzapp.android.helper.DisplayHelper; import ch.pizzamaxx.android.helper.DisplayHelper;
import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper; import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
/** /**

44
app/src/main/java/ch/pizzapp/android/activity/CampaignProductDetailsActivity.java → app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductDetailsActivity.java
View File

@@ -1,6 +1,5 @@
package ch.pizzapp.android.activity; package ch.pizzamaxx.android.activity;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
@@ -16,27 +15,26 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter;
import ch.pizzapp.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter;
import ch.pizzapp.android.api.ApiConstants; import ch.pizzamaxx.android.api.ApiEndPoints;
import ch.pizzapp.android.api.ApiEndPoints; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.ImageLoadHelper;
import ch.pizzapp.android.helper.ImageLoadHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SharedPrefsHelper;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.helper.TextHelper;
import ch.pizzapp.android.helper.TextHelper; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.model.AddProductToBasketResponseModel;
import ch.pizzapp.android.model.AddProductToBasketResponseModel; import ch.pizzamaxx.android.model.CampaignModel;
import ch.pizzapp.android.model.CampaignModel; import ch.pizzamaxx.android.model.cart.CartInfoModel;
import ch.pizzapp.android.model.cart.CartInfoModel; import ch.pizzamaxx.android.model.menu.MenuProductModel;
import ch.pizzapp.android.model.menu.MenuProductModel; import ch.pizzamaxx.android.model.menu.MenuProductOptionModel;
import ch.pizzapp.android.model.menu.MenuProductOptionModel; import ch.pizzamaxx.android.model.menu.MenuProductOptionValueModel;
import ch.pizzapp.android.model.menu.MenuProductOptionValueModel;
import okhttp3.FormBody; import okhttp3.FormBody;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import retrofit2.Call; import retrofit2.Call;

28
app/src/main/java/ch/pizzapp/android/activity/CampaignProductListActivity.java → app/src/main/java/ch/pizzamaxx/android/activity/CampaignProductListActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.activity; package ch.pizzamaxx.android.activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -12,19 +12,19 @@ import java.util.Comparator;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.adapter.recycler.MenuProductRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.MenuProductRecyclerAdapter;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseArray; import ch.pizzamaxx.android.api.ResponseArray;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.DisplayHelper; import ch.pizzamaxx.android.helper.DisplayHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.CampaignModel; import ch.pizzamaxx.android.model.CampaignModel;
import ch.pizzapp.android.model.menu.MenuProductModel; import ch.pizzamaxx.android.model.menu.MenuProductModel;
import ch.pizzapp.android.view.AppToolbar; import ch.pizzamaxx.android.view.AppToolbar;
import ch.pizzapp.android.view.GridSpacesItemDecoration; import ch.pizzamaxx.android.view.GridSpacesItemDecoration;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

28
app/src/main/java/ch/pizzapp/android/activity/CreateOrderActivity.java → app/src/main/java/ch/pizzamaxx/android/activity/CreateOrderActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.activity; package ch.pizzamaxx.android.activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -11,19 +11,19 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.api.ApiConstants; import ch.pizzamaxx.android.api.ApiConstants;
import ch.pizzapp.android.fragment.createOrder.CreateOrderNoteFragment; import ch.pizzamaxx.android.fragment.createOrder.CreateOrderNoteFragment;
import ch.pizzapp.android.fragment.createOrder.CreateOrderResultFragment; import ch.pizzamaxx.android.fragment.createOrder.CreateOrderResultFragment;
import ch.pizzapp.android.fragment.createOrder.CreateOrderSummaryFragment; import ch.pizzamaxx.android.fragment.createOrder.CreateOrderSummaryFragment;
import ch.pizzapp.android.fragment.createOrder.PaymentMethodFragment; import ch.pizzamaxx.android.fragment.createOrder.PaymentMethodFragment;
import ch.pizzapp.android.fragment.createOrder.ShippingAddressFragment; import ch.pizzamaxx.android.fragment.createOrder.ShippingAddressFragment;
import ch.pizzapp.android.fragment.createOrder.ShippingMethodFragment; import ch.pizzamaxx.android.fragment.createOrder.ShippingMethodFragment;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.helper.SharedPrefsHelper;
import ch.pizzapp.android.model.AddressModel; import ch.pizzamaxx.android.model.AddressModel;
import ch.pizzapp.android.model.PaymentMethodModel; import ch.pizzamaxx.android.model.PaymentMethodModel;
import ch.pizzapp.android.model.ShippingMethodModel; import ch.pizzamaxx.android.model.ShippingMethodModel;
import ch.pizzapp.android.model.cart.CartInfoModel; import ch.pizzamaxx.android.model.cart.CartInfoModel;
public class CreateOrderActivity extends BaseActivity { public class CreateOrderActivity extends BaseActivity {

18
app/src/main/java/ch/pizzapp/android/activity/ForgotPasswordActivity.java → app/src/main/java/ch/pizzamaxx/android/activity/ForgotPasswordActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.activity; package ch.pizzamaxx.android.activity;
import android.content.Intent; import android.content.Intent;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
@@ -12,14 +12,14 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.ViewHelper; import ch.pizzamaxx.android.helper.ViewHelper;
import ch.pizzapp.android.view.AppEditText; import ch.pizzamaxx.android.view.AppEditText;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

32
app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java → app/src/main/java/ch/pizzamaxx/android/activity/LoginActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.activity; package ch.pizzamaxx.android.activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -12,21 +12,21 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.api.ApiEndPoints; import ch.pizzamaxx.android.api.ApiEndPoints;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.helper.SharedPrefsHelper;
import ch.pizzapp.android.helper.ViewHelper; import ch.pizzamaxx.android.helper.ViewHelper;
import ch.pizzapp.android.model.CustomerTokenModel; import ch.pizzamaxx.android.model.CustomerTokenModel;
import ch.pizzapp.android.model.UserModel; import ch.pizzamaxx.android.model.UserModel;
import ch.pizzapp.android.model.cart.CartInfoModel; import ch.pizzamaxx.android.model.cart.CartInfoModel;
import ch.pizzapp.android.view.AppEditText; import ch.pizzamaxx.android.view.AppEditText;
import ch.pizzapp.android.view.AppToolbar; import ch.pizzamaxx.android.view.AppToolbar;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

30
app/src/main/java/ch/pizzapp/android/activity/MainActivity.java → app/src/main/java/ch/pizzamaxx/android/activity/MainActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.activity; package ch.pizzamaxx.android.activity;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
@@ -28,20 +28,20 @@ import butterknife.BindColor;
import butterknife.BindDrawable; import butterknife.BindDrawable;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.adapter.recycler.NavigationMenuRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.NavigationMenuRecyclerAdapter;
import ch.pizzapp.android.fragment.CartFragment; import ch.pizzamaxx.android.fragment.CartFragment;
import ch.pizzapp.android.fragment.OrderHistoryFragment; import ch.pizzamaxx.android.fragment.OrderHistoryFragment;
import ch.pizzapp.android.fragment.StoreInfoFragment; import ch.pizzamaxx.android.fragment.StoreInfoFragment;
import ch.pizzapp.android.fragment.MenuFragment; import ch.pizzamaxx.android.fragment.MenuFragment;
import ch.pizzapp.android.fragment.ProductFragment; import ch.pizzamaxx.android.fragment.ProductFragment;
import ch.pizzapp.android.fragment.ProfileFragment; import ch.pizzamaxx.android.fragment.ProfileFragment;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.helper.SharedPrefsHelper;
import ch.pizzapp.android.model.CategoryModel; import ch.pizzamaxx.android.model.CategoryModel;
import ch.pizzapp.android.view.AppToolbar; import ch.pizzamaxx.android.view.AppToolbar;
import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters; import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters;
import io.github.luizgrp.sectionedrecyclerviewadapter.SectionedRecyclerViewAdapter; import io.github.luizgrp.sectionedrecyclerviewadapter.SectionedRecyclerViewAdapter;
import io.github.luizgrp.sectionedrecyclerviewadapter.StatelessSection; import io.github.luizgrp.sectionedrecyclerviewadapter.StatelessSection;

26
app/src/main/java/ch/pizzapp/android/activity/MyAddressesActivity.java → app/src/main/java/ch/pizzamaxx/android/activity/MyAddressesActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.activity; package ch.pizzamaxx.android.activity;
import android.content.Intent; import android.content.Intent;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
@@ -17,18 +17,18 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.adapter.recycler.MyAddressesRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.MyAddressesRecyclerAdapter;
import ch.pizzapp.android.api.ApiEndPoints; import ch.pizzamaxx.android.api.ApiEndPoints;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseArray; import ch.pizzamaxx.android.api.ResponseArray;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.AddressModel; import ch.pizzamaxx.android.model.AddressModel;
import ch.pizzapp.android.model.DeleteAddressResponseModel; import ch.pizzamaxx.android.model.DeleteAddressResponseModel;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

30
app/src/main/java/ch/pizzapp/android/activity/OrderHistoryDetailsActivity.java → app/src/main/java/ch/pizzamaxx/android/activity/OrderHistoryDetailsActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.activity; package ch.pizzamaxx.android.activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -11,20 +11,20 @@ import java.util.HashMap;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.api.ApiEndPoints; import ch.pizzamaxx.android.api.ApiEndPoints;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseArray; import ch.pizzamaxx.android.api.ResponseArray;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.TextHelper; import ch.pizzamaxx.android.helper.TextHelper;
import ch.pizzapp.android.model.history.OrderHistoryModel; import ch.pizzamaxx.android.model.history.OrderHistoryModel;
import ch.pizzapp.android.model.history.OrderHistoryProductModel; import ch.pizzamaxx.android.model.history.OrderHistoryProductModel;
import ch.pizzapp.android.model.history.OrderHistoryProductOptionModel; import ch.pizzamaxx.android.model.history.OrderHistoryProductOptionModel;
import ch.pizzapp.android.view.AppInfoView; import ch.pizzamaxx.android.view.AppInfoView;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

40
app/src/main/java/ch/pizzapp/android/activity/ProductDetailsActivity.java → app/src/main/java/ch/pizzamaxx/android/activity/ProductDetailsActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.activity; package ch.pizzamaxx.android.activity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.GridLayoutManager;
@@ -15,25 +15,25 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter;
import ch.pizzapp.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter;
import ch.pizzapp.android.api.ApiEndPoints; import ch.pizzamaxx.android.api.ApiEndPoints;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.ImageLoadHelper; import ch.pizzamaxx.android.helper.ImageLoadHelper;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.helper.SharedPrefsHelper;
import ch.pizzapp.android.helper.TextHelper; import ch.pizzamaxx.android.helper.TextHelper;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.AddProductToBasketResponseModel; import ch.pizzamaxx.android.model.AddProductToBasketResponseModel;
import ch.pizzapp.android.model.cart.CartInfoModel; import ch.pizzamaxx.android.model.cart.CartInfoModel;
import ch.pizzapp.android.model.menu.MenuProductModel; import ch.pizzamaxx.android.model.menu.MenuProductModel;
import ch.pizzapp.android.model.menu.MenuProductOptionModel; import ch.pizzamaxx.android.model.menu.MenuProductOptionModel;
import ch.pizzapp.android.model.menu.MenuProductOptionValueModel; import ch.pizzamaxx.android.model.menu.MenuProductOptionValueModel;
import okhttp3.FormBody; import okhttp3.FormBody;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import retrofit2.Call; import retrofit2.Call;

34
app/src/main/java/ch/pizzapp/android/activity/RegisterActivity.java → app/src/main/java/ch/pizzamaxx/android/activity/RegisterActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.activity; package ch.pizzamaxx.android.activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -17,22 +17,22 @@ import butterknife.BindView;
import butterknife.BindViews; import butterknife.BindViews;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseArray; import ch.pizzamaxx.android.api.ResponseArray;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.helper.SharedPrefsHelper;
import ch.pizzapp.android.helper.ViewHelper; import ch.pizzamaxx.android.helper.ViewHelper;
import ch.pizzapp.android.model.CityModel; import ch.pizzamaxx.android.model.CityModel;
import ch.pizzapp.android.model.CountryModel; import ch.pizzamaxx.android.model.CountryModel;
import ch.pizzapp.android.model.CustomerTokenModel; import ch.pizzamaxx.android.model.CustomerTokenModel;
import ch.pizzapp.android.model.UserModel; import ch.pizzamaxx.android.model.UserModel;
import ch.pizzapp.android.model.ZoneModel; import ch.pizzamaxx.android.model.ZoneModel;
import ch.pizzapp.android.view.AppDropdownView; import ch.pizzamaxx.android.view.AppDropdownView;
import ch.pizzapp.android.view.AppEditText; import ch.pizzamaxx.android.view.AppEditText;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

44
app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java → app/src/main/java/ch/pizzamaxx/android/activity/SplashActivity.java
View File

@@ -1,21 +1,12 @@
package ch.pizzapp.android.activity; package ch.pizzamaxx.android.activity;
import android.annotation.TargetApi;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.support.v4.content.ContextCompat;
import android.util.Log;
import android.view.View; import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
@@ -30,23 +21,22 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.api.ApiConstants; import ch.pizzamaxx.android.api.ApiConstants;
import ch.pizzapp.android.api.ApiEndPoints; import ch.pizzamaxx.android.api.ApiEndPoints;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseArray; import ch.pizzamaxx.android.api.ResponseArray;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.DisplayHelper; import ch.pizzamaxx.android.helper.NetworkHelper;
import ch.pizzapp.android.helper.NetworkHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SharedPrefsHelper;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.model.AppVersionModel;
import ch.pizzapp.android.model.AppVersionModel; import ch.pizzamaxx.android.model.CategoryModel;
import ch.pizzapp.android.model.CategoryModel; import ch.pizzamaxx.android.model.StoreModel;
import ch.pizzapp.android.model.StoreModel; import ch.pizzamaxx.android.model.cart.CartInfoModel;
import ch.pizzapp.android.model.cart.CartInfoModel;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

20
app/src/main/java/ch/pizzapp/android/activity/UpdatePasswordActivity.java → app/src/main/java/ch/pizzamaxx/android/activity/UpdatePasswordActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.activity; package ch.pizzamaxx.android.activity;
import android.os.Bundle; import android.os.Bundle;
import android.widget.Button; import android.widget.Button;
@@ -9,15 +9,15 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.api.ApiEndPoints; import ch.pizzamaxx.android.api.ApiEndPoints;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.ViewHelper; import ch.pizzamaxx.android.helper.ViewHelper;
import ch.pizzapp.android.view.AppEditText; import ch.pizzamaxx.android.view.AppEditText;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

20
app/src/main/java/ch/pizzapp/android/activity/UpdateProfileActivity.java → app/src/main/java/ch/pizzamaxx/android/activity/UpdateProfileActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.activity; package ch.pizzamaxx.android.activity;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.os.Bundle; import android.os.Bundle;
@@ -13,15 +13,15 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.api.ApiEndPoints; import ch.pizzamaxx.android.api.ApiEndPoints;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.model.UserModel; import ch.pizzamaxx.android.model.UserModel;
import ch.pizzapp.android.view.AppEditText; import ch.pizzamaxx.android.view.AppEditText;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

12
app/src/main/java/ch/pizzapp/android/adapter/pager/OrderPagerAdapter.java → app/src/main/java/ch/pizzamaxx/android/adapter/pager/OrderPagerAdapter.java
View File

@@ -1,14 +1,14 @@
package ch.pizzapp.android.adapter.pager; package ch.pizzamaxx.android.adapter.pager;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter; import android.support.v4.app.FragmentPagerAdapter;
import ch.pizzapp.android.fragment.createOrder.CreateOrderResultFragment; import ch.pizzamaxx.android.fragment.createOrder.CreateOrderResultFragment;
import ch.pizzapp.android.fragment.createOrder.CreateOrderSummaryFragment; import ch.pizzamaxx.android.fragment.createOrder.CreateOrderSummaryFragment;
import ch.pizzapp.android.fragment.createOrder.PaymentMethodFragment; import ch.pizzamaxx.android.fragment.createOrder.PaymentMethodFragment;
import ch.pizzapp.android.fragment.createOrder.ShippingAddressFragment; import ch.pizzamaxx.android.fragment.createOrder.ShippingAddressFragment;
import ch.pizzapp.android.fragment.createOrder.ShippingMethodFragment; import ch.pizzamaxx.android.fragment.createOrder.ShippingMethodFragment;
/** /**
* Created by cimenmus on 17/10/2017. * Created by cimenmus on 17/10/2017.

13
app/src/main/java/ch/pizzapp/android/adapter/recycler/CartRecyclerAdapter.java → app/src/main/java/ch/pizzamaxx/android/adapter/recycler/CartRecyclerAdapter.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.adapter.recycler; package ch.pizzamaxx.android.adapter.recycler;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -11,12 +11,11 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.helper.TextHelper; import ch.pizzamaxx.android.helper.TextHelper;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.cart.CartProductModel; import ch.pizzamaxx.android.model.cart.CartProductModel;
import ch.pizzapp.android.model.cart.CartProductOptionModel;
/** /**
* Created by cimenmus on 05/10/2017. * Created by cimenmus on 05/10/2017.

14
app/src/main/java/ch/pizzapp/android/adapter/recycler/MenuProductRecyclerAdapter.java → app/src/main/java/ch/pizzamaxx/android/adapter/recycler/MenuProductRecyclerAdapter.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.adapter.recycler; package ch.pizzamaxx.android.adapter.recycler;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -12,12 +12,12 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.helper.ImageLoadHelper; import ch.pizzamaxx.android.helper.ImageLoadHelper;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.helper.TextHelper; import ch.pizzamaxx.android.helper.TextHelper;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.menu.MenuProductModel; import ch.pizzamaxx.android.model.menu.MenuProductModel;
/** /**
* Created by cimenmus on 20/09/2017. * Created by cimenmus on 20/09/2017.

9
app/src/main/java/ch/pizzapp/android/adapter/recycler/MyAddressesRecyclerAdapter.java → app/src/main/java/ch/pizzamaxx/android/adapter/recycler/MyAddressesRecyclerAdapter.java
View File

@@ -1,6 +1,5 @@
package ch.pizzapp.android.adapter.recycler; package ch.pizzamaxx.android.adapter.recycler;
import android.support.v7.widget.AppCompatRadioButton;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@@ -12,9 +11,9 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.AddressModel; import ch.pizzamaxx.android.model.AddressModel;
/** /**
* Created by cimenmus on 24.10.2017. * Created by cimenmus on 24.10.2017.

10
app/src/main/java/ch/pizzapp/android/adapter/recycler/NavigationMenuRecyclerAdapter.java → app/src/main/java/ch/pizzamaxx/android/adapter/recycler/NavigationMenuRecyclerAdapter.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.adapter.recycler; package ch.pizzamaxx.android.adapter.recycler;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -10,10 +10,10 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.CategoryModel; import ch.pizzamaxx.android.model.CategoryModel;
/** /**
* Created by cimenmus on 02/10/2017. * Created by cimenmus on 02/10/2017.

10
app/src/main/java/ch/pizzapp/android/adapter/recycler/OrderHistoryRecyclerAdapter.java → app/src/main/java/ch/pizzamaxx/android/adapter/recycler/OrderHistoryRecyclerAdapter.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.adapter.recycler; package ch.pizzamaxx.android.adapter.recycler;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -10,10 +10,10 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.history.OrderHistoryModel; import ch.pizzamaxx.android.model.history.OrderHistoryModel;
/** /**
* Created by cimenmus on 04/10/2017. * Created by cimenmus on 04/10/2017.

9
app/src/main/java/ch/pizzapp/android/adapter/recycler/OrderPriceRecyclerAdapter.java → app/src/main/java/ch/pizzamaxx/android/adapter/recycler/OrderPriceRecyclerAdapter.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.adapter.recycler; package ch.pizzamaxx.android.adapter.recycler;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -10,10 +10,9 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.model.cart.CartTotalModel;
import ch.pizzapp.android.model.cart.CartTotalModel;
public class OrderPriceRecyclerAdapter extends RecyclerView.Adapter<OrderPriceRecyclerAdapter.ViewHolder> { public class OrderPriceRecyclerAdapter extends RecyclerView.Adapter<OrderPriceRecyclerAdapter.ViewHolder> {

9
app/src/main/java/ch/pizzapp/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java → app/src/main/java/ch/pizzamaxx/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java
View File

@@ -1,19 +1,18 @@
package ch.pizzapp.android.adapter.recycler; package ch.pizzamaxx.android.adapter.recycler;
import android.support.v7.widget.AppCompatRadioButton; import android.support.v7.widget.AppCompatRadioButton;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView;
import java.util.ArrayList; import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.PaymentMethodModel; import ch.pizzamaxx.android.model.PaymentMethodModel;
/** /**
* Created by cimenmus on 17/10/2017. * Created by cimenmus on 17/10/2017.

12
app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java → app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductCheckboxOptionsRecyclerAdapter.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.adapter.recycler; package ch.pizzamaxx.android.adapter.recycler;
import android.support.v7.widget.AppCompatCheckBox; import android.support.v7.widget.AppCompatCheckBox;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
@@ -11,11 +11,11 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.menu.MenuProductOptionValueModel; import ch.pizzamaxx.android.model.menu.MenuProductOptionValueModel;
/** /**
* Created by cimenmus on 08/10/2017. * Created by cimenmus on 08/10/2017.

12
app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java → app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductOnOrderSummaryRecyclerAdapter.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.adapter.recycler; package ch.pizzamaxx.android.adapter.recycler;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -10,11 +10,11 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.helper.TextHelper; import ch.pizzamaxx.android.helper.TextHelper;
import ch.pizzapp.android.model.cart.CartProductModel; import ch.pizzamaxx.android.model.cart.CartProductModel;
public class ProductOnOrderSummaryRecyclerAdapter extends RecyclerView.Adapter<ProductOnOrderSummaryRecyclerAdapter.ViewHolder> { public class ProductOnOrderSummaryRecyclerAdapter extends RecyclerView.Adapter<ProductOnOrderSummaryRecyclerAdapter.ViewHolder> {

12
app/src/main/java/ch/pizzapp/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java → app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ProductRadioOptionsRecyclerAdapter.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.adapter.recycler; package ch.pizzamaxx.android.adapter.recycler;
import android.support.v7.widget.AppCompatRadioButton; import android.support.v7.widget.AppCompatRadioButton;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
@@ -11,11 +11,11 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.menu.MenuProductOptionValueModel; import ch.pizzamaxx.android.model.menu.MenuProductOptionValueModel;
/** /**
* Created by cimenmus on 08/10/2017. * Created by cimenmus on 08/10/2017.

9
app/src/main/java/ch/pizzapp/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java → app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java
View File

@@ -1,19 +1,18 @@
package ch.pizzapp.android.adapter.recycler; package ch.pizzamaxx.android.adapter.recycler;
import android.support.v7.widget.AppCompatRadioButton; import android.support.v7.widget.AppCompatRadioButton;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView;
import java.util.ArrayList; import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.AddressModel; import ch.pizzamaxx.android.model.AddressModel;
/** /**
* Created by cimenmus on 17/10/2017. * Created by cimenmus on 17/10/2017.

10
app/src/main/java/ch/pizzapp/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java → app/src/main/java/ch/pizzamaxx/android/adapter/recycler/ShippingMethodsRecyclerAdapter.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.adapter.recycler; package ch.pizzamaxx.android.adapter.recycler;
import android.support.v7.widget.AppCompatRadioButton; import android.support.v7.widget.AppCompatRadioButton;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
@@ -11,10 +11,10 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.ShippingMethodModel; import ch.pizzamaxx.android.model.ShippingMethodModel;
/** /**
* Created by cimenmus on 17/10/2017. * Created by cimenmus on 17/10/2017.

6
app/src/main/java/ch/pizzapp/android/api/ApiConstants.java → app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.api; package ch.pizzamaxx.android.api;
public class ApiConstants { public class ApiConstants {
public static final int API_READ_TIMEOUT = 30; public static final int API_READ_TIMEOUT = 30;
@@ -16,10 +16,6 @@ public class ApiConstants {
public static final String CAMPAIGN_CODE_PIZZAPASS = "PIZZAPASS"; public static final String CAMPAIGN_CODE_PIZZAPASS = "PIZZAPASS";
public static final String CAMPAIGN_CODE_CHAMPAGNE = "CHAMPAGNE"; public static final String CAMPAIGN_CODE_CHAMPAGNE = "CHAMPAGNE";
public static final String BRAINTREE_TOKENIZATION_KEY_SANDBOX = "sandbox_wk7668t4_v332h2jkpq44r8w8";
public static final String BRAINTREE_TOKENIZATION_KEY_PRODUCTION = "production_ftdg993w_6hsg7g69zg83hx69";
public static final String PAYMENT_METHOD_CODE_CREDIT_DEBIT_CARD = "braintree"; // Credit / Debit Card public static final String PAYMENT_METHOD_CODE_CREDIT_DEBIT_CARD = "braintree"; // Credit / Debit Card
public static final String PAYMENT_METHOD_CODE_BANK_CASH = "cod"; // Bar public static final String PAYMENT_METHOD_CODE_BANK_CASH = "cod"; // Bar
public static final String PAYMENT_METHOD_CODE_TRANSFER = "bank_transfer"; // Kreditkarten-Kartenzahlung public static final String PAYMENT_METHOD_CODE_TRANSFER = "bank_transfer"; // Kreditkarten-Kartenzahlung

4
app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java → app/src/main/java/ch/pizzamaxx/android/api/ApiEndPoints.java
View File

@@ -1,6 +1,4 @@
package ch.pizzapp.android.api; package ch.pizzamaxx.android.api;
import ch.pizzapp.android.helper.SessionHelper;
public class ApiEndPoints { public class ApiEndPoints {

2
app/src/main/java/ch/pizzapp/android/api/ApiError.java → app/src/main/java/ch/pizzamaxx/android/api/ApiError.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.api; package ch.pizzamaxx.android.api;
public class ApiError { public class ApiError {

13
app/src/main/java/ch/pizzapp/android/api/ApiErrorUtils.java → app/src/main/java/ch/pizzamaxx/android/api/ApiErrorUtils.java
View File

@@ -1,15 +1,14 @@
package ch.pizzapp.android.api; package ch.pizzamaxx.android.api;
import android.content.Intent; import android.content.Intent;
import java.io.IOException;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.activity.LoginActivity; import ch.pizzamaxx.android.activity.LoginActivity;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.helper.SharedPrefsHelper;
import okhttp3.ResponseBody; import okhttp3.ResponseBody;
import retrofit2.Converter; import retrofit2.Converter;
import retrofit2.Response; import retrofit2.Response;

48
app/src/main/java/ch/pizzapp/android/api/ApiInterface.java → app/src/main/java/ch/pizzamaxx/android/api/ApiInterface.java
View File

@@ -1,30 +1,30 @@
package ch.pizzapp.android.api; package ch.pizzamaxx.android.api;
import java.util.HashMap; import java.util.HashMap;
import ch.pizzapp.android.model.AddNewAddressResponseModel; import ch.pizzamaxx.android.model.AddNewAddressResponseModel;
import ch.pizzapp.android.model.AddProductToBasketResponseModel; import ch.pizzamaxx.android.model.AddProductToBasketResponseModel;
import ch.pizzapp.android.model.AddressModel; import ch.pizzamaxx.android.model.AddressModel;
import ch.pizzapp.android.model.AppVersionModel; import ch.pizzamaxx.android.model.AppVersionModel;
import ch.pizzapp.android.model.CampaignModel; import ch.pizzamaxx.android.model.CampaignModel;
import ch.pizzapp.android.model.CheckCouponModel; import ch.pizzamaxx.android.model.CheckCouponModel;
import ch.pizzapp.android.model.CountryModel; import ch.pizzamaxx.android.model.CountryModel;
import ch.pizzapp.android.model.DeleteAddressResponseModel; import ch.pizzamaxx.android.model.DeleteAddressResponseModel;
import ch.pizzapp.android.model.PaymentMethodsResponseModel; import ch.pizzamaxx.android.model.PaymentMethodsResponseModel;
import ch.pizzapp.android.model.PaymentTokenModel; import ch.pizzamaxx.android.model.PaymentTokenModel;
import ch.pizzapp.android.model.RemoveProductFromCartResponseModel; import ch.pizzamaxx.android.model.RemoveProductFromCartResponseModel;
import ch.pizzapp.android.model.ShippingMethodModel; import ch.pizzamaxx.android.model.ShippingMethodModel;
import ch.pizzapp.android.model.StoreInfoModel; import ch.pizzamaxx.android.model.StoreInfoModel;
import ch.pizzapp.android.model.CityModel; import ch.pizzamaxx.android.model.CityModel;
import ch.pizzapp.android.model.StoreModel; import ch.pizzamaxx.android.model.StoreModel;
import ch.pizzapp.android.model.StoreShiftModel; import ch.pizzamaxx.android.model.StoreShiftModel;
import ch.pizzapp.android.model.ZoneModel; import ch.pizzamaxx.android.model.ZoneModel;
import ch.pizzapp.android.model.cart.CartInfoModel; import ch.pizzamaxx.android.model.cart.CartInfoModel;
import ch.pizzapp.android.model.CategoryModel; import ch.pizzamaxx.android.model.CategoryModel;
import ch.pizzapp.android.model.history.OrderHistoryModel; import ch.pizzamaxx.android.model.history.OrderHistoryModel;
import ch.pizzapp.android.model.UserModel; import ch.pizzamaxx.android.model.UserModel;
import ch.pizzapp.android.model.history.OrderHistoryProductModel; import ch.pizzamaxx.android.model.history.OrderHistoryProductModel;
import ch.pizzapp.android.model.menu.MenuProductModel; import ch.pizzamaxx.android.model.menu.MenuProductModel;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.Body; import retrofit2.http.Body;

41
app/src/main/java/ch/pizzapp/android/api/ApiService.java → app/src/main/java/ch/pizzamaxx/android/api/ApiService.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.api; package ch.pizzamaxx.android.api;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
@@ -50,7 +50,7 @@ public class ApiService {
HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); // set your desired log level HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); // set your desired log level
logging.setLevel(HttpLoggingInterceptor.Level.BODY); logging.setLevel(HttpLoggingInterceptor.Level.BODY);
builder.addInterceptor(logging); //builder.addInterceptor(logging);
OkHttpClient client = builder.build(); OkHttpClient client = builder.build();
@@ -63,4 +63,41 @@ public class ApiService {
apiInterface = retrofit.create(ApiInterface.class); apiInterface = retrofit.create(ApiInterface.class);
} }
public void reset3dsTest() {
Gson gson = new GsonBuilder()
.setLenient()
.create();
OkHttpClient.Builder builder = new OkHttpClient().newBuilder();
builder.readTimeout(ApiConstants.API_READ_TIMEOUT, TimeUnit.SECONDS);
builder.connectTimeout(ApiConstants.API_CONNECT_TIMEOUT, TimeUnit.SECONDS);
builder.addInterceptor(new Interceptor() {
@Override
public Response intercept(Interceptor.Chain chain) throws IOException {
Request.Builder builder = chain.request().newBuilder();
builder.addHeader("Content-Type", "application/json");
Request request = builder.build();
return chain.proceed(request);
}
});
HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); // set your desired log level
logging.setLevel(HttpLoggingInterceptor.Level.BODY);
//builder.addInterceptor(logging);
OkHttpClient client = builder.build();
retrofit = new Retrofit.Builder()
.baseUrl("http://pizzamaxx.ch/")
.addConverterFactory(GsonConverterFactory.create(gson))
.client(client)
.build();
apiInterface = retrofit.create(ApiInterface.class);
}
} }

2
app/src/main/java/ch/pizzapp/android/api/BaseResponse.java → app/src/main/java/ch/pizzamaxx/android/api/BaseResponse.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.api; package ch.pizzamaxx.android.api;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

3
app/src/main/java/ch/pizzapp/android/api/ResponseArray.java → app/src/main/java/ch/pizzamaxx/android/api/ResponseArray.java
View File

@@ -1,10 +1,9 @@
package ch.pizzapp.android.api; package ch.pizzamaxx.android.api;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
/** /**
* Created by cimenmus on 05/10/2017. * Created by cimenmus on 05/10/2017.

2
app/src/main/java/ch/pizzapp/android/api/ResponseObject.java → app/src/main/java/ch/pizzamaxx/android/api/ResponseObject.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.api; package ch.pizzamaxx.android.api;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

40
app/src/main/java/ch/pizzapp/android/dialog/ProductPropertiesBottomSheetDialog.java → app/src/main/java/ch/pizzamaxx/android/dialog/ProductPropertiesBottomSheetDialog.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.dialog; package ch.pizzamaxx.android.dialog;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
@@ -20,26 +20,24 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.activity.MainActivity; import ch.pizzamaxx.android.activity.MainActivity;
import ch.pizzapp.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter;
import ch.pizzapp.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter;
import ch.pizzapp.android.api.ApiEndPoints; import ch.pizzamaxx.android.api.ApiEndPoints;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.ImageLoadHelper;
import ch.pizzapp.android.helper.ImageLoadHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SharedPrefsHelper;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.model.cart.CartInfoModel;
import ch.pizzapp.android.model.AddProductToBasketResponseModel; import ch.pizzamaxx.android.model.menu.MenuProductModel;
import ch.pizzapp.android.model.cart.CartInfoModel; import ch.pizzamaxx.android.model.menu.MenuProductOptionModel;
import ch.pizzapp.android.model.menu.MenuProductModel; import ch.pizzamaxx.android.model.menu.MenuProductOptionValueModel;
import ch.pizzapp.android.model.menu.MenuProductOptionModel;
import ch.pizzapp.android.model.menu.MenuProductOptionValueModel;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

6
app/src/main/java/ch/pizzapp/android/fragment/BaseFragment.java → app/src/main/java/ch/pizzamaxx/android/fragment/BaseFragment.java
View File

@@ -1,9 +1,9 @@
package ch.pizzapp.android.fragment; package ch.pizzamaxx.android.fragment;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.activity.MainActivity; import ch.pizzamaxx.android.activity.MainActivity;
/** /**
* Created by cimenmus on 18/09/2017. * Created by cimenmus on 18/09/2017.

48
app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java → app/src/main/java/ch/pizzamaxx/android/fragment/CartFragment.java
View File

@@ -1,13 +1,11 @@
package ch.pizzapp.android.fragment; package ch.pizzamaxx.android.fragment;
import android.app.Activity;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -32,33 +30,31 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.activity.CampaignProductListActivity; import ch.pizzamaxx.android.activity.CampaignProductListActivity;
import ch.pizzapp.android.activity.CreateOrderActivity; import ch.pizzamaxx.android.activity.CreateOrderActivity;
import ch.pizzapp.android.activity.MainActivity; import ch.pizzamaxx.android.activity.MainActivity;
import ch.pizzapp.android.adapter.recycler.CartRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.CartRecyclerAdapter;
import ch.pizzapp.android.api.ApiEndPoints; import ch.pizzamaxx.android.api.ApiEndPoints;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseArray; import ch.pizzamaxx.android.api.ResponseArray;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.helper.SharedPrefsHelper;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.CampaignModel; import ch.pizzamaxx.android.model.CampaignModel;
import ch.pizzapp.android.model.RemoveProductFromCartResponseModel; import ch.pizzamaxx.android.model.RemoveProductFromCartResponseModel;
import ch.pizzapp.android.model.cart.CartInfoModel; import ch.pizzamaxx.android.model.cart.CartInfoModel;
import ch.pizzapp.android.model.cart.CartProductModel; import ch.pizzamaxx.android.model.cart.CartProductModel;
import ch.pizzapp.android.model.menu.MenuProductModel; import ch.pizzamaxx.android.model.menu.MenuProductModel;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
import static android.app.Activity.RESULT_OK;
/** /**
* Created by cimenmus on 18/09/2017. * Created by cimenmus on 18/09/2017.
*/ */

34
app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java → app/src/main/java/ch/pizzamaxx/android/fragment/MenuFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.fragment; package ch.pizzamaxx.android.fragment;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -14,22 +14,22 @@ import java.util.Comparator;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.activity.MainActivity; import ch.pizzamaxx.android.activity.MainActivity;
import ch.pizzapp.android.activity.ProductDetailsActivity; import ch.pizzamaxx.android.activity.ProductDetailsActivity;
import ch.pizzapp.android.adapter.recycler.MenuProductRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.MenuProductRecyclerAdapter;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseArray; import ch.pizzamaxx.android.api.ResponseArray;
import ch.pizzapp.android.dialog.ProductPropertiesBottomSheetDialog; import ch.pizzamaxx.android.dialog.ProductPropertiesBottomSheetDialog;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.DisplayHelper; import ch.pizzamaxx.android.helper.DisplayHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.CategoryModel; import ch.pizzamaxx.android.model.CategoryModel;
import ch.pizzapp.android.model.menu.MenuProductModel; import ch.pizzamaxx.android.model.menu.MenuProductModel;
import ch.pizzapp.android.view.GridSpacesItemDecoration; import ch.pizzamaxx.android.view.GridSpacesItemDecoration;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

31
app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java → app/src/main/java/ch/pizzamaxx/android/fragment/OrderHistoryFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.fragment; package ch.pizzamaxx.android.fragment;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -14,21 +14,20 @@ import java.util.HashMap;
import butterknife.BindString; import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.activity.MainActivity; import ch.pizzamaxx.android.activity.MainActivity;
import ch.pizzapp.android.activity.OrderHistoryDetailsActivity; import ch.pizzamaxx.android.activity.OrderHistoryDetailsActivity;
import ch.pizzapp.android.adapter.recycler.OrderHistoryRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.OrderHistoryRecyclerAdapter;
import ch.pizzapp.android.api.ApiEndPoints; import ch.pizzamaxx.android.api.ApiEndPoints;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseArray; import ch.pizzamaxx.android.api.ResponseArray;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.model.history.OrderHistoryModel;
import ch.pizzapp.android.model.history.OrderHistoryModel;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

36
app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java → app/src/main/java/ch/pizzamaxx/android/fragment/ProductFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.fragment; package ch.pizzamaxx.android.fragment;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -12,23 +12,23 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.activity.MainActivity; import ch.pizzamaxx.android.activity.MainActivity;
import ch.pizzapp.android.activity.ProductDetailsActivity; import ch.pizzamaxx.android.activity.ProductDetailsActivity;
import ch.pizzapp.android.adapter.recycler.MenuProductRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.MenuProductRecyclerAdapter;
import ch.pizzapp.android.api.ApiConstants; import ch.pizzamaxx.android.api.ApiConstants;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseArray; import ch.pizzamaxx.android.api.ResponseArray;
import ch.pizzapp.android.dialog.ProductPropertiesBottomSheetDialog; import ch.pizzamaxx.android.dialog.ProductPropertiesBottomSheetDialog;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.DisplayHelper; import ch.pizzamaxx.android.helper.DisplayHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.CategoryModel; import ch.pizzamaxx.android.model.CategoryModel;
import ch.pizzapp.android.model.menu.MenuProductModel; import ch.pizzamaxx.android.model.menu.MenuProductModel;
import ch.pizzapp.android.view.GridSpacesItemDecoration; import ch.pizzamaxx.android.view.GridSpacesItemDecoration;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

36
app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java → app/src/main/java/ch/pizzamaxx/android/fragment/ProfileFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.fragment; package ch.pizzamaxx.android.fragment;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -8,7 +8,6 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.RelativeLayout;
import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
@@ -21,23 +20,22 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.activity.LoginActivity; import ch.pizzamaxx.android.activity.MyAddressesActivity;
import ch.pizzapp.android.activity.MyAddressesActivity; import ch.pizzamaxx.android.activity.SplashActivity;
import ch.pizzapp.android.activity.SplashActivity; import ch.pizzamaxx.android.activity.UpdatePasswordActivity;
import ch.pizzapp.android.activity.UpdatePasswordActivity; import ch.pizzamaxx.android.activity.UpdateProfileActivity;
import ch.pizzapp.android.activity.UpdateProfileActivity; import ch.pizzamaxx.android.api.ApiConstants;
import ch.pizzapp.android.api.ApiConstants; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.NetworkHelper;
import ch.pizzapp.android.helper.NetworkHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SharedPrefsHelper;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.model.UserModel;
import ch.pizzapp.android.model.UserModel; import ch.pizzamaxx.android.view.AppInfoView;
import ch.pizzapp.android.view.AppInfoView;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

18
app/src/main/java/ch/pizzapp/android/fragment/StoreInfoFragment.java → app/src/main/java/ch/pizzamaxx/android/fragment/StoreInfoFragment.java
View File

@@ -1,23 +1,21 @@
package ch.pizzapp.android.fragment; package ch.pizzamaxx.android.fragment;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.webkit.WebView; import android.webkit.WebView;
import android.webkit.WebViewClient;
import butterknife.BindString; import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.model.StoreInfoModel; import ch.pizzamaxx.android.model.StoreInfoModel;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

6
app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderBaseFragment.java → app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderBaseFragment.java
View File

@@ -1,10 +1,10 @@
package ch.pizzapp.android.fragment.createOrder; package ch.pizzamaxx.android.fragment.createOrder;
import android.widget.TextView; import android.widget.TextView;
import butterknife.BindView; import butterknife.BindView;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.fragment.BaseFragment; import ch.pizzamaxx.android.fragment.BaseFragment;
/** /**
* Created by cimenmus on 21.10.2017. * Created by cimenmus on 21.10.2017.

18
app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java → app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderNoteFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.fragment.createOrder; package ch.pizzamaxx.android.fragment.createOrder;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.AppCompatRadioButton; import android.support.v7.widget.AppCompatRadioButton;
@@ -12,12 +12,12 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.activity.CreateOrderActivity; import ch.pizzamaxx.android.activity.CreateOrderActivity;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.helper.SharedPrefsHelper;
import ch.pizzapp.android.model.cart.CartProductModel; import ch.pizzamaxx.android.model.cart.CartProductModel;
import ch.pizzapp.android.view.AppEditText; import ch.pizzamaxx.android.view.AppEditText;
/** /**
* Created by cimenmus on 28.10.2017. * Created by cimenmus on 28.10.2017.
@@ -69,6 +69,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment {
createOrderActivity.onPreviousClicked(FRAGMENT_NAME); createOrderActivity.onPreviousClicked(FRAGMENT_NAME);
break; break;
case R.id.nextTextView: case R.id.nextTextView:
/*
if(isCartContainsAnyPizza(createOrderActivity.getCartInfo().getProducts())){ if(isCartContainsAnyPizza(createOrderActivity.getCartInfo().getProducts())){
if(yesRadioButton.isChecked()){ if(yesRadioButton.isChecked()){
createOrderActivity.setSlicePizza(true); createOrderActivity.setSlicePizza(true);
@@ -77,6 +78,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment {
createOrderActivity.setSlicePizza(false); createOrderActivity.setSlicePizza(false);
} }
} }
*/
createOrderActivity.setOrderNote(orderNoteAppEditText.getText()); createOrderActivity.setOrderNote(orderNoteAppEditText.getText());
createOrderActivity.onNextClicked(FRAGMENT_NAME); createOrderActivity.onNextClicked(FRAGMENT_NAME);
break; break;
@@ -85,6 +87,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment {
private void initViews(){ private void initViews(){
createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity; createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
/*
if(isCartContainsAnyPizza(createOrderActivity.getCartInfo().getProducts())){ if(isCartContainsAnyPizza(createOrderActivity.getCartInfo().getProducts())){
slicePizzaLayout.setVisibility(View.VISIBLE); slicePizzaLayout.setVisibility(View.VISIBLE);
if(createOrderActivity.getSlicePizza() != null){ if(createOrderActivity.getSlicePizza() != null){
@@ -98,6 +101,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment {
} }
} }
} }
*/
if(createOrderActivity.getOrderNote() != null){ if(createOrderActivity.getOrderNote() != null){
orderNoteAppEditText.setText(createOrderActivity.getOrderNote()); orderNoteAppEditText.setText(createOrderActivity.getOrderNote());
} }

12
app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderResultFragment.java → app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderResultFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.fragment.createOrder; package ch.pizzamaxx.android.fragment.createOrder;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -8,11 +8,11 @@ import android.view.ViewGroup;
import butterknife.BindString; import butterknife.BindString;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.activity.CreateOrderActivity; import ch.pizzamaxx.android.activity.CreateOrderActivity;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.helper.SharedPrefsHelper;
/** /**
* Created by cimenmus on 17/10/2017. * Created by cimenmus on 17/10/2017.

53
app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java → app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/CreateOrderSummaryFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.fragment.createOrder; package ch.pizzamaxx.android.fragment.createOrder;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
@@ -29,28 +29,28 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.activity.CreateOrderActivity; import ch.pizzamaxx.android.activity.CreateOrderActivity;
import ch.pizzapp.android.adapter.recycler.OrderPriceRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.OrderPriceRecyclerAdapter;
import ch.pizzapp.android.adapter.recycler.ProductOnOrderSummaryRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.ProductOnOrderSummaryRecyclerAdapter;
import ch.pizzapp.android.api.ApiConstants; import ch.pizzamaxx.android.api.ApiConstants;
import ch.pizzapp.android.api.ApiEndPoints; import ch.pizzamaxx.android.api.ApiEndPoints;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.helper.SharedPrefsHelper;
import ch.pizzapp.android.model.PaymentMethodModel; import ch.pizzamaxx.android.model.PaymentMethodModel;
import ch.pizzapp.android.model.PaymentTokenModel; import ch.pizzamaxx.android.model.PaymentTokenModel;
import ch.pizzapp.android.model.StoreShiftModel; import ch.pizzamaxx.android.model.StoreShiftModel;
import ch.pizzapp.android.model.StoreWorkDayModel; import ch.pizzamaxx.android.model.StoreWorkDayModel;
import ch.pizzapp.android.model.cart.CartInfoModel; import ch.pizzamaxx.android.model.cart.CartInfoModel;
import ch.pizzapp.android.model.cart.CartProductModel; import ch.pizzamaxx.android.model.cart.CartProductModel;
import ch.pizzapp.android.model.cart.CartTotalModel; import ch.pizzamaxx.android.model.cart.CartTotalModel;
import ch.pizzapp.android.view.AppInfoView; import ch.pizzamaxx.android.view.AppInfoView;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
@@ -123,7 +123,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
DropInResult result = data.getParcelableExtra(DropInResult.EXTRA_DROP_IN_RESULT); DropInResult result = data.getParcelableExtra(DropInResult.EXTRA_DROP_IN_RESULT);
createOrderActivity.setSelectedPaymentMethod(result.getPaymentMethodType()); createOrderActivity.setSelectedPaymentMethod(result.getPaymentMethodType());
//createBraintreePayment(result); createBraintreePayment(result);
// use the result to update your UI and send the payment method nonce to your server // use the result to update your UI and send the payment method nonce to your server
} else if (resultCode == Activity.RESULT_CANCELED) { } else if (resultCode == Activity.RESULT_CANCELED) {
// the user canceled // the user canceled
@@ -576,6 +576,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity; CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
/*
if(isCartContainsAnyPizza()){ if(isCartContainsAnyPizza()){
stringBuilder.append(slicePizzaForStoreText).append(" : "); stringBuilder.append(slicePizzaForStoreText).append(" : ");
if(createOrderActivity.getSlicePizza()){ if(createOrderActivity.getSlicePizza()){
@@ -586,6 +587,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
} }
stringBuilder.append("\n"); stringBuilder.append("\n");
} }
*/
stringBuilder stringBuilder
.append(createOrderActivity.getOrderNote()) .append(createOrderActivity.getOrderNote())
@@ -764,8 +766,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
.requestThreeDSecureVerification(true) .requestThreeDSecureVerification(true)
.amount(amountStringForBraintree) .amount(amountStringForBraintree)
.disableAndroidPay() .disableAndroidPay()
//.amount("1.00") .disablePayPal()
.requestThreeDSecureVerification(true)
.disableVenmo(); .disableVenmo();

36
app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java → app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/PaymentMethodFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.fragment.createOrder; package ch.pizzamaxx.android.fragment.createOrder;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
@@ -8,8 +8,6 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.EditText; import android.widget.EditText;
import com.google.android.gms.common.api.Api;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@@ -17,23 +15,21 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.activity.CreateOrderActivity; import ch.pizzamaxx.android.activity.CreateOrderActivity;
import ch.pizzapp.android.adapter.recycler.PaymentMethodsRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.PaymentMethodsRecyclerAdapter;
import ch.pizzapp.android.api.ApiConstants; import ch.pizzamaxx.android.api.ApiEndPoints;
import ch.pizzapp.android.api.ApiEndPoints; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ResponseObject;
import ch.pizzapp.android.api.ResponseObject; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.model.CheckCouponModel;
import ch.pizzapp.android.model.CheckCouponModel; import ch.pizzamaxx.android.model.PaymentMethodModel;
import ch.pizzapp.android.model.PaymentMethodModel; import ch.pizzamaxx.android.model.PaymentMethodsResponseModel;
import ch.pizzapp.android.model.PaymentMethodsResponseModel; import ch.pizzamaxx.android.model.cart.CartInfoModel;
import ch.pizzapp.android.model.cart.CartInfoModel;
import ch.pizzapp.android.view.AppEditText;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

26
app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingAddressFragment.java → app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/ShippingAddressFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.fragment.createOrder; package ch.pizzamaxx.android.fragment.createOrder;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -15,18 +15,18 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.AddAddressActivity; import ch.pizzamaxx.android.activity.AddAddressActivity;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.activity.CreateOrderActivity; import ch.pizzamaxx.android.activity.CreateOrderActivity;
import ch.pizzapp.android.adapter.recycler.ShippingAddressesRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.ShippingAddressesRecyclerAdapter;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseArray; import ch.pizzamaxx.android.api.ResponseArray;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.AddressModel; import ch.pizzamaxx.android.model.AddressModel;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

26
app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java → app/src/main/java/ch/pizzamaxx/android/fragment/createOrder/ShippingMethodFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.fragment.createOrder; package ch.pizzamaxx.android.fragment.createOrder;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
@@ -14,18 +14,18 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.activity.CreateOrderActivity; import ch.pizzamaxx.android.activity.CreateOrderActivity;
import ch.pizzapp.android.adapter.recycler.ShippingMethodsRecyclerAdapter; import ch.pizzamaxx.android.adapter.recycler.ShippingMethodsRecyclerAdapter;
import ch.pizzapp.android.api.ApiErrorUtils; import ch.pizzamaxx.android.api.ApiErrorUtils;
import ch.pizzapp.android.api.ApiService; import ch.pizzamaxx.android.api.ApiService;
import ch.pizzapp.android.api.ResponseArray; import ch.pizzamaxx.android.api.ResponseArray;
import ch.pizzapp.android.helper.DialogHelper; import ch.pizzamaxx.android.helper.DialogHelper;
import ch.pizzapp.android.helper.PriceHelper; import ch.pizzamaxx.android.helper.PriceHelper;
import ch.pizzapp.android.helper.SessionHelper; import ch.pizzamaxx.android.helper.SessionHelper;
import ch.pizzapp.android.interfaces.RecyclerItemClickListener; import ch.pizzamaxx.android.interfaces.RecyclerItemClickListener;
import ch.pizzapp.android.model.ShippingMethodModel; import ch.pizzamaxx.android.model.ShippingMethodModel;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

7
app/src/main/java/ch/pizzapp/android/helper/DateTimeHelper.java → app/src/main/java/ch/pizzamaxx/android/helper/DateTimeHelper.java
View File

@@ -1,12 +1,11 @@
package ch.pizzapp.android.helper; package ch.pizzamaxx.android.helper;
import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
/** /**
* Created by cimenmus on 04/10/2017. * Created by cimenmus on 04/10/2017.

14
app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java → app/src/main/java/ch/pizzamaxx/android/helper/DialogHelper.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.helper; package ch.pizzamaxx.android.helper;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@@ -11,12 +11,10 @@ import com.afollestad.materialdialogs.MaterialDialog;
import java.util.ArrayList; import java.util.ArrayList;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.activity.LoginActivity; import ch.pizzamaxx.android.activity.LoginActivity;
import ch.pizzapp.android.activity.MainActivity; import ch.pizzamaxx.android.activity.RegisterActivity;
import ch.pizzapp.android.activity.RegisterActivity;
import ch.pizzapp.android.model.CampaignModel;
public class DialogHelper { public class DialogHelper {
@@ -238,7 +236,7 @@ public class DialogHelper {
@Override @Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
Intent intent = new Intent(Intent.ACTION_VIEW); Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse("market://details?id=ch.pizzapp.capri")); intent.setData(Uri.parse("market://details?id=ch.pizzamaxx.capri"));
BaseActivity.currentActivity.startActivity(intent); BaseActivity.currentActivity.startActivity(intent);
BaseActivity.currentActivity.finishAffinity(); BaseActivity.currentActivity.finishAffinity();
} }

6
app/src/main/java/ch/pizzapp/android/helper/DisplayHelper.java → app/src/main/java/ch/pizzamaxx/android/helper/DisplayHelper.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.helper; package ch.pizzamaxx.android.helper;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.os.Build; import android.os.Build;
@@ -7,8 +7,8 @@ import android.util.DisplayMetrics;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
public class DisplayHelper { public class DisplayHelper {

11
app/src/main/java/ch/pizzapp/android/helper/ImageLoadHelper.java → app/src/main/java/ch/pizzamaxx/android/helper/ImageLoadHelper.java
View File

@@ -1,16 +1,9 @@
package ch.pizzapp.android.helper; package ch.pizzamaxx.android.helper;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.support.v4.app.Fragment;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import com.squareup.picasso.Picasso; import com.squareup.picasso.Picasso;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
public class ImageLoadHelper { public class ImageLoadHelper {

4
app/src/main/java/ch/pizzapp/android/helper/NetworkHelper.java → app/src/main/java/ch/pizzamaxx/android/helper/NetworkHelper.java
View File

@@ -1,9 +1,9 @@
package ch.pizzapp.android.helper; package ch.pizzamaxx.android.helper;
import android.content.Context; import android.content.Context;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
public class NetworkHelper { public class NetworkHelper {

2
app/src/main/java/ch/pizzapp/android/helper/PasswordHelper.java → app/src/main/java/ch/pizzamaxx/android/helper/PasswordHelper.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.helper; package ch.pizzamaxx.android.helper;
import java.util.regex.Pattern; import java.util.regex.Pattern;

10
app/src/main/java/ch/pizzapp/android/helper/PriceHelper.java → app/src/main/java/ch/pizzamaxx/android/helper/PriceHelper.java
View File

@@ -1,11 +1,11 @@
package ch.pizzapp.android.helper; package ch.pizzamaxx.android.helper;
import java.util.ArrayList; import java.util.ArrayList;
import ch.pizzapp.android.R; import ch.pizzamaxx.android.R;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.model.menu.MenuProductModel; import ch.pizzamaxx.android.model.menu.MenuProductModel;
import ch.pizzapp.android.model.menu.MenuProductOptionValueModel; import ch.pizzamaxx.android.model.menu.MenuProductOptionValueModel;
/** /**
* Created by cimenmus on 12/10/2017. * Created by cimenmus on 12/10/2017.

10
app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java → app/src/main/java/ch/pizzamaxx/android/helper/SessionHelper.java
View File

@@ -1,14 +1,14 @@
package ch.pizzapp.android.helper; package ch.pizzamaxx.android.helper;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import ch.pizzapp.android.model.CheckCouponModel; import ch.pizzamaxx.android.model.CheckCouponModel;
import ch.pizzapp.android.model.CustomerTokenModel; import ch.pizzamaxx.android.model.CustomerTokenModel;
import ch.pizzapp.android.model.StoreModel; import ch.pizzamaxx.android.model.StoreModel;
import ch.pizzapp.android.model.UserModel; import ch.pizzamaxx.android.model.UserModel;
/** /**
* Created by cimenmus on 11/09/2017. * Created by cimenmus on 11/09/2017.

16
app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java → app/src/main/java/ch/pizzamaxx/android/helper/SharedPrefsHelper.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.helper; package ch.pizzamaxx.android.helper;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@@ -7,16 +7,14 @@ import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
import ch.pizzapp.android.model.CategoryModel; import ch.pizzamaxx.android.model.CategoryModel;
import ch.pizzapp.android.model.CheckCouponModel; import ch.pizzamaxx.android.model.CheckCouponModel;
import ch.pizzapp.android.model.CustomerTokenModel; import ch.pizzamaxx.android.model.CustomerTokenModel;
import ch.pizzapp.android.model.StoreModel; import ch.pizzamaxx.android.model.StoreModel;
import ch.pizzapp.android.model.UserModel; import ch.pizzamaxx.android.model.UserModel;
import static android.content.Context.MODE_PRIVATE; import static android.content.Context.MODE_PRIVATE;

2
app/src/main/java/ch/pizzapp/android/helper/TextHelper.java → app/src/main/java/ch/pizzamaxx/android/helper/TextHelper.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.helper; package ch.pizzamaxx.android.helper;
import android.text.Html; import android.text.Html;
import android.widget.TextView; import android.widget.TextView;

4
app/src/main/java/ch/pizzapp/android/helper/ViewHelper.java → app/src/main/java/ch/pizzamaxx/android/helper/ViewHelper.java
View File

@@ -1,11 +1,11 @@
package ch.pizzapp.android.helper; package ch.pizzamaxx.android.helper;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import ch.pizzapp.android.activity.BaseActivity; import ch.pizzamaxx.android.activity.BaseActivity;
/** /**
* Created by cimenmus on 25/06/2017. * Created by cimenmus on 25/06/2017.

3
app/src/main/java/ch/pizzapp/android/interfaces/CheckBoxChangedListener.java → app/src/main/java/ch/pizzamaxx/android/interfaces/CheckBoxChangedListener.java
View File

@@ -1,7 +1,6 @@
package ch.pizzapp.android.interfaces; package ch.pizzamaxx.android.interfaces;
import android.support.v7.widget.AppCompatCheckBox; import android.support.v7.widget.AppCompatCheckBox;
import android.view.View;
/** /**
* Created by cimenmus on 25/09/2017. * Created by cimenmus on 25/09/2017.

2
app/src/main/java/ch/pizzapp/android/interfaces/DialogButtonClickListener.java → app/src/main/java/ch/pizzamaxx/android/interfaces/DialogButtonClickListener.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.interfaces; package ch.pizzamaxx.android.interfaces;
import android.view.View; import android.view.View;

2
app/src/main/java/ch/pizzapp/android/interfaces/RecyclerItemClickListener.java → app/src/main/java/ch/pizzamaxx/android/interfaces/RecyclerItemClickListener.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.interfaces; package ch.pizzamaxx.android.interfaces;
import android.view.View; import android.view.View;

2
app/src/main/java/ch/pizzapp/android/model/AddNewAddressResponseModel.java → app/src/main/java/ch/pizzamaxx/android/model/AddNewAddressResponseModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/ch/pizzapp/android/model/AddProductToBasketResponseModel.java → app/src/main/java/ch/pizzamaxx/android/model/AddProductToBasketResponseModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

3
app/src/main/java/ch/pizzapp/android/model/AddToBasketOptionModel.java → app/src/main/java/ch/pizzamaxx/android/model/AddToBasketOptionModel.java
View File

@@ -1,9 +1,8 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
/** /**

2
app/src/main/java/ch/pizzapp/android/model/AddressModel.java → app/src/main/java/ch/pizzamaxx/android/model/AddressModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/ch/pizzapp/android/model/AppVersionModel.java → app/src/main/java/ch/pizzamaxx/android/model/AppVersionModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/ch/pizzapp/android/model/CampaignModel.java → app/src/main/java/ch/pizzamaxx/android/model/CampaignModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

6
app/src/main/java/ch/pizzapp/android/model/CategoryModel.java → app/src/main/java/ch/pizzamaxx/android/model/CategoryModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
@@ -6,8 +6,8 @@ import com.google.gson.annotations.SerializedName;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import ch.pizzapp.android.api.ApiConstants; import ch.pizzamaxx.android.api.ApiConstants;
import ch.pizzapp.android.helper.SharedPrefsHelper; import ch.pizzamaxx.android.helper.SharedPrefsHelper;
/** /**
* Created by cimenmus on 26/09/2017. * Created by cimenmus on 26/09/2017.

4
app/src/main/java/ch/pizzapp/android/model/CheckCouponModel.java → app/src/main/java/ch/pizzamaxx/android/model/CheckCouponModel.java
View File

@@ -1,6 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import android.util.Log;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/ch/pizzapp/android/model/CityModel.java → app/src/main/java/ch/pizzamaxx/android/model/CityModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/ch/pizzapp/android/model/CountryModel.java → app/src/main/java/ch/pizzamaxx/android/model/CountryModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/ch/pizzapp/android/model/CreateOrderModel.java → app/src/main/java/ch/pizzamaxx/android/model/CreateOrderModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
/** /**
* Created by cimenmus on 17/10/2017. * Created by cimenmus on 17/10/2017.

8
app/src/main/java/ch/pizzapp/android/model/CustomerTokenModel.java → app/src/main/java/ch/pizzamaxx/android/model/CustomerTokenModel.java
View File

@@ -1,15 +1,11 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import java.io.Serializable; import java.io.Serializable;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import ch.pizzapp.android.helper.DateTimeHelper; import ch.pizzamaxx.android.helper.DateTimeHelper;
/** /**
* Created by cimenmus on 26/09/2017. * Created by cimenmus on 26/09/2017.

2
app/src/main/java/ch/pizzapp/android/model/DeleteAddressResponseModel.java → app/src/main/java/ch/pizzamaxx/android/model/DeleteAddressResponseModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
/** /**
* Created by cimenmus on 24.10.2017. * Created by cimenmus on 24.10.2017.

4
app/src/main/java/ch/pizzapp/android/model/PaymentMethodModel.java → app/src/main/java/ch/pizzamaxx/android/model/PaymentMethodModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
@@ -7,7 +7,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import ch.pizzapp.android.api.ApiConstants; import ch.pizzamaxx.android.api.ApiConstants;
/** /**
* Created by cimenmus on 17/10/2017. * Created by cimenmus on 17/10/2017.

2
app/src/main/java/ch/pizzapp/android/model/PaymentMethodsResponseModel.java → app/src/main/java/ch/pizzamaxx/android/model/PaymentMethodsResponseModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/ch/pizzapp/android/model/PaymentTokenModel.java → app/src/main/java/ch/pizzamaxx/android/model/PaymentTokenModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
public class PaymentTokenModel { public class PaymentTokenModel {

2
app/src/main/java/ch/pizzapp/android/model/RemoveProductFromCartResponseModel.java → app/src/main/java/ch/pizzamaxx/android/model/RemoveProductFromCartResponseModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/ch/pizzapp/android/model/ShippingMethodModel.java → app/src/main/java/ch/pizzamaxx/android/model/ShippingMethodModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/ch/pizzapp/android/model/ShippingMethodsResponseModel.java → app/src/main/java/ch/pizzamaxx/android/model/ShippingMethodsResponseModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/ch/pizzapp/android/model/StoreInfoModel.java → app/src/main/java/ch/pizzamaxx/android/model/StoreInfoModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
/** /**
* Created by cimenmus on 26.10.2017. * Created by cimenmus on 26.10.2017.

2
app/src/main/java/ch/pizzapp/android/model/StoreModel.java → app/src/main/java/ch/pizzamaxx/android/model/StoreModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/ch/pizzapp/android/model/StoreShiftModel.java → app/src/main/java/ch/pizzamaxx/android/model/StoreShiftModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/ch/pizzapp/android/model/StoreWorkDayModel.java → app/src/main/java/ch/pizzamaxx/android/model/StoreWorkDayModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/ch/pizzapp/android/model/UserModel.java → app/src/main/java/ch/pizzamaxx/android/model/UserModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/ch/pizzapp/android/model/ZoneModel.java → app/src/main/java/ch/pizzamaxx/android/model/ZoneModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzapp.android.model; package ch.pizzamaxx.android.model;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

Some files were not shown because too many files have changed in this diff Show More