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
2018-05-26 12:04:22 +03:00
parent 2f57316d7a
commit 24eef0ed59
132 changed files with 856 additions and 879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

29
.idea/codeStyles/Project.xml generated Normal file
View File

@@ -0,0 +1,29 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<Objective-C-extensions>
<file>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
</file>
<class>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
</class>
<extensions>
<pair source="cpp" header="h" fileNamingConvention="NONE" />
<pair source="c" header="h" fileNamingConvention="NONE" />
</extensions>
</Objective-C-extensions>
</code_scheme>
</component>

22
.idea/compiler.xml generated
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<resourceExtensions />
<wildcardResourcePatterns>
<entry name="!?*.java" />
<entry name="!?*.form" />
<entry name="!?*.class" />
<entry name="!?*.groovy" />
<entry name="!?*.scala" />
<entry name="!?*.flex" />
<entry name="!?*.kt" />
<entry name="!?*.clj" />
<entry name="!?*.aj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component>
</project>

3
.idea/copyright/profiles_settings.xml generated
View File

@@ -1,3 +0,0 @@
<component name="CopyrightManager">
<settings default="" />
</component>

6
.idea/encodings.xml generated
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="PROJECT" charset="UTF-8" />
</component>
</project>

25
.idea/misc.xml generated
View File

@@ -5,11 +5,12 @@
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" /> <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables"> <option name="myNullables">
<value> <value>
<list size="4"> <list size="5">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" /> <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" /> <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" /> <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" /> <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
</list> </list>
</value> </value>
</option> </option>
@@ -24,26 +25,10 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
<option name="id" value="Android" /> <option name="id" value="Android" />
</component> </component>
<component name="masterDetails">
<states>
<state key="ProjectJDKs.UI">
<settings>
<last-edited>1.8</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project> </project>

3
.idea/modules.xml generated
View File

@@ -2,9 +2,8 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/Pizzalink.iml" filepath="$PROJECT_DIR$/Pizzalink.iml" />
<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$/pizzalink-android.iml" filepath="$PROJECT_DIR$/pizzalink-android.iml" /> <module fileurl="file://$PROJECT_DIR$/pizzapp-android.iml" filepath="$PROJECT_DIR$/pizzapp-android.iml" />
</modules> </modules>
</component> </component>
</project> </project>

2
.idea/vcs.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="" vcs="Git" />
</component> </component>
</project> </project>

58
app/build.gradle
View File

@@ -2,9 +2,9 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion 26 compileSdkVersion 26
buildToolsVersion "26.0.2" buildToolsVersion '27.0.3'
defaultConfig { defaultConfig {
applicationId "ch.pizzalink.android" applicationId "ch.pizzapp.android"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 26 targetSdkVersion 26
versionCode 6 // play store'daki version : 5 versionCode 6 // play store'daki version : 5
@@ -20,34 +20,34 @@ android {
} }
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'support-annotations'
}) })
compile 'com.android.support:appcompat-v7:26.0.1' implementation 'com.android.support:appcompat-v7:26.0.1'
compile 'com.android.support.constraint:constraint-layout:1.0.2' implementation 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.android.support:recyclerview-v7:26.0.1' implementation 'com.android.support:recyclerview-v7:26.0.1'
compile 'com.android.support:cardview-v7:26.0.1' implementation 'com.android.support:cardview-v7:26.0.1'
compile 'com.google.android.gms:play-services-maps:11.0.4' implementation 'com.google.android.gms:play-services-maps:11.0.4'
compile 'com.google.android.gms:play-services-location:11.0.4' implementation 'com.google.android.gms:play-services-location:11.0.4'
compile 'com.squareup.picasso:picasso:2.5.2' implementation 'com.squareup.picasso:picasso:2.5.2'
compile 'com.squareup.retrofit2:retrofit:2.1.0' implementation 'com.squareup.retrofit2:retrofit:2.1.0'
compile 'com.squareup.retrofit2:converter-gson:2.0.0' implementation 'com.squareup.retrofit2:converter-gson:2.0.0'
compile 'com.squareup.okhttp3:okhttp:3.5.0' implementation 'com.squareup.okhttp3:okhttp:3.5.0'
compile 'uk.co.chrisjenx:calligraphy:2.2.0' implementation 'uk.co.chrisjenx:calligraphy:2.2.0'
compile 'com.jakewharton:butterknife:8.5.1' implementation 'com.jakewharton:butterknife:8.5.1'
compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0' implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
compile 'com.wdullaer:materialdatetimepicker:3.1.1' implementation 'com.wdullaer:materialdatetimepicker:3.1.1'
compile 'com.github.ittianyu:BottomNavigationViewEx:1.1.3' implementation 'com.github.ittianyu:BottomNavigationViewEx:1.1.3'
compile 'com.github.bumptech.glide:glide:3.7.0' implementation 'com.github.bumptech.glide:glide:3.7.0'
compile 'io.nlopez.smartlocation:library:3.3.1' implementation 'io.nlopez.smartlocation:library:3.3.1'
compile 'com.afollestad.material-dialogs:core:0.9.4.5' implementation 'com.afollestad.material-dialogs:core:0.9.4.5'
compile 'com.github.AndroidDeveloperLB:DialogShard:3' implementation 'com.github.AndroidDeveloperLB:DialogShard:3'
compile 'com.github.HITGIF:TextFieldBoxes:1.3.3' implementation 'com.github.HITGIF:TextFieldBoxes:1.3.3'
compile 'io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:1.1.3' implementation 'io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:1.1.3'
compile 'com.squareup.okhttp3:logging-interceptor:3.9.0' implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
compile 'com.github.badoualy:stepper-indicator:1.0.7' implementation 'com.github.badoualy:stepper-indicator:1.0.7'
compile 'q.rorbin:badgeview:1.1.0' implementation 'q.rorbin:badgeview:1.1.0'
testCompile 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1' annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
} }

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

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

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

@@ -1,12 +1,12 @@
<?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.pizzalink.android"> package="ch.pizzapp.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=".Pizzalink" android:name=".App"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"

4
app/src/main/java/ch/pizzalink/android/Pizzalink.java → app/src/main/java/ch/pizzapp/android/App.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android; package ch.pizzapp.android;
import android.app.Application; import android.app.Application;
@@ -11,7 +11,7 @@ import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
* Created by cimenmus on 11/09/2017. * Created by cimenmus on 11/09/2017.
*/ */
public class Pizzalink extends Application { public class App extends Application {
@Override @Override
public void onCreate() { public void onCreate() {

58
app/src/main/java/ch/pizzalink/android/activity/AddAddressActivity.java → app/src/main/java/ch/pizzapp/android/activity/AddAddressActivity.java
View File

@@ -1,8 +1,7 @@
package ch.pizzalink.android.activity; package ch.pizzapp.android.activity;
import android.content.Intent; import android.content.Intent;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
@@ -17,32 +16,37 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.api.ApiEndPoints; import ch.pizzapp.android.api.ApiEndPoints;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseArray; import ch.pizzapp.android.api.ResponseArray;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzapp.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.helper.ViewHelper; import ch.pizzapp.android.helper.ViewHelper;
import ch.pizzalink.android.model.AddNewAddressResponseModel; import ch.pizzapp.android.model.AddNewAddressResponseModel;
import ch.pizzalink.android.model.CityModel; import ch.pizzapp.android.model.CityModel;
import ch.pizzalink.android.model.CountryModel; import ch.pizzapp.android.model.CountryModel;
import ch.pizzalink.android.model.ZoneModel; import ch.pizzapp.android.model.ZoneModel;
import ch.pizzalink.android.view.PizzalinkDropdownView; import ch.pizzapp.android.view.AppDropdownView;
import ch.pizzalink.android.view.PizzalinkEditText; import ch.pizzapp.android.view.AppEditText;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
public class AddAddressActivity extends BaseActivity { public class AddAddressActivity extends BaseActivity {
@BindView(R.id.address1PizzalinkEditText) PizzalinkEditText address1PizzalinkEditText; @BindView(R.id.address1PizzalinkEditText)
@BindView(R.id.cityPizzalinkDropdown) PizzalinkDropdownView cityPizzalinkDropdown; AppEditText address1AppEditText;
@BindView(R.id.postcodePizzalinkEditText) PizzalinkEditText postcodePizzalinkEditText; @BindView(R.id.cityPizzalinkDropdown)
@BindView(R.id.countryPizzalinkDropdown) PizzalinkDropdownView countryPizzalinkDropdown; AppDropdownView cityPizzalinkDropdown;
@BindView(R.id.zonePizzalinkDropdown) PizzalinkDropdownView zonePizzalinkDropdown; @BindView(R.id.postcodePizzalinkEditText)
AppEditText postcodeAppEditText;
@BindView(R.id.countryPizzalinkDropdown)
AppDropdownView countryPizzalinkDropdown;
@BindView(R.id.zonePizzalinkDropdown)
AppDropdownView zonePizzalinkDropdown;
@BindString(R.string.alert_fill_all_fields) String fillAllFieldsText; @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText;
@BindString(R.string.alert_select_country_first) String selectCountryFirstText; @BindString(R.string.alert_select_country_first) String selectCountryFirstText;
@@ -106,14 +110,14 @@ public class AddAddressActivity extends BaseActivity {
} }
*/ */
if(address1PizzalinkEditText.isEmpty() || if(address1AppEditText.isEmpty() ||
selectedCityModel == null || selectedCityModel == null ||
postcodePizzalinkEditText.isEmpty()){ postcodeAppEditText.isEmpty()){
DialogHelper.showAlertDialog(this, fillAllFieldsText); DialogHelper.showAlertDialog(this, fillAllFieldsText);
return false; return false;
} }
if(postcodePizzalinkEditText.getText().length() != 4){ if(postcodeAppEditText.getText().length() != 4){
DialogHelper.showAlertDialog(this, invalidPostcodeText); DialogHelper.showAlertDialog(this, invalidPostcodeText);
return false; return false;
} }
@@ -329,11 +333,11 @@ public class AddAddressActivity extends BaseActivity {
private HashMap<String, Object> getAddNewAddressRequestParams(){ private HashMap<String, Object> getAddNewAddressRequestParams(){
HashMap<String, Object> params = new HashMap<>(); HashMap<String, Object> params = new HashMap<>();
params.put("address_1", address1PizzalinkEditText.getText()); params.put("address_1", address1AppEditText.getText());
params.put("address_2", ""); params.put("address_2", "");
params.put("city", selectedCityModel.getCity()); params.put("city", selectedCityModel.getCity());
//params.put("postcode", selectedCityModel.getPostcode()); //params.put("postcode", selectedCityModel.getPostcode());
params.put("postcode", postcodePizzalinkEditText.getText()); params.put("postcode", postcodeAppEditText.getText());
//params.put("country_id", selectedCountryModel.getId()); //params.put("country_id", selectedCountryModel.getId());
//params.put("zone_id", selectedZoneModel.getZoneId()); //params.put("zone_id", selectedZoneModel.getZoneId());
params.put("country_id", "1"); params.put("country_id", "1");

2
app/src/main/java/ch/pizzalink/android/activity/BaseActivity.java → app/src/main/java/ch/pizzapp/android/activity/BaseActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.activity; package ch.pizzapp.android.activity;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;

26
app/src/main/java/ch/pizzalink/android/activity/CreateOrderActivity.java → app/src/main/java/ch/pizzapp/android/activity/CreateOrderActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.activity; package ch.pizzapp.android.activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -8,18 +8,18 @@ import com.badoualy.stepperindicator.StepperIndicator;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.fragment.createOrder.CreateOrderNoteFragment; import ch.pizzapp.android.fragment.createOrder.CreateOrderNoteFragment;
import ch.pizzalink.android.fragment.createOrder.CreateOrderResultFragment; import ch.pizzapp.android.fragment.createOrder.CreateOrderResultFragment;
import ch.pizzalink.android.fragment.createOrder.CreateOrderSummaryFragment; import ch.pizzapp.android.fragment.createOrder.CreateOrderSummaryFragment;
import ch.pizzalink.android.fragment.createOrder.PaymentMethodFragment; import ch.pizzapp.android.fragment.createOrder.PaymentMethodFragment;
import ch.pizzalink.android.fragment.createOrder.ShippingAddressFragment; import ch.pizzapp.android.fragment.createOrder.ShippingAddressFragment;
import ch.pizzalink.android.fragment.createOrder.ShippingMethodFragment; import ch.pizzapp.android.fragment.createOrder.ShippingMethodFragment;
import ch.pizzalink.android.helper.SharedPrefsHelper; import ch.pizzapp.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.model.AddressModel; import ch.pizzapp.android.model.AddressModel;
import ch.pizzalink.android.model.PaymentMethodModel; import ch.pizzapp.android.model.PaymentMethodModel;
import ch.pizzalink.android.model.ShippingMethodModel; import ch.pizzapp.android.model.ShippingMethodModel;
import ch.pizzalink.android.model.cart.CartInfoModel; import ch.pizzapp.android.model.cart.CartInfoModel;
public class CreateOrderActivity extends BaseActivity { public class CreateOrderActivity extends BaseActivity {

28
app/src/main/java/ch/pizzalink/android/activity/ForgotPasswordActivity.java → app/src/main/java/ch/pizzapp/android/activity/ForgotPasswordActivity.java
View File

@@ -1,10 +1,8 @@
package ch.pizzalink.android.activity; package ch.pizzapp.android.activity;
import android.content.Intent; import android.content.Intent;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.view.View;
import android.widget.Button; import android.widget.Button;
import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.DialogAction;
@@ -14,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.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzapp.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.ViewHelper; import ch.pizzapp.android.helper.ViewHelper;
import ch.pizzalink.android.view.PizzalinkEditText; import ch.pizzapp.android.view.AppEditText;
import ch.pizzalink.android.view.PizzalinkToolbar;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
public class ForgotPasswordActivity extends BaseActivity { public class ForgotPasswordActivity extends BaseActivity {
@BindView(R.id.forgotPasswordEmailPizzalinkEditText) PizzalinkEditText forgotPasswordEmailPizzalinkEditText; @BindView(R.id.forgotPasswordEmailPizzalinkEditText)
AppEditText forgotPasswordEmailAppEditText;
@BindView(R.id.resetPasswordButton) Button resetPasswordButton; @BindView(R.id.resetPasswordButton) Button resetPasswordButton;
@BindString(R.string.alert_fill_all_fields) String fillAllFieldsText; @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText;
@@ -52,12 +50,12 @@ public class ForgotPasswordActivity extends BaseActivity {
private boolean checkFields(){ private boolean checkFields(){
if(forgotPasswordEmailPizzalinkEditText.isEmpty()){ if(forgotPasswordEmailAppEditText.isEmpty()){
DialogHelper.showAlertDialog(this, fillAllFieldsText); DialogHelper.showAlertDialog(this, fillAllFieldsText);
return false; return false;
} }
if(!forgotPasswordEmailPizzalinkEditText.isEmail()){ if(!forgotPasswordEmailAppEditText.isEmail()){
DialogHelper.showAlertDialog(this, validEmailText); DialogHelper.showAlertDialog(this, validEmailText);
return false; return false;
} }
@@ -68,7 +66,7 @@ public class ForgotPasswordActivity extends BaseActivity {
private void resetPassword(){ private void resetPassword(){
DialogHelper.showLoadingDialog(); DialogHelper.showLoadingDialog();
Call<ResponseObject> call = ApiService.apiInterface.forgotPassword( Call<ResponseObject> call = ApiService.apiInterface.forgotPassword(
forgotPasswordEmailPizzalinkEditText.getText()); forgotPasswordEmailAppEditText.getText());
call.enqueue(new Callback<ResponseObject>() { call.enqueue(new Callback<ResponseObject>() {
@Override @Override
public void onResponse(Call<ResponseObject> call, Response<ResponseObject> response) { public void onResponse(Call<ResponseObject> call, Response<ResponseObject> response) {

45
app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java → app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java
View File

@@ -1,12 +1,7 @@
package ch.pizzalink.android.activity; package ch.pizzapp.android.activity;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.style.ForegroundColorSpan;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
@@ -15,27 +10,29 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.api.ApiEndPoints; import ch.pizzapp.android.api.ApiEndPoints;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzapp.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.PriceHelper; import ch.pizzapp.android.helper.PriceHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper; import ch.pizzapp.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.helper.ViewHelper; import ch.pizzapp.android.helper.ViewHelper;
import ch.pizzalink.android.model.UserModel; import ch.pizzapp.android.model.UserModel;
import ch.pizzalink.android.model.cart.CartInfoModel; import ch.pizzapp.android.model.cart.CartInfoModel;
import ch.pizzalink.android.view.PizzalinkEditText; import ch.pizzapp.android.view.AppEditText;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
public class LoginActivity extends BaseActivity { public class LoginActivity extends BaseActivity {
@BindView(R.id.emailPizzalinkEditText) PizzalinkEditText emailPizzalinkEditText; @BindView(R.id.emailPizzalinkEditText)
@BindView(R.id.passwordPizzalinkEditText) PizzalinkEditText passwordPizzalinkEditText; AppEditText emailAppEditText;
@BindView(R.id.passwordPizzalinkEditText)
AppEditText passwordAppEditText;
@BindView(R.id.loginButton) Button loginButton; @BindView(R.id.loginButton) Button loginButton;
@BindView(R.id.forgotPasswordTextView) TextView forgotPasswordTextView; @BindView(R.id.forgotPasswordTextView) TextView forgotPasswordTextView;
@@ -78,12 +75,12 @@ public class LoginActivity extends BaseActivity {
private boolean checkFields(){ private boolean checkFields(){
if(emailPizzalinkEditText.isEmpty() || passwordPizzalinkEditText.isEmpty()){ if(emailAppEditText.isEmpty() || passwordAppEditText.isEmpty()){
DialogHelper.showAlertDialog(this, fillAllFieldsText); DialogHelper.showAlertDialog(this, fillAllFieldsText);
return false; return false;
} }
if(!emailPizzalinkEditText.isEmail()){ if(!emailAppEditText.isEmail()){
DialogHelper.showAlertDialog(this, validEmailText); DialogHelper.showAlertDialog(this, validEmailText);
return false; return false;
} }
@@ -94,7 +91,7 @@ public class LoginActivity extends BaseActivity {
private void login(){ private void login(){
DialogHelper.showLoadingDialog(); DialogHelper.showLoadingDialog();
Call<ResponseObject<UserModel>> call = ApiService.apiInterface.login( Call<ResponseObject<UserModel>> call = ApiService.apiInterface.login(
emailPizzalinkEditText.getText(), passwordPizzalinkEditText.getText()); emailAppEditText.getText(), passwordAppEditText.getText());
call.enqueue(new Callback<ResponseObject<UserModel>>() { call.enqueue(new Callback<ResponseObject<UserModel>>() {
@Override @Override
public void onResponse(Call<ResponseObject<UserModel>> call, Response<ResponseObject<UserModel>> response) { public void onResponse(Call<ResponseObject<UserModel>> call, Response<ResponseObject<UserModel>> response) {

39
app/src/main/java/ch/pizzalink/android/activity/MainActivity.java → app/src/main/java/ch/pizzapp/android/activity/MainActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.activity; package ch.pizzapp.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.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.adapter.recycler.NavigationMenuRecyclerAdapter; import ch.pizzapp.android.adapter.recycler.NavigationMenuRecyclerAdapter;
import ch.pizzalink.android.fragment.CartFragment; import ch.pizzapp.android.fragment.CartFragment;
import ch.pizzalink.android.fragment.OrderHistoryFragment; import ch.pizzapp.android.fragment.OrderHistoryFragment;
import ch.pizzalink.android.fragment.StoreInfoFragment; import ch.pizzapp.android.fragment.StoreInfoFragment;
import ch.pizzalink.android.fragment.MenuFragment; import ch.pizzapp.android.fragment.MenuFragment;
import ch.pizzalink.android.fragment.ProductFragment; import ch.pizzapp.android.fragment.ProductFragment;
import ch.pizzalink.android.fragment.ProfileFragment; import ch.pizzapp.android.fragment.ProfileFragment;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.PriceHelper; import ch.pizzapp.android.helper.PriceHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper; import ch.pizzapp.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.model.CategoryModel; import ch.pizzapp.android.model.CategoryModel;
import ch.pizzalink.android.view.PizzalinkToolbar; import ch.pizzapp.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;
@@ -50,7 +50,8 @@ public class MainActivity extends BaseActivity {
@BindView(R.id.drawerLayout) DrawerLayout drawerLayout; @BindView(R.id.drawerLayout) DrawerLayout drawerLayout;
@BindView(R.id.navigationMenuRecyclerView) RecyclerView navigationMenuRecyclerView; @BindView(R.id.navigationMenuRecyclerView) RecyclerView navigationMenuRecyclerView;
@BindView(R.id.pizzalinkToolbar) PizzalinkToolbar pizzalinkToolbar; @BindView(R.id.pizzalinkToolbar)
AppToolbar appToolbar;
@BindView(R.id.cartTotalRelativeLayout) RelativeLayout cartTotalRelativeLayout; @BindView(R.id.cartTotalRelativeLayout) RelativeLayout cartTotalRelativeLayout;
@BindView(R.id.cartTotalTextView) TextView cartTotalTextView; @BindView(R.id.cartTotalTextView) TextView cartTotalTextView;
@BindView(R.id.bottomNavigationView) BottomNavigationViewEx bottomNavigationView; @BindView(R.id.bottomNavigationView) BottomNavigationViewEx bottomNavigationView;
@@ -268,7 +269,7 @@ public class MainActivity extends BaseActivity {
initNavigationMenuRecyclerView(); initNavigationMenuRecyclerView();
pizzalinkToolbar.getHamburgerIcon().setOnClickListener(new View.OnClickListener() { appToolbar.getHamburgerIcon().setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if(drawerLayout.isDrawerOpen(GravityCompat.START)) if(drawerLayout.isDrawerOpen(GravityCompat.START))
@@ -284,8 +285,8 @@ public class MainActivity extends BaseActivity {
} }
public void setPizzalinkToolbarFields(boolean showHamburgerIcon, String title){ public void setPizzalinkToolbarFields(boolean showHamburgerIcon, String title){
pizzalinkToolbar.setHamburgerIconVisibility(showHamburgerIcon); appToolbar.setHamburgerIconVisibility(showHamburgerIcon);
pizzalinkToolbar.setTitle(title); appToolbar.setTitle(title);
if(showHamburgerIcon) if(showHamburgerIcon)
drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED); drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
else else

28
app/src/main/java/ch/pizzalink/android/activity/MyAddressesActivity.java → app/src/main/java/ch/pizzapp/android/activity/MyAddressesActivity.java
View File

@@ -1,8 +1,7 @@
package ch.pizzalink.android.activity; package ch.pizzapp.android.activity;
import android.content.Intent; import android.content.Intent;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
@@ -18,19 +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.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.adapter.recycler.MyAddressesRecyclerAdapter; import ch.pizzapp.android.adapter.recycler.MyAddressesRecyclerAdapter;
import ch.pizzalink.android.api.ApiEndPoints; import ch.pizzapp.android.api.ApiEndPoints;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseArray; import ch.pizzapp.android.api.ResponseArray;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzapp.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.AddressModel; import ch.pizzapp.android.model.AddressModel;
import ch.pizzalink.android.model.DeleteAddressResponseModel; import ch.pizzapp.android.model.DeleteAddressResponseModel;
import ch.pizzalink.android.view.PizzalinkToolbar;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

52
app/src/main/java/ch/pizzalink/android/activity/OrderHistoryDetailsActivity.java → app/src/main/java/ch/pizzapp/android/activity/OrderHistoryDetailsActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.activity; package ch.pizzapp.android.activity;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
@@ -8,35 +8,43 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.api.ApiEndPoints; import ch.pizzapp.android.api.ApiEndPoints;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseArray; import ch.pizzapp.android.api.ResponseArray;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.PriceHelper; import ch.pizzapp.android.helper.PriceHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.helper.TextHelper; import ch.pizzapp.android.helper.TextHelper;
import ch.pizzalink.android.model.history.OrderHistoryModel; import ch.pizzapp.android.model.history.OrderHistoryModel;
import ch.pizzalink.android.model.history.OrderHistoryProductModel; import ch.pizzapp.android.model.history.OrderHistoryProductModel;
import ch.pizzalink.android.model.history.OrderHistoryProductOptionModel; import ch.pizzapp.android.model.history.OrderHistoryProductOptionModel;
import ch.pizzalink.android.view.PizzalinkInfoView; import ch.pizzapp.android.view.AppInfoView;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
public class OrderHistoryDetailsActivity extends BaseActivity { public class OrderHistoryDetailsActivity extends BaseActivity {
@BindView(R.id.orderDatePizzalinkInfoLayout) PizzalinkInfoView orderDatePizzalinkInfoLayout; @BindView(R.id.orderDatePizzalinkInfoLayout)
AppInfoView orderDatePizzalinkInfoLayout;
//@BindView(R.id.orderStatusPizzalinkInfoLayout) PizzalinkInfoView orderStatusPizzalinkInfoLayout; //@BindView(R.id.orderStatusPizzalinkInfoLayout) PizzalinkInfoView orderStatusPizzalinkInfoLayout;
@BindView(R.id.orderShippingTimePizzalinkInfoLayout) PizzalinkInfoView orderShippingTimePizzalinkInfoLayout; @BindView(R.id.orderShippingTimePizzalinkInfoLayout)
@BindView(R.id.orderTotalPizzalinkInfoLayout) PizzalinkInfoView orderTotalPizzalinkInfoLayout; AppInfoView orderShippingTimePizzalinkInfoLayout;
@BindView(R.id.orderPaymentMethodPizzalinkInfoLayout) PizzalinkInfoView orderPaymentMethodPizzalinkInfoLayout; @BindView(R.id.orderTotalPizzalinkInfoLayout)
AppInfoView orderTotalPizzalinkInfoLayout;
@BindView(R.id.orderPaymentMethodPizzalinkInfoLayout)
AppInfoView orderPaymentMethodPizzalinkInfoLayout;
@BindView(R.id.orderProductsTextView) TextView orderProductsTextView; @BindView(R.id.orderProductsTextView) TextView orderProductsTextView;
@BindView(R.id.orderFullnamePizzalinkInfoLayout) PizzalinkInfoView orderFullnamePizzalinkInfoLayout; @BindView(R.id.orderFullnamePizzalinkInfoLayout)
@BindView(R.id.orderShippingMethodPizzalinkInfoLayout) PizzalinkInfoView orderShippingMethodPizzalinkInfoLayout; AppInfoView orderFullnamePizzalinkInfoLayout;
@BindView(R.id.orderShippingAddressPizzalinkInfoLayout) PizzalinkInfoView orderShippingAddressPizzalinkInfoLayout; @BindView(R.id.orderShippingMethodPizzalinkInfoLayout)
@BindView(R.id.orderNotePizzalinkInfoLayout) PizzalinkInfoView orderNotePizzalinkInfoLayout; AppInfoView orderShippingMethodPizzalinkInfoLayout;
@BindView(R.id.orderShippingAddressPizzalinkInfoLayout)
AppInfoView orderShippingAddressPizzalinkInfoLayout;
@BindView(R.id.orderNotePizzalinkInfoLayout)
AppInfoView orderNotePizzalinkInfoLayout;
private OrderHistoryModel orderHistoryModel; private OrderHistoryModel orderHistoryModel;
private ArrayList<OrderHistoryProductModel> productList = new ArrayList<>(); private ArrayList<OrderHistoryProductModel> productList = new ArrayList<>();

44
app/src/main/java/ch/pizzalink/android/activity/ProductPropertiesActivity.java → app/src/main/java/ch/pizzapp/android/activity/ProductPropertiesActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.activity; package ch.pizzapp.android.activity;
import android.support.design.widget.BottomSheetBehavior; import android.support.design.widget.BottomSheetBehavior;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
@@ -27,27 +27,27 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; import ch.pizzapp.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter;
import ch.pizzalink.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; import ch.pizzapp.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter;
import ch.pizzalink.android.api.ApiEndPoints; import ch.pizzapp.android.api.ApiEndPoints;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzapp.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.ImageLoadHelper; import ch.pizzapp.android.helper.ImageLoadHelper;
import ch.pizzalink.android.helper.PriceHelper; import ch.pizzapp.android.helper.PriceHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper; import ch.pizzapp.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.helper.TextHelper; import ch.pizzapp.android.helper.TextHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.AddProductToBasketResponseModel; import ch.pizzapp.android.model.AddProductToBasketResponseModel;
import ch.pizzalink.android.model.AddToBasketOptionModel; import ch.pizzapp.android.model.AddToBasketOptionModel;
import ch.pizzalink.android.model.ZoneModel; import ch.pizzapp.android.model.ZoneModel;
import ch.pizzalink.android.model.cart.CartInfoModel; import ch.pizzapp.android.model.cart.CartInfoModel;
import ch.pizzalink.android.model.menu.MenuProductModel; import ch.pizzapp.android.model.menu.MenuProductModel;
import ch.pizzalink.android.model.menu.MenuProductOptionModel; import ch.pizzapp.android.model.menu.MenuProductOptionModel;
import ch.pizzalink.android.model.menu.MenuProductOptionValueModel; import ch.pizzapp.android.model.menu.MenuProductOptionValueModel;
import okhttp3.FormBody; import okhttp3.FormBody;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.RequestBody; import okhttp3.RequestBody;

85
app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java → app/src/main/java/ch/pizzapp/android/activity/RegisterActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.activity; package ch.pizzapp.android.activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -17,20 +17,20 @@ import butterknife.BindView;
import butterknife.BindViews; import butterknife.BindViews;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseArray; import ch.pizzapp.android.api.ResponseArray;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzapp.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper; import ch.pizzapp.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.helper.ViewHelper; import ch.pizzapp.android.helper.ViewHelper;
import ch.pizzalink.android.model.CityModel; import ch.pizzapp.android.model.CityModel;
import ch.pizzalink.android.model.CountryModel; import ch.pizzapp.android.model.CountryModel;
import ch.pizzalink.android.model.UserModel; import ch.pizzapp.android.model.UserModel;
import ch.pizzalink.android.model.ZoneModel; import ch.pizzapp.android.model.ZoneModel;
import ch.pizzalink.android.view.PizzalinkDropdownView; import ch.pizzapp.android.view.AppDropdownView;
import ch.pizzalink.android.view.PizzalinkEditText; import ch.pizzapp.android.view.AppEditText;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
@@ -41,11 +41,14 @@ public class RegisterActivity extends BaseActivity {
R.id.telephonePizzalinkEditText, R.id.emailPizzalinkEditText, R.id.telephonePizzalinkEditText, R.id.emailPizzalinkEditText,
R.id.passwordPizzalinkEditText, R.id.passwordAgainPizzalinkEditText, R.id.passwordPizzalinkEditText, R.id.passwordAgainPizzalinkEditText,
R.id.address1PizzalinkEditText, R.id.postcodePizzalinkEditText}) R.id.address1PizzalinkEditText, R.id.postcodePizzalinkEditText})
List<PizzalinkEditText> pizzalinkEditTextList; List<AppEditText> appEditTextList;
@BindView(R.id.cityPizzalinkDropdown) PizzalinkDropdownView cityPizzalinkDropdown; @BindView(R.id.cityPizzalinkDropdown)
@BindView(R.id.countryPizzalinkDropdown) PizzalinkDropdownView countryPizzalinkDropdown; AppDropdownView cityPizzalinkDropdown;
@BindView(R.id.zonePizzalinkDropdown) PizzalinkDropdownView zonePizzalinkDropdown; @BindView(R.id.countryPizzalinkDropdown)
AppDropdownView countryPizzalinkDropdown;
@BindView(R.id.zonePizzalinkDropdown)
AppDropdownView zonePizzalinkDropdown;
@BindView(R.id.registerButton) Button registerButton; @BindView(R.id.registerButton) Button registerButton;
@BindString(R.string.alert_fill_all_fields) String fillAllFieldsText; @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText;
@@ -102,24 +105,24 @@ public class RegisterActivity extends BaseActivity {
private boolean checkFields(){ private boolean checkFields(){
for(PizzalinkEditText pizzalinkEditText : pizzalinkEditTextList){ for(AppEditText appEditText : appEditTextList){
if(pizzalinkEditText.isEmpty()){ if(appEditText.isEmpty()){
DialogHelper.showAlertDialog(this, fillAllFieldsText); DialogHelper.showAlertDialog(this, fillAllFieldsText);
return false; return false;
} }
} }
if(!pizzalinkEditTextList.get(3).isEmail()){ if(!appEditTextList.get(3).isEmail()){
DialogHelper.showAlertDialog(this, validEmailText); DialogHelper.showAlertDialog(this, validEmailText);
return false; return false;
} }
if(!pizzalinkEditTextList if(!appEditTextList
.get(4) .get(4)
.getText() .getText()
.toLowerCase() .toLowerCase()
.equals( .equals(
pizzalinkEditTextList appEditTextList
.get(5) .get(5)
.getText() .getText()
.toLowerCase())){ .toLowerCase())){
@@ -127,7 +130,7 @@ public class RegisterActivity extends BaseActivity {
return false; return false;
} }
if(pizzalinkEditTextList.get(7).getText().length() != 4){ if(appEditTextList.get(7).getText().length() != 4){
DialogHelper.showAlertDialog(this, invalidPostcodeText); DialogHelper.showAlertDialog(this, invalidPostcodeText);
return false; return false;
} }
@@ -299,16 +302,16 @@ public class RegisterActivity extends BaseActivity {
private HashMap<String, Object> getRegisterParams(){ private HashMap<String, Object> getRegisterParams(){
HashMap<String, Object> params = new HashMap<>(); HashMap<String, Object> params = new HashMap<>();
params.put("firstname", pizzalinkEditTextList.get(0).getText()); params.put("firstname", appEditTextList.get(0).getText());
params.put("lastname", pizzalinkEditTextList.get(1).getText()); params.put("lastname", appEditTextList.get(1).getText());
params.put("telephone", pizzalinkEditTextList.get(2).getText()); params.put("telephone", appEditTextList.get(2).getText());
params.put("email", pizzalinkEditTextList.get(3).getText()); params.put("email", appEditTextList.get(3).getText());
params.put("password", pizzalinkEditTextList.get(4).getText()); params.put("password", appEditTextList.get(4).getText());
params.put("password1", pizzalinkEditTextList.get(5).getText()); params.put("password1", appEditTextList.get(5).getText());
params.put("address_1", pizzalinkEditTextList.get(6).getText()); params.put("address_1", appEditTextList.get(6).getText());
params.put("address_2", ""); params.put("address_2", "");
params.put("city", selectedCityModel.getCity()); params.put("city", selectedCityModel.getCity());
params.put("postcode", pizzalinkEditTextList.get(7).getText()); params.put("postcode", appEditTextList.get(7).getText());
//params.put("country_id", selectedCountryModel.getId()); //params.put("country_id", selectedCountryModel.getId());
//params.put("zone_id", selectedZoneModel.getZoneId()); //params.put("zone_id", selectedZoneModel.getZoneId());
params.put("country_id", "1"); params.put("country_id", "1");
@@ -365,14 +368,14 @@ public class RegisterActivity extends BaseActivity {
} }
private void setTestFields(){ private void setTestFields(){
pizzalinkEditTextList.get(0).getEditText().setText("testname"); appEditTextList.get(0).getEditText().setText("testname");
pizzalinkEditTextList.get(1).getEditText().setText("testsurname"); appEditTextList.get(1).getEditText().setText("testsurname");
pizzalinkEditTextList.get(2).getEditText().setText("1234567892"); appEditTextList.get(2).getEditText().setText("1234567892");
pizzalinkEditTextList.get(3).getEditText().setText("test5@test.com"); appEditTextList.get(3).getEditText().setText("test5@test.com");
pizzalinkEditTextList.get(4).getEditText().setText("test"); appEditTextList.get(4).getEditText().setText("test");
pizzalinkEditTextList.get(5).getEditText().setText("test"); appEditTextList.get(5).getEditText().setText("test");
pizzalinkEditTextList.get(6).getEditText().setText("test address 1"); appEditTextList.get(6).getEditText().setText("test address 1");
pizzalinkEditTextList.get(7).getEditText().setText("test postcode"); appEditTextList.get(7).getEditText().setText("test postcode");
} }
private synchronized void increaseActiveRequestCount(){ private synchronized void increaseActiveRequestCount(){

34
app/src/main/java/ch/pizzalink/android/activity/SplashActivity.java → app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.activity; package ch.pizzapp.android.activity;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.Intent; import android.content.Intent;
@@ -16,22 +16,22 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.api.ApiConstants; import ch.pizzapp.android.api.ApiConstants;
import ch.pizzalink.android.api.ApiEndPoints; import ch.pizzapp.android.api.ApiEndPoints;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseArray; import ch.pizzapp.android.api.ResponseArray;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzapp.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.DisplayHelper; import ch.pizzapp.android.helper.DisplayHelper;
import ch.pizzalink.android.helper.NetworkHelper; import ch.pizzapp.android.helper.NetworkHelper;
import ch.pizzalink.android.helper.PriceHelper; import ch.pizzapp.android.helper.PriceHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper; import ch.pizzapp.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.model.AppVersionModel; import ch.pizzapp.android.model.AppVersionModel;
import ch.pizzalink.android.model.CategoryModel; import ch.pizzapp.android.model.CategoryModel;
import ch.pizzalink.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;

46
app/src/main/java/ch/pizzalink/android/activity/UpdatePasswordActivity.java → app/src/main/java/ch/pizzapp/android/activity/UpdatePasswordActivity.java
View File

@@ -1,8 +1,6 @@
package ch.pizzalink.android.activity; package ch.pizzapp.android.activity;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.view.View;
import android.widget.Button; import android.widget.Button;
import java.util.HashMap; import java.util.HashMap;
@@ -11,25 +9,27 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.api.ApiEndPoints; import ch.pizzapp.android.api.ApiEndPoints;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzapp.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.helper.ViewHelper; import ch.pizzapp.android.helper.ViewHelper;
import ch.pizzalink.android.view.PizzalinkEditText; import ch.pizzapp.android.view.AppEditText;
import ch.pizzalink.android.view.PizzalinkToolbar;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
public class UpdatePasswordActivity extends BaseActivity { public class UpdatePasswordActivity extends BaseActivity {
@BindView(R.id.oldPasswordPizzalinkEditText) PizzalinkEditText oldPasswordPizzalinkEditText; @BindView(R.id.oldPasswordPizzalinkEditText)
@BindView(R.id.newPasswordPizzalinkEditText) PizzalinkEditText newPasswordPizzalinkEditText; AppEditText oldPasswordAppEditText;
@BindView(R.id.confirmNewPasswordPizzalinkEditText) PizzalinkEditText confirmNewPasswordPizzalinkEditText; @BindView(R.id.newPasswordPizzalinkEditText)
AppEditText newPasswordAppEditText;
@BindView(R.id.confirmNewPasswordPizzalinkEditText)
AppEditText confirmNewPasswordAppEditText;
@BindView(R.id.updatePasswordButton) Button updatePasswordButton; @BindView(R.id.updatePasswordButton) Button updatePasswordButton;
@BindString(R.string.alert_fill_all_fields) String fillAllFieldsText; @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText;
@@ -52,14 +52,14 @@ public class UpdatePasswordActivity extends BaseActivity {
private boolean checkFields(){ private boolean checkFields(){
if(oldPasswordPizzalinkEditText.isEmpty() || if(oldPasswordAppEditText.isEmpty() ||
newPasswordPizzalinkEditText.isEmail() || newPasswordAppEditText.isEmail() ||
confirmNewPasswordPizzalinkEditText.isEmpty()){ confirmNewPasswordAppEditText.isEmpty()){
DialogHelper.showAlertDialog(BaseActivity.currentActivity, fillAllFieldsText); DialogHelper.showAlertDialog(BaseActivity.currentActivity, fillAllFieldsText);
return false; return false;
} }
if(!newPasswordPizzalinkEditText.getText().equals(confirmNewPasswordPizzalinkEditText.getText())){ if(!newPasswordAppEditText.getText().equals(confirmNewPasswordAppEditText.getText())){
DialogHelper.showAlertDialog(BaseActivity.currentActivity, passwordsNotMatchedText); DialogHelper.showAlertDialog(BaseActivity.currentActivity, passwordsNotMatchedText);
return false; return false;
} }
@@ -96,9 +96,9 @@ public class UpdatePasswordActivity extends BaseActivity {
private HashMap<String, Object> getUpdatePasswordRequestParams(){ private HashMap<String, Object> getUpdatePasswordRequestParams(){
HashMap<String, Object> params = new HashMap<>(); HashMap<String, Object> params = new HashMap<>();
params.put("oldPassword", oldPasswordPizzalinkEditText.getText()); params.put("oldPassword", oldPasswordAppEditText.getText());
params.put("password", newPasswordPizzalinkEditText.getText()); params.put("password", newPasswordAppEditText.getText());
params.put("confirm", confirmNewPasswordPizzalinkEditText.getText()); params.put("confirm", confirmNewPasswordAppEditText.getText());
return params; return params;
} }
} }

60
app/src/main/java/ch/pizzalink/android/activity/UpdateProfileActivity.java → app/src/main/java/ch/pizzapp/android/activity/UpdateProfileActivity.java
View File

@@ -1,8 +1,6 @@
package ch.pizzalink.android.activity; package ch.pizzapp.android.activity;
import android.content.Intent;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.widget.Button; import android.widget.Button;
@@ -15,25 +13,29 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.api.ApiEndPoints; import ch.pizzapp.android.api.ApiEndPoints;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzapp.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.model.UserModel; import ch.pizzapp.android.model.UserModel;
import ch.pizzalink.android.view.PizzalinkEditText; import ch.pizzapp.android.view.AppEditText;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
public class UpdateProfileActivity extends BaseActivity { public class UpdateProfileActivity extends BaseActivity {
@BindView(R.id.firstnamePizzalinkEditText) PizzalinkEditText firstnamePizzalinkEditText; @BindView(R.id.firstnamePizzalinkEditText)
@BindView(R.id.lasstnamePizzalinkEditText) PizzalinkEditText lasstnamePizzalinkEditText; AppEditText firstnameAppEditText;
@BindView(R.id.telephonePizzalinkEditText) PizzalinkEditText telephonePizzalinkEditText; @BindView(R.id.lasstnamePizzalinkEditText)
@BindView(R.id.emailPizzalinkEditText) PizzalinkEditText emailPizzalinkEditText; AppEditText lasstnameAppEditText;
@BindView(R.id.telephonePizzalinkEditText)
AppEditText telephoneAppEditText;
@BindView(R.id.emailPizzalinkEditText)
AppEditText emailAppEditText;
@BindView(R.id.updateProfileButton) Button updateProfileButton; @BindView(R.id.updateProfileButton) Button updateProfileButton;
@BindString(R.string.alert_fill_all_fields) String fillAllFieldsText; @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText;
@@ -62,10 +64,10 @@ public class UpdateProfileActivity extends BaseActivity {
} }
private void setFields(){ private void setFields(){
firstnamePizzalinkEditText.setText(userModel.getFirstname()); firstnameAppEditText.setText(userModel.getFirstname());
lasstnamePizzalinkEditText.setText(userModel.getLastname()); lasstnameAppEditText.setText(userModel.getLastname());
telephonePizzalinkEditText.setText(userModel.getTelephone()); telephoneAppEditText.setText(userModel.getTelephone());
emailPizzalinkEditText.setText(userModel.getEmail()); emailAppEditText.setText(userModel.getEmail());
} }
private void updateProfile(){ private void updateProfile(){
@@ -104,24 +106,24 @@ public class UpdateProfileActivity extends BaseActivity {
private HashMap<String, Object> getUpdateProfileParams(){ private HashMap<String, Object> getUpdateProfileParams(){
HashMap<String, Object> params = new HashMap<>(); HashMap<String, Object> params = new HashMap<>();
params.put("firstname", firstnamePizzalinkEditText.getText()); params.put("firstname", firstnameAppEditText.getText());
params.put("lastname", lasstnamePizzalinkEditText.getText()); params.put("lastname", lasstnameAppEditText.getText());
params.put("email", emailPizzalinkEditText.getText()); params.put("email", emailAppEditText.getText());
params.put("telephone", telephonePizzalinkEditText.getText()); params.put("telephone", telephoneAppEditText.getText());
return params; return params;
} }
private boolean checkFields(){ private boolean checkFields(){
if(firstnamePizzalinkEditText.isEmpty() || if(firstnameAppEditText.isEmpty() ||
lasstnamePizzalinkEditText.isEmpty() || lasstnameAppEditText.isEmpty() ||
telephonePizzalinkEditText.isEmpty() || telephoneAppEditText.isEmpty() ||
emailPizzalinkEditText.isEmpty()){ emailAppEditText.isEmpty()){
DialogHelper.showAlertDialog(BaseActivity.currentActivity, fillAllFieldsText); DialogHelper.showAlertDialog(BaseActivity.currentActivity, fillAllFieldsText);
return false; return false;
} }
if(!emailPizzalinkEditText.isEmail()){ if(!emailAppEditText.isEmail()){
DialogHelper.showAlertDialog(BaseActivity.currentActivity, validEmailText); DialogHelper.showAlertDialog(BaseActivity.currentActivity, validEmailText);
return false; return false;
} }

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

@@ -1,14 +1,14 @@
package ch.pizzalink.android.adapter.pager; package ch.pizzapp.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.pizzalink.android.fragment.createOrder.CreateOrderResultFragment; import ch.pizzapp.android.fragment.createOrder.CreateOrderResultFragment;
import ch.pizzalink.android.fragment.createOrder.CreateOrderSummaryFragment; import ch.pizzapp.android.fragment.createOrder.CreateOrderSummaryFragment;
import ch.pizzalink.android.fragment.createOrder.PaymentMethodFragment; import ch.pizzapp.android.fragment.createOrder.PaymentMethodFragment;
import ch.pizzalink.android.fragment.createOrder.ShippingAddressFragment; import ch.pizzapp.android.fragment.createOrder.ShippingAddressFragment;
import ch.pizzalink.android.fragment.createOrder.ShippingMethodFragment; import ch.pizzapp.android.fragment.createOrder.ShippingMethodFragment;
/** /**
* Created by cimenmus on 17/10/2017. * Created by cimenmus on 17/10/2017.

14
app/src/main/java/ch/pizzalink/android/adapter/recycler/CartRecyclerAdapter.java → app/src/main/java/ch/pizzapp/android/adapter/recycler/CartRecyclerAdapter.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.adapter.recycler; package ch.pizzapp.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,12 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.helper.PriceHelper; import ch.pizzapp.android.helper.PriceHelper;
import ch.pizzalink.android.helper.TextHelper; import ch.pizzapp.android.helper.TextHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.cart.CartProductModel; import ch.pizzapp.android.model.cart.CartProductModel;
import ch.pizzalink.android.model.cart.CartProductOptionModel; 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/pizzalink/android/adapter/recycler/MenuProductRecyclerAdapter.java → app/src/main/java/ch/pizzapp/android/adapter/recycler/MenuProductRecyclerAdapter.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.adapter.recycler; package ch.pizzapp.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.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.helper.ImageLoadHelper; import ch.pizzapp.android.helper.ImageLoadHelper;
import ch.pizzalink.android.helper.PriceHelper; import ch.pizzapp.android.helper.PriceHelper;
import ch.pizzalink.android.helper.TextHelper; import ch.pizzapp.android.helper.TextHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.menu.MenuProductModel; import ch.pizzapp.android.model.menu.MenuProductModel;
/** /**
* Created by cimenmus on 20/09/2017. * Created by cimenmus on 20/09/2017.

8
app/src/main/java/ch/pizzalink/android/adapter/recycler/MyAddressesRecyclerAdapter.java → app/src/main/java/ch/pizzapp/android/adapter/recycler/MyAddressesRecyclerAdapter.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.adapter.recycler; package ch.pizzapp.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;
@@ -12,9 +12,9 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.AddressModel; import ch.pizzapp.android.model.AddressModel;
/** /**
* Created by cimenmus on 24.10.2017. * Created by cimenmus on 24.10.2017.

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

@@ -1,4 +1,4 @@
package ch.pizzalink.android.adapter.recycler; package ch.pizzapp.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.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.CategoryModel; import ch.pizzapp.android.model.CategoryModel;
/** /**
* Created by cimenmus on 02/10/2017. * Created by cimenmus on 02/10/2017.

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

@@ -1,4 +1,4 @@
package ch.pizzalink.android.adapter.recycler; package ch.pizzapp.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.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.helper.PriceHelper; import ch.pizzapp.android.helper.PriceHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.history.OrderHistoryModel; import ch.pizzapp.android.model.history.OrderHistoryModel;
/** /**
* Created by cimenmus on 04/10/2017. * Created by cimenmus on 04/10/2017.

8
app/src/main/java/ch/pizzalink/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java → app/src/main/java/ch/pizzapp/android/adapter/recycler/PaymentMethodsRecyclerAdapter.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.adapter.recycler; package ch.pizzapp.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,9 +11,9 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.PaymentMethodModel; import ch.pizzapp.android.model.PaymentMethodModel;
/** /**
* Created by cimenmus on 17/10/2017. * Created by cimenmus on 17/10/2017.

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

@@ -1,4 +1,4 @@
package ch.pizzalink.android.adapter.recycler; package ch.pizzapp.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.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
import ch.pizzalink.android.helper.PriceHelper; import ch.pizzapp.android.helper.PriceHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.menu.MenuProductOptionValueModel; import ch.pizzapp.android.model.menu.MenuProductOptionValueModel;
/** /**
* Created by cimenmus on 08/10/2017. * Created by cimenmus on 08/10/2017.

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

@@ -1,4 +1,4 @@
package ch.pizzalink.android.adapter.recycler; package ch.pizzapp.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.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
import ch.pizzalink.android.helper.PriceHelper; import ch.pizzapp.android.helper.PriceHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.menu.MenuProductOptionValueModel; import ch.pizzapp.android.model.menu.MenuProductOptionValueModel;
/** /**
* Created by cimenmus on 08/10/2017. * Created by cimenmus on 08/10/2017.

8
app/src/main/java/ch/pizzalink/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java → app/src/main/java/ch/pizzapp/android/adapter/recycler/ShippingAddressesRecyclerAdapter.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.adapter.recycler; package ch.pizzapp.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,9 +11,9 @@ import java.util.ArrayList;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.AddressModel; import ch.pizzapp.android.model.AddressModel;
/** /**
* Created by cimenmus on 17/10/2017. * Created by cimenmus on 17/10/2017.

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

@@ -1,4 +1,4 @@
package ch.pizzalink.android.adapter.recycler; package ch.pizzapp.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.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.helper.PriceHelper; import ch.pizzapp.android.helper.PriceHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.ShippingMethodModel; import ch.pizzapp.android.model.ShippingMethodModel;
/** /**
* Created by cimenmus on 17/10/2017. * Created by cimenmus on 17/10/2017.

2
app/src/main/java/ch/pizzalink/android/api/ApiConstants.java → app/src/main/java/ch/pizzapp/android/api/ApiConstants.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.api; package ch.pizzapp.android.api;
public class ApiConstants { public class ApiConstants {
public static final int API_READ_TIMEOUT = 30; public static final int API_READ_TIMEOUT = 30;

2
app/src/main/java/ch/pizzalink/android/api/ApiEndPoints.java → app/src/main/java/ch/pizzapp/android/api/ApiEndPoints.java
View File

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

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

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

12
app/src/main/java/ch/pizzalink/android/api/ApiErrorUtils.java → app/src/main/java/ch/pizzapp/android/api/ApiErrorUtils.java
View File

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

40
app/src/main/java/ch/pizzalink/android/api/ApiInterface.java → app/src/main/java/ch/pizzapp/android/api/ApiInterface.java
View File

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

2
app/src/main/java/ch/pizzalink/android/api/ApiService.java → app/src/main/java/ch/pizzapp/android/api/ApiService.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.api; package ch.pizzapp.android.api;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;

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

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

2
app/src/main/java/ch/pizzalink/android/api/ResponseArray.java → app/src/main/java/ch/pizzapp/android/api/ResponseArray.java
View File

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

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

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

42
app/src/main/java/ch/pizzalink/android/dialog/ProductPropertiesBottomSheetDialog.java → app/src/main/java/ch/pizzapp/android/dialog/ProductPropertiesBottomSheetDialog.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.dialog; package ch.pizzapp.android.dialog;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
@@ -20,26 +20,26 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
import ch.pizzalink.android.activity.MainActivity; import ch.pizzapp.android.activity.MainActivity;
import ch.pizzalink.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter; import ch.pizzapp.android.adapter.recycler.ProductCheckboxOptionsRecyclerAdapter;
import ch.pizzalink.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter; import ch.pizzapp.android.adapter.recycler.ProductRadioOptionsRecyclerAdapter;
import ch.pizzalink.android.api.ApiEndPoints; import ch.pizzapp.android.api.ApiEndPoints;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzapp.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.ImageLoadHelper; import ch.pizzapp.android.helper.ImageLoadHelper;
import ch.pizzalink.android.helper.PriceHelper; import ch.pizzapp.android.helper.PriceHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper; import ch.pizzapp.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.AddProductToBasketResponseModel; import ch.pizzapp.android.model.AddProductToBasketResponseModel;
import ch.pizzalink.android.model.cart.CartInfoModel; import ch.pizzapp.android.model.cart.CartInfoModel;
import ch.pizzalink.android.model.menu.MenuProductModel; import ch.pizzapp.android.model.menu.MenuProductModel;
import ch.pizzalink.android.model.menu.MenuProductOptionModel; import ch.pizzapp.android.model.menu.MenuProductOptionModel;
import ch.pizzalink.android.model.menu.MenuProductOptionValueModel; 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;

4
app/src/main/java/ch/pizzalink/android/fragment/BaseFragment.java → app/src/main/java/ch/pizzapp/android/fragment/BaseFragment.java
View File

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

36
app/src/main/java/ch/pizzalink/android/fragment/CartFragment.java → app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.fragment; package ch.pizzapp.android.fragment;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -25,23 +25,23 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
import ch.pizzalink.android.activity.CreateOrderActivity; import ch.pizzapp.android.activity.CreateOrderActivity;
import ch.pizzalink.android.activity.MainActivity; import ch.pizzapp.android.activity.MainActivity;
import ch.pizzalink.android.adapter.recycler.CartRecyclerAdapter; import ch.pizzapp.android.adapter.recycler.CartRecyclerAdapter;
import ch.pizzalink.android.api.ApiEndPoints; import ch.pizzapp.android.api.ApiEndPoints;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzapp.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.PriceHelper; import ch.pizzapp.android.helper.PriceHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper; import ch.pizzapp.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.RemoveProductFromCartResponseModel; import ch.pizzapp.android.model.RemoveProductFromCartResponseModel;
import ch.pizzalink.android.model.cart.CartInfoModel; import ch.pizzapp.android.model.cart.CartInfoModel;
import ch.pizzalink.android.model.cart.CartProductModel; import ch.pizzapp.android.model.cart.CartProductModel;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

32
app/src/main/java/ch/pizzalink/android/fragment/MenuFragment.java → app/src/main/java/ch/pizzapp/android/fragment/MenuFragment.java
View File

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

24
app/src/main/java/ch/pizzalink/android/fragment/OrderHistoryFragment.java → app/src/main/java/ch/pizzapp/android/fragment/OrderHistoryFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.fragment; package ch.pizzapp.android.fragment;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -13,17 +13,17 @@ import java.util.ArrayList;
import butterknife.BindString; import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
import ch.pizzalink.android.activity.OrderHistoryDetailsActivity; import ch.pizzapp.android.activity.OrderHistoryDetailsActivity;
import ch.pizzalink.android.adapter.recycler.OrderHistoryRecyclerAdapter; import ch.pizzapp.android.adapter.recycler.OrderHistoryRecyclerAdapter;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseArray; import ch.pizzapp.android.api.ResponseArray;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.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;

34
app/src/main/java/ch/pizzalink/android/fragment/ProductFragment.java → app/src/main/java/ch/pizzapp/android/fragment/ProductFragment.java
View File

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

43
app/src/main/java/ch/pizzalink/android/fragment/ProfileFragment.java → app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.fragment; package ch.pizzapp.android.fragment;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -6,7 +6,6 @@ import android.support.annotation.NonNull;
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.Button;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.DialogAction;
@@ -16,20 +15,20 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
import ch.pizzalink.android.activity.LoginActivity; import ch.pizzapp.android.activity.LoginActivity;
import ch.pizzalink.android.activity.MyAddressesActivity; import ch.pizzapp.android.activity.MyAddressesActivity;
import ch.pizzalink.android.activity.UpdatePasswordActivity; import ch.pizzapp.android.activity.UpdatePasswordActivity;
import ch.pizzalink.android.activity.UpdateProfileActivity; import ch.pizzapp.android.activity.UpdateProfileActivity;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzapp.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper; import ch.pizzapp.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.model.UserModel; import ch.pizzapp.android.model.UserModel;
import ch.pizzalink.android.view.PizzalinkInfoView; import ch.pizzapp.android.view.AppInfoView;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
@@ -42,10 +41,14 @@ import static android.app.Activity.RESULT_OK;
public class ProfileFragment extends BaseFragment { public class ProfileFragment extends BaseFragment {
@BindView(R.id.firstnamePizzalinkInfoLayout) PizzalinkInfoView firstnamePizzalinkInfoLayout; @BindView(R.id.firstnamePizzalinkInfoLayout)
@BindView(R.id.lastnamePizzalinkInfoLayout) PizzalinkInfoView lastnamePizzalinkInfoLayout; AppInfoView firstnamePizzalinkInfoLayout;
@BindView(R.id.emailPizzalinkInfoLayout) PizzalinkInfoView emailPizzalinkInfoLayout; @BindView(R.id.lastnamePizzalinkInfoLayout)
@BindView(R.id.phonePizzalinkInfoLayout) PizzalinkInfoView phonePizzalinkInfoLayout; AppInfoView lastnamePizzalinkInfoLayout;
@BindView(R.id.emailPizzalinkInfoLayout)
AppInfoView emailPizzalinkInfoLayout;
@BindView(R.id.phonePizzalinkInfoLayout)
AppInfoView phonePizzalinkInfoLayout;
@BindView(R.id.myAddressesLayout) RelativeLayout myAddressesLayout; @BindView(R.id.myAddressesLayout) RelativeLayout myAddressesLayout;
@BindView(R.id.updateProfileLayout) RelativeLayout updateProfileLayout; @BindView(R.id.updateProfileLayout) RelativeLayout updateProfileLayout;
@BindView(R.id.updatePasswordLayout) RelativeLayout updatePasswordLayout; @BindView(R.id.updatePasswordLayout) RelativeLayout updatePasswordLayout;

14
app/src/main/java/ch/pizzalink/android/fragment/StoreInfoFragment.java → app/src/main/java/ch/pizzapp/android/fragment/StoreInfoFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.fragment; package ch.pizzapp.android.fragment;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html; import android.text.Html;
@@ -11,12 +11,12 @@ import android.webkit.WebViewClient;
import butterknife.BindString; import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzapp.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.model.StoreInfoModel; import ch.pizzapp.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/pizzalink/android/fragment/createOrder/CreateOrderBaseFragment.java → app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderBaseFragment.java
View File

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

36
app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderNoteFragment.java → app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderNoteFragment.java
View File

@@ -1,39 +1,22 @@
package ch.pizzalink.android.fragment.createOrder; package ch.pizzapp.android.fragment.createOrder;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.AppCompatRadioButton; import android.support.v7.widget.AppCompatRadioButton;
import android.support.v7.widget.LinearLayoutManager;
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.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import java.util.ArrayList; import java.util.ArrayList;
import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.CreateOrderActivity;
import ch.pizzalink.android.activity.CreateOrderActivity; import ch.pizzapp.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.adapter.recycler.PaymentMethodsRecyclerAdapter; import ch.pizzapp.android.model.cart.CartProductModel;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.view.AppEditText;
import ch.pizzalink.android.api.ApiService;
import ch.pizzalink.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SessionHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.PaymentMethodModel;
import ch.pizzalink.android.model.PaymentMethodsResponseModel;
import ch.pizzalink.android.model.cart.CartProductModel;
import ch.pizzalink.android.view.PizzalinkEditText;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
/** /**
* Created by cimenmus on 28.10.2017. * Created by cimenmus on 28.10.2017.
@@ -41,7 +24,8 @@ import retrofit2.Response;
public class CreateOrderNoteFragment extends CreateOrderBaseFragment { public class CreateOrderNoteFragment extends CreateOrderBaseFragment {
@BindView(R.id.orderNotePizzalinkEditText) PizzalinkEditText orderNotePizzalinkEditText; @BindView(R.id.orderNotePizzalinkEditText)
AppEditText orderNoteAppEditText;
@BindView(R.id.slicePizzaLayout) LinearLayout slicePizzaLayout; @BindView(R.id.slicePizzaLayout) LinearLayout slicePizzaLayout;
@BindView(R.id.yesRadioButton) AppCompatRadioButton yesRadioButton; @BindView(R.id.yesRadioButton) AppCompatRadioButton yesRadioButton;
@BindView(R.id.noRadioButton) AppCompatRadioButton noRadioButton; @BindView(R.id.noRadioButton) AppCompatRadioButton noRadioButton;
@@ -92,7 +76,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment {
createOrderActivity.setSlicePizza(false); createOrderActivity.setSlicePizza(false);
} }
} }
createOrderActivity.setOrderNote(orderNotePizzalinkEditText.getText()); createOrderActivity.setOrderNote(orderNoteAppEditText.getText());
createOrderActivity.onNextClicked(FRAGMENT_NAME); createOrderActivity.onNextClicked(FRAGMENT_NAME);
break; break;
} }
@@ -114,7 +98,7 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment {
} }
} }
if(createOrderActivity.getOrderNote() != null){ if(createOrderActivity.getOrderNote() != null){
orderNotePizzalinkEditText.setText(createOrderActivity.getOrderNote()); orderNoteAppEditText.setText(createOrderActivity.getOrderNote());
} }
} }

8
app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderResultFragment.java → app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderResultFragment.java
View File

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

44
app/src/main/java/ch/pizzalink/android/fragment/createOrder/CreateOrderSummaryFragment.java → app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.fragment.createOrder; package ch.pizzapp.android.fragment.createOrder;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -12,18 +12,18 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.activity.CreateOrderActivity; import ch.pizzapp.android.activity.CreateOrderActivity;
import ch.pizzalink.android.api.ApiEndPoints; import ch.pizzapp.android.api.ApiEndPoints;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzapp.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.PriceHelper; import ch.pizzapp.android.helper.PriceHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.helper.SharedPrefsHelper; import ch.pizzapp.android.helper.SharedPrefsHelper;
import ch.pizzalink.android.model.cart.CartProductModel; import ch.pizzapp.android.model.cart.CartProductModel;
import ch.pizzalink.android.view.PizzalinkInfoView; import ch.pizzapp.android.view.AppInfoView;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
@@ -34,12 +34,18 @@ import retrofit2.Response;
public class CreateOrderSummaryFragment extends CreateOrderBaseFragment { public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
@BindView(R.id.orderPersonFullnamePizzalinkInfoLayout) PizzalinkInfoView orderPersonFullnamePizzalinkInfoLayout; @BindView(R.id.orderPersonFullnamePizzalinkInfoLayout)
@BindView(R.id.orderShippingMethodPizzalinkInfoLayout) PizzalinkInfoView orderShippingMethodPizzalinkInfoLayout; AppInfoView orderPersonFullnamePizzalinkInfoLayout;
@BindView(R.id.orderShippingAddressPizzalinkInfoLayout) PizzalinkInfoView orderShippingAddressPizzalinkInfoLayout; @BindView(R.id.orderShippingMethodPizzalinkInfoLayout)
@BindView(R.id.orderPaymentMethodPizzalinkInfoLayout) PizzalinkInfoView orderPaymentMethodPizzalinkInfoLayout; AppInfoView orderShippingMethodPizzalinkInfoLayout;
@BindView(R.id.orderTotalPizzalinkInfoLayout) PizzalinkInfoView orderTotalPizzalinkInfoLayout; @BindView(R.id.orderShippingAddressPizzalinkInfoLayout)
@BindView(R.id.orderNotePizzalinkInfoLayout) PizzalinkInfoView orderNotePizzalinkInfoLayout; AppInfoView orderShippingAddressPizzalinkInfoLayout;
@BindView(R.id.orderPaymentMethodPizzalinkInfoLayout)
AppInfoView orderPaymentMethodPizzalinkInfoLayout;
@BindView(R.id.orderTotalPizzalinkInfoLayout)
AppInfoView orderTotalPizzalinkInfoLayout;
@BindView(R.id.orderNotePizzalinkInfoLayout)
AppInfoView orderNotePizzalinkInfoLayout;
@BindString(R.string.confirm_order) String confirmOrderText; @BindString(R.string.confirm_order) String confirmOrderText;
@BindString(R.string.slice_pizza) String slicePizzaText; @BindString(R.string.slice_pizza) String slicePizzaText;

46
app/src/main/java/ch/pizzalink/android/fragment/createOrder/PaymentMethodFragment.java → app/src/main/java/ch/pizzapp/android/fragment/createOrder/PaymentMethodFragment.java
View File

@@ -1,9 +1,8 @@
package ch.pizzalink.android.fragment.createOrder; package ch.pizzapp.android.fragment.createOrder;
import android.os.Bundle; import android.os.Bundle;
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;
@@ -14,22 +13,22 @@ import butterknife.BindString;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
import ch.pizzalink.android.activity.CreateOrderActivity; import ch.pizzapp.android.activity.CreateOrderActivity;
import ch.pizzalink.android.adapter.recycler.PaymentMethodsRecyclerAdapter; import ch.pizzapp.android.adapter.recycler.PaymentMethodsRecyclerAdapter;
import ch.pizzalink.android.api.ApiEndPoints; import ch.pizzapp.android.api.ApiEndPoints;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseObject; import ch.pizzapp.android.api.ResponseObject;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.CheckCouponModel; import ch.pizzapp.android.model.CheckCouponModel;
import ch.pizzalink.android.model.PaymentMethodModel; import ch.pizzapp.android.model.PaymentMethodModel;
import ch.pizzalink.android.model.PaymentMethodsResponseModel; import ch.pizzapp.android.model.PaymentMethodsResponseModel;
import ch.pizzalink.android.model.cart.CartInfoModel; import ch.pizzapp.android.model.cart.CartInfoModel;
import ch.pizzalink.android.view.PizzalinkEditText; import ch.pizzapp.android.view.AppEditText;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
@@ -41,7 +40,8 @@ import retrofit2.Response;
public class PaymentMethodFragment extends CreateOrderBaseFragment { public class PaymentMethodFragment extends CreateOrderBaseFragment {
@BindView(R.id.paymentMethodsRecyclerView) RecyclerView paymentMethodsRecyclerView; @BindView(R.id.paymentMethodsRecyclerView) RecyclerView paymentMethodsRecyclerView;
@BindView(R.id.couponCodePizzalinkEditText) PizzalinkEditText couponCodePizzalinkEditText; @BindView(R.id.couponCodePizzalinkEditText)
AppEditText couponCodeAppEditText;
@BindString(R.string.app_name) String appName; @BindString(R.string.app_name) String appName;
@BindString(R.string.alert_choose_payment_method) String choosePaymentMethodText; @BindString(R.string.alert_choose_payment_method) String choosePaymentMethodText;
@@ -89,12 +89,12 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
break; break;
} }
if(couponCodePizzalinkEditText.isEmpty()){ if(couponCodeAppEditText.isEmpty()){
createOrderActivity.setSelectedPaymentMethod(selectedPaymentMethod); createOrderActivity.setSelectedPaymentMethod(selectedPaymentMethod);
createOrderActivity.onNextClicked(FRAGMENT_NAME); createOrderActivity.onNextClicked(FRAGMENT_NAME);
} }
else { else {
createOrderActivity.setCouponCode(couponCodePizzalinkEditText.getText()); createOrderActivity.setCouponCode(couponCodeAppEditText.getText());
checkCoupon(); checkCoupon();
} }
@@ -107,7 +107,7 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
private void initViews(){ private void initViews(){
CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity(); CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
if(createOrderActivity.getCouponCode() != null){ if(createOrderActivity.getCouponCode() != null){
couponCodePizzalinkEditText.setText(createOrderActivity.getCouponCode()); couponCodeAppEditText.setText(createOrderActivity.getCouponCode());
} }
initRecyclerView(); initRecyclerView();
} }
@@ -186,7 +186,7 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
Call<ResponseObject<CheckCouponModel>> call = Call<ResponseObject<CheckCouponModel>> call =
ApiService.apiInterface.checkCoupon( ApiService.apiInterface.checkCoupon(
ApiEndPoints.API_CHECK_COUPON + SessionHelper.getCustomerToken().getToken(), ApiEndPoints.API_CHECK_COUPON + SessionHelper.getCustomerToken().getToken(),
couponCodePizzalinkEditText.getText()); couponCodeAppEditText.getText());
call.enqueue(new Callback<ResponseObject<CheckCouponModel>>() { call.enqueue(new Callback<ResponseObject<CheckCouponModel>>() {
@Override @Override
public void onResponse(Call<ResponseObject<CheckCouponModel>> call, Response<ResponseObject<CheckCouponModel>> response) { public void onResponse(Call<ResponseObject<CheckCouponModel>> call, Response<ResponseObject<CheckCouponModel>> response) {

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

@@ -1,4 +1,4 @@
package ch.pizzalink.android.fragment.createOrder; package ch.pizzapp.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.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.activity.AddAddressActivity; import ch.pizzapp.android.activity.AddAddressActivity;
import ch.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
import ch.pizzalink.android.activity.CreateOrderActivity; import ch.pizzapp.android.activity.CreateOrderActivity;
import ch.pizzalink.android.adapter.recycler.ShippingAddressesRecyclerAdapter; import ch.pizzapp.android.adapter.recycler.ShippingAddressesRecyclerAdapter;
import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzapp.android.api.ApiErrorUtils;
import ch.pizzalink.android.api.ApiService; import ch.pizzapp.android.api.ApiService;
import ch.pizzalink.android.api.ResponseArray; import ch.pizzapp.android.api.ResponseArray;
import ch.pizzalink.android.helper.DialogHelper; import ch.pizzapp.android.helper.DialogHelper;
import ch.pizzalink.android.helper.SessionHelper; import ch.pizzapp.android.helper.SessionHelper;
import ch.pizzalink.android.interfaces.RecyclerItemClickListener; import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
import ch.pizzalink.android.model.AddressModel; import ch.pizzapp.android.model.AddressModel;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;

24
app/src/main/java/ch/pizzalink/android/fragment/createOrder/ShippingMethodFragment.java → app/src/main/java/ch/pizzapp/android/fragment/createOrder/ShippingMethodFragment.java
View File

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

6
app/src/main/java/ch/pizzalink/android/helper/DateTimeHelper.java → app/src/main/java/ch/pizzapp/android/helper/DateTimeHelper.java
View File

@@ -1,12 +1,12 @@
package ch.pizzalink.android.helper; package ch.pizzapp.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.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
/** /**
* Created by cimenmus on 04/10/2017. * Created by cimenmus on 04/10/2017.

10
app/src/main/java/ch/pizzalink/android/helper/DialogHelper.java → app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.helper; package ch.pizzapp.android.helper;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -10,10 +10,10 @@ import com.afollestad.materialdialogs.MaterialDialog;
import java.util.ArrayList; import java.util.ArrayList;
import ch.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
import ch.pizzalink.android.activity.LoginActivity; import ch.pizzapp.android.activity.LoginActivity;
import ch.pizzalink.android.activity.RegisterActivity; import ch.pizzapp.android.activity.RegisterActivity;
public class DialogHelper { public class DialogHelper {

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

@@ -1,4 +1,4 @@
package ch.pizzalink.android.helper; package ch.pizzapp.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.pizzalink.android.R; import ch.pizzapp.android.R;
import ch.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
public class DisplayHelper { public class DisplayHelper {

4
app/src/main/java/ch/pizzalink/android/helper/ImageLoadHelper.java → app/src/main/java/ch/pizzapp/android/helper/ImageLoadHelper.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.helper; package ch.pizzapp.android.helper;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@@ -10,7 +10,7 @@ import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import com.squareup.picasso.Picasso; import com.squareup.picasso.Picasso;
import ch.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
public class ImageLoadHelper { public class ImageLoadHelper {

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

@@ -1,9 +1,9 @@
package ch.pizzalink.android.helper; package ch.pizzapp.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.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
public class NetworkHelper { public class NetworkHelper {

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

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

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

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

6
app/src/main/java/ch/pizzalink/android/helper/SessionHelper.java → app/src/main/java/ch/pizzapp/android/helper/SessionHelper.java
View File

@@ -1,12 +1,12 @@
package ch.pizzalink.android.helper; package ch.pizzapp.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.pizzalink.android.model.CustomerTokenModel; import ch.pizzapp.android.model.CustomerTokenModel;
import ch.pizzalink.android.model.UserModel; import ch.pizzapp.android.model.UserModel;
/** /**
* Created by cimenmus on 11/09/2017. * Created by cimenmus on 11/09/2017.

10
app/src/main/java/ch/pizzalink/android/helper/SharedPrefsHelper.java → app/src/main/java/ch/pizzapp/android/helper/SharedPrefsHelper.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.helper; package ch.pizzapp.android.helper;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@@ -11,10 +11,10 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import ch.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
import ch.pizzalink.android.model.CategoryModel; import ch.pizzapp.android.model.CategoryModel;
import ch.pizzalink.android.model.CustomerTokenModel; import ch.pizzapp.android.model.CustomerTokenModel;
import ch.pizzalink.android.model.UserModel; import ch.pizzapp.android.model.UserModel;
import static android.content.Context.MODE_PRIVATE; import static android.content.Context.MODE_PRIVATE;

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

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

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

@@ -1,11 +1,11 @@
package ch.pizzalink.android.helper; package ch.pizzapp.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.pizzalink.android.activity.BaseActivity; import ch.pizzapp.android.activity.BaseActivity;
/** /**
* Created by cimenmus on 25/06/2017. * Created by cimenmus on 25/06/2017.

2
app/src/main/java/ch/pizzalink/android/interfaces/CheckBoxChangedListener.java → app/src/main/java/ch/pizzapp/android/interfaces/CheckBoxChangedListener.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.interfaces; package ch.pizzapp.android.interfaces;
import android.support.v7.widget.AppCompatCheckBox; import android.support.v7.widget.AppCompatCheckBox;
import android.view.View; import android.view.View;

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

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

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

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

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

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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/pizzalink/android/model/AddProductToBasketResponseModel.java → app/src/main/java/ch/pizzapp/android/model/AddProductToBasketResponseModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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/pizzalink/android/model/AddToBasketOptionModel.java → app/src/main/java/ch/pizzapp/android/model/AddToBasketOptionModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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/pizzalink/android/model/AddressModel.java → app/src/main/java/ch/pizzapp/android/model/AddressModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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/pizzalink/android/model/AppVersionModel.java → app/src/main/java/ch/pizzapp/android/model/AppVersionModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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/pizzalink/android/model/CategoryModel.java → app/src/main/java/ch/pizzapp/android/model/CategoryModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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.pizzalink.android.api.ApiConstants; import ch.pizzapp.android.api.ApiConstants;
import ch.pizzalink.android.helper.SharedPrefsHelper; import ch.pizzapp.android.helper.SharedPrefsHelper;
/** /**
* Created by cimenmus on 26/09/2017. * Created by cimenmus on 26/09/2017.

2
app/src/main/java/ch/pizzalink/android/model/CheckCouponModel.java → app/src/main/java/ch/pizzapp/android/model/CheckCouponModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.android.model;
import android.util.Log; import android.util.Log;

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

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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/pizzalink/android/model/CountryModel.java → app/src/main/java/ch/pizzapp/android/model/CountryModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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/pizzalink/android/model/CreateOrderModel.java → app/src/main/java/ch/pizzapp/android/model/CreateOrderModel.java
View File

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

4
app/src/main/java/ch/pizzalink/android/model/CustomerTokenModel.java → app/src/main/java/ch/pizzapp/android/model/CustomerTokenModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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;
@@ -9,7 +9,7 @@ import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import ch.pizzalink.android.helper.DateTimeHelper; import ch.pizzapp.android.helper.DateTimeHelper;
/** /**
* Created by cimenmus on 26/09/2017. * Created by cimenmus on 26/09/2017.

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

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

2
app/src/main/java/ch/pizzalink/android/model/PaymentMethodModel.java → app/src/main/java/ch/pizzapp/android/model/PaymentMethodModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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/pizzalink/android/model/PaymentMethodsResponseModel.java → app/src/main/java/ch/pizzapp/android/model/PaymentMethodsResponseModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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/pizzalink/android/model/RemoveProductFromCartResponseModel.java → app/src/main/java/ch/pizzapp/android/model/RemoveProductFromCartResponseModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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/pizzalink/android/model/ShippingMethodModel.java → app/src/main/java/ch/pizzapp/android/model/ShippingMethodModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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/pizzalink/android/model/ShippingMethodsResponseModel.java → app/src/main/java/ch/pizzapp/android/model/ShippingMethodsResponseModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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/pizzalink/android/model/StoreInfoModel.java → app/src/main/java/ch/pizzapp/android/model/StoreInfoModel.java
View File

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

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

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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/pizzalink/android/model/ZoneModel.java → app/src/main/java/ch/pizzapp/android/model/ZoneModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model; package ch.pizzapp.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/pizzalink/android/model/cart/CartInfoModel.java → app/src/main/java/ch/pizzapp/android/model/cart/CartInfoModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model.cart; package ch.pizzapp.android.model.cart;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;

2
app/src/main/java/ch/pizzalink/android/model/cart/CartProductModel.java → app/src/main/java/ch/pizzapp/android/model/cart/CartProductModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model.cart; package ch.pizzapp.android.model.cart;
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/pizzalink/android/model/cart/CartProductOptionModel.java → app/src/main/java/ch/pizzapp/android/model/cart/CartProductOptionModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model.cart; package ch.pizzapp.android.model.cart;
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/pizzalink/android/model/cart/CartTotalModel.java → app/src/main/java/ch/pizzapp/android/model/cart/CartTotalModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model.cart; package ch.pizzapp.android.model.cart;
import java.io.Serializable; import java.io.Serializable;

4
app/src/main/java/ch/pizzalink/android/model/history/OrderHistoryModel.java → app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model.history; package ch.pizzapp.android.model.history;
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,7 +6,7 @@ import com.google.gson.annotations.SerializedName;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import ch.pizzalink.android.helper.DateTimeHelper; import ch.pizzapp.android.helper.DateTimeHelper;
/** /**
* Created by cimenmus on 04/10/2017. * Created by cimenmus on 04/10/2017.

2
app/src/main/java/ch/pizzalink/android/model/history/OrderHistoryProductModel.java → app/src/main/java/ch/pizzapp/android/model/history/OrderHistoryProductModel.java
View File

@@ -1,4 +1,4 @@
package ch.pizzalink.android.model.history; package ch.pizzapp.android.model.history;
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